Browse Source

采购入库单推送获取加工单价

huxy 2 years ago
parent
commit
0c85b82919

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

@@ -1394,7 +1394,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						mapItem.put("CBATCHPROPERTY3",item.getRolls());
 						mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
-						mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
+						//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
 						//map5.put("CGLTYPE","采购订单");
 						mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)
 						//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
@@ -1414,7 +1414,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
 					mapItem.put("CBATCHPROPERTY3",item.getRolls());
-					//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
+					mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
 					//map5.put("CGLTYPE","委外订单");
 					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("040")>-1&&mapt.get("account").equals("103")&&!moDetailsIds.contains(item.getOmpoIdItem())){//103账套中物料分类为040的印花面料
 						List<Map<String,Object>> orderDataItem3 =syPackingListFabricMapper.getOM_MOMaterials(item.getOmpoIdItem(),item.getInventoryCode());//委外订单子表

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

@@ -1246,9 +1246,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 				Map<String,Object> orderDataItem=null;// inum
 				if(!mapt.get("account").equals("103")&&!mapt.get("account1").equals("101")){ //采购订单子表数据  顺序---2
-					System.out.println("mapt.get(\"orderNumber\")\n"+mapt.get("orderNumber"));
+					/*System.out.println("mapt.get(\"orderNumber\")\n"+mapt.get("orderNumber"));
 					System.out.println("mapt.containsKey(\"itemSort\")\t"+mapt.containsKey("itemSort"));
-					System.out.println("item.getOmpoIdItem()\t"+item.getOmpoIdItem());
+					System.out.println("item.getOmpoIdItem()\t"+item.getOmpoIdItem());*/
 					if(!mapt.containsKey("itemSort")){  //第一次进行循环
 						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
 					}else{
@@ -1265,7 +1265,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						getcFree(mapItem6,orderDataItem2);
 						mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
-						mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
+						//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
 						map5.put("CGLTYPE","入库单");
 						mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)
 						//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
@@ -1285,7 +1285,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					getcFree(mapItem6,orderDataItem2);
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
-					//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
+					mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
 					map5.put("CGLTYPE","入库单");
 					mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)
 					//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)