瀏覽代碼

tc证书调整

huxy 1 年之前
父節點
當前提交
f461a442d5

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -301,6 +301,7 @@
 		ompo_Id,
 		spur_Or_Sub_Order,
 		supplier,
+		memo,
 		unit_price customs_Declaration_Unit_Price,
 		master_Metering,
 		(select smail_po from sy_shipping_order_item

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -2107,11 +2107,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 				String istc2=item.getIsTc();
 				if (istc2!=null&&istc2.equals("1")){
-					if(item.getMemo()!=null){
-						item.setMemo(item.getMemo()+"TC证书");
-					}else{
+//					if(item.getMemo()!=null){
+//						item.setMemo(item.getMemo()+"TC证书");
+//					}else{
 						item.setMemo("TC证书");
-					}
+//					}
 				}
 				jsonObject.put("CBMEMO",item.getMemo());//备注
 
@@ -2310,11 +2310,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 //				System.out.println("cFree2\t"+jsonObject.get("cFree2"));
 				String istc2=item.getIsTc();
 				if (istc2!=null&&istc2.equals("1")){
-					if(item.getMemo()!=null){
-						item.setMemo(item.getMemo()+"TC证书");
-					}else{
+//					if(item.getMemo()!=null){
+//						item.setMemo(item.getMemo()+"TC证书");
+//					}else{
 						item.setMemo("TC证书");
-					}
+					//}
 				}
 				jsonObject.put("CBMEMO",item.getMemo());//备注
 				for (Map<String,Object> map : invoices){