面辅料u8推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -964,6 +964,7 @@ public class SyPackingListFabricController {
 			 if(items!=null){
 				 main.setSyPackingListFabricItem(items);
 				 map.put("account",items.get(0).getOmpoAccount());//委外采购账套号
+				 map.put("account1",items.get(0).getOmpoAccount());//委外采购账套号
 				 map.put("ompoId",items.get(0).getOmpoId());//采购委外主表id
 				 map.put("mpOrder",items.get(0).getPurOrSubOrder());//采购委外订单号
 				 map.put("customerCode","one");//客户编码

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

@@ -991,16 +991,25 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				map5.put("CGLTYPE","委外订单");//来源单据类型
 				map6.put("CGLTYPE","销售出库单");//来源单据类型
 			}else {//查询采购订单表数据
-				if(mapt.get("orderNumber").equals("one")){
-					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");//委外订单号判断
+				if(mapt.get("account1").equals("901")){
+					orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
+					map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
+					map.put("CGLTYPE","委外订单");//来源单据类型
+					map4.put("CGLTYPE","销售发货单");//来源单据类型
+					map5.put("CGLTYPE","委外订单");//来源单据类型
+					map6.put("CGLTYPE","销售出库单");//来源单据类型
 				}else{
-					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("orderNumber")+"'","POID");//根据采购订单号判断
+					if(mapt.get("orderNumber").equals("one")){
+						orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");//委外订单号判断 第一次
+					}else{
+						orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("orderNumber")+"'","POID");//根据采购订单号判断
+					}
+					map.put("CRDCODE","11");//入库类别（采购入库/委外入库）
+					map.put("CGLTYPE","采购订单");//来源单据类型
+					map4.put("CGLTYPE","销售发货单");//来源单据类型
+					map5.put("CGLTYPE","采购订单");//来源单据类型
+					map6.put("CGLTYPE","销售出库单");//来源单据类型
 				}
-				map.put("CRDCODE","11");//入库类别（采购入库/委外入库）
-				map.put("CGLTYPE","采购订单");//来源单据类型
-				map4.put("CGLTYPE","销售发货单");//来源单据类型
-				map5.put("CGLTYPE","采购订单");//来源单据类型
-				map6.put("CGLTYPE","销售出库单");//来源单据类型
 			}
 			if(orderData!=null){
 				map.put("CVENCODE",orderData.get("cvencode"));//供应商编码
@@ -1037,7 +1046,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 				num1++;
 				Map<String,Object> orderDataItem=null;// inum
-				if(!mapt.get("account").equals("903")){ //采购订单子表数据  顺序---2
+				if(!mapt.get("account").equals("903")&&!mapt.get("account1").equals("901")){ //采购订单子表数据  顺序---2
 					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());
@@ -1045,7 +1054,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
 					}else{
 						if(orderData!=null&&orderData.containsKey("id")){
-							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and irowno='"+
+							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and ivouchrowno='"+
 									((Map<String,String>)mapt.get("itemSort")).get(item.getId())+"'","ID");//根据行号获取信息
 						}
 					}
@@ -1232,9 +1241,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			text(mapList2,"材料出库单");
 			text(mapList7,"印厂采购入库单");
 		}
-		/*if(true){
-			return null;
-		}*/
 		String isSucceed=null;
 		if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed().indexOf("-7-")>0){//印花
 			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//采购入库单

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

@@ -906,14 +906,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 				Map<String,Object> orderDataItem=null;// inum
 				if(!mapt.get("account").equals("903")&&!mapt.get("account1").equals("901")){ //采购订单子表数据  顺序---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{
 						if(orderData!=null&&orderData.containsKey("id")){
-							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and irowno='"+
+							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and ivouchrowno='"+
 									((Map<String,String>)mapt.get("itemSort")).get(item.getId())+"'","ID");//根据行号获取信息
 						}
 					}