huxy пре 2 година
родитељ
комит
87a66f35ce

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

@@ -1087,7 +1087,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					if(orderDataItem!=null){
 						Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getPOPodetails(orderDataItem.get("id").toString());//获取自由项
 						getcFree(mapItem,orderDataItem2);
+						getcFree(mapItem3,orderDataItem2);
 						getcFree(mapItem5,orderDataItem2);
+						getcFree(mapItem6,orderDataItem2);
 						mapItem.put("CBATCHPROPERTY3",item.getRolls());
 						mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
@@ -1103,7 +1105,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("OM_MODetails", "MODetailsID='"+item.getOmpoIdItem()+"'","MODetailsID");
 					Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getOMMoDetails(item.getOmpoIdItem());//获取自由项
 					getcFree(mapItem,orderDataItem2);
+					getcFree(mapItem3,orderDataItem2);
 					getcFree(mapItem5,orderDataItem2);
+					getcFree(mapItem6,orderDataItem2);
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
 					mapItem.put("CBATCHPROPERTY3",item.getRolls());

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

@@ -922,7 +922,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					if(orderDataItem!=null){
 						Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getPOPodetails(orderDataItem.get("id").toString());//获取自由项
 						getcFree(mapItem,orderDataItem2);
+						getcFree(mapItem3,orderDataItem2);
 						getcFree(mapItem5,orderDataItem2);
+						getcFree(mapItem6,orderDataItem2);
 						mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
 						map5.put("CGLTYPE","采购订单");
@@ -937,7 +939,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("OM_MODetails", "MODetailsID='"+item.getOmpoIdItem()+"'","MODetailsID");
 					Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getOMMoDetails(item.getOmpoIdItem());//获取自由项
 					getcFree(mapItem,orderDataItem2);
+					getcFree(mapItem3,orderDataItem2);
 					getcFree(mapItem5,orderDataItem2);
+					getcFree(mapItem6,orderDataItem2);
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
 					map5.put("CGLTYPE","委外订单");