huxy 2 лет назад
Родитель
Сommit
279161e757

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

@@ -1744,7 +1744,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 									if((Double.parseDouble( itemMap4.get("IQUANTITY").toString())==Double.parseDouble( map.get("iQuantity").toString()))
 									&& !itemMap4.containsKey("AUTOID_SO")&&!ids.contains(map.get("iDLsID"))){
 										ids.add(map.get("iDLsID"));
+										Object declarationName=itemMap4.get("CDEFINE31");
 										getcFree((JSONObject) itemMap4,map);
+										itemMap4.put("CDEFINE31",declarationName);
 										itemMap4.put("AUTOID_SO",map.get("iDLsID"));
 									}
 								}
@@ -1846,7 +1848,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					if((Double.parseDouble( itemMap4.get("IQUANTITY").toString())
 							==Double.parseDouble( map.get("iQuantity").toString()))&&!itemMap4.containsKey("AUTOID_PO")&&!ids.contains(map.get("iDLsID"))){//根据尺码判断
 						ids.add(map.get("iDLsID"));
+						Object declarationName=itemMap4.get("CDEFINE31");
 						getcFree((JSONObject) itemMap4,map);
+						itemMap4.put("CDEFINE31",declarationName);
 						itemMap4.put("AUTOID_SO",map.get("iDLsID"));
 					}
 				}

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

@@ -1521,7 +1521,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 								for (Map itemMap4 :  mapItems4){
 									if(itemMap4.get("size").equals(map.get("cFree2"))&&(Double.parseDouble( itemMap4.get("IQUANTITY").toString())
 											==Double.parseDouble( map.get("iQuantity").toString()))&&!itemMap4.containsKey("AUTOID_SO")){//根据尺码判断
+										Object declarationName=itemMap4.get("CDEFINE31");
 										getcFree((JSONObject) itemMap4,map);
+										itemMap4.put("CDEFINE31",declarationName);
 										itemMap4.put("AUTOID_SO",map.get("iDLsID"));
 									}
 								}
@@ -1609,7 +1611,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				for (Map itemMap4 :  mapItems4){
 					if(itemMap4.get("size").equals(map.get("cFree2"))&&(Double.parseDouble( itemMap4.get("IQUANTITY").toString())
 					==Double.parseDouble( map.get("iQuantity").toString()))&&!itemMap4.containsKey("AUTOID_SO")){//根据尺码判断
+						Object declarationName=itemMap4.get("CDEFINE31");
 						getcFree((JSONObject) itemMap4,map);
+						itemMap4.put("CDEFINE31",declarationName);
 						itemMap4.put("AUTOID_SO",map.get("iDLsID"));
 					}
 				}