面辅料调整

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

@@ -1183,7 +1183,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 						//map5.put("CGLTYPE","采购订单");
 						mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
-						mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
+						//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 						mapItem5.put("IORITAXCOST",orderDataItem.get("iTaxPrice"));//原币单价
 						/*mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
 						mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额*/
@@ -1377,8 +1377,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			text(mapList2,"材料出库单");
 			text(mapList7,"印厂采购入库单");
 		}
-		text(mapList3,"销售发货单");
-		text(mapList5,"采购发票单");
 		String isSucceed=null;
 		if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null&&main.getIsSucceed().indexOf("-7-")>0){//印花
 			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//采购入库单
@@ -1428,6 +1426,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 								System.out.println("mapItems4\t"+mapItems5);
 							}
 						}
+						text(mapList5,"采购发票单");
 						if(!((Map) mapList.get(0)).get("CACCID").toString().equals("903")){
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 							recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
@@ -1441,6 +1440,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						if(account.equals("901")){
 							return account+"账套推送成功!";
 						}
+						text(mapList3,"销售发货单");
 						JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 						recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());