Browse Source

表体增加是否tc

huxy 1 year ago
parent
commit
1532ede061

+ 12 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -2510,6 +2510,18 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					jsonObject.put("IQUANTITY",item.getActualDeclaredQuantity());//实际报关数量
 				}
 				jsonObject.put("CINVCODE",item.getInventoryCode());//存货编码
+
+
+				String istc2=item.getIsTc();
+				//String remarks="";
+				if (istc2!=null&&istc2.equals("1")){
+					if(item.getRemarks2()!=null){
+						item.setRemarks2(item.getRemarks2()+"TC证书");
+					}else{
+						item.setRemarks2("TC证书");
+					}
+				}
+				jsonObject.put("CBMEMO",item.getRemarks2());//子表备注
 				//jsonObject.put("size",item.getInventoryCode());//存货编码
 				jsonObject.put("DISAUTOIDCOL","AUTOID");//对应类型
 				boolean bool=true;

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

@@ -2033,6 +2033,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				jsonObject.put("CINVCODE",item.getInventoryCode());//存货编码
 				jsonObject.put("CDEFINE28",item.getSmallPo());//小po
 				jsonObject.put("POAUTOIDCOL","Autoid");//对应类型
+				jsonObject.put("CBMEMO",syPackingListTailoring.getMemo());//备注
 				for (Map<String,Object> map : invoices){
 					if(Double.parseDouble(map.get("iQuantity").toString())==Double.parseDouble(jsonObject.get("IQUANTITY").toString())&&
 					   map.get("cInvCode").toString().equalsIgnoreCase(item.getInventoryCode())&&map.get("cFree2").equals(item.getSize())
@@ -2180,6 +2181,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				jsonObject.put("size",item.getSize());
 				jsonObject.put("CINVCODE",item.getInventoryCode());//存货编码
 				jsonObject.put("DISAUTOIDCOL","AUTOID");//对应类型
+				jsonObject.put("CBMEMO",syPackingListTailoring.getMemo());//备注
 				for (Map<String,Object> map : invoices){
 					if(Double.parseDouble(map.get("iQuantity").toString())==Double.parseDouble(jsonObject.get("IQUANTITY").toString())&&
 							map.get("cInvCode").toString().equalsIgnoreCase(item.getInventoryCode()) &&jsonObject.get("size").equals(item.getSize())