推送接口名更改

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

@@ -1259,7 +1259,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			if(mapt.get("account").equals("101")){
 				map5.put("CDEFINE4",main.getLatestDateOfShipment2().substring(0,10));//装柜日期
 			}
-
+			mapt.put("ordertype","委外");
 			if(mapt.get("account").equals("103")){//查询委外订单主表数据	顺序---1
 				orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 				map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
@@ -1276,6 +1276,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					//map5.put("CGLTYPE","委外订单");//来源单据类型
 					map6.put("CGLTYPE","销售出库单");//来源单据类型
 				}else{
+					mapt.put("ordertype","委外");
 					if(mapt.get("orderNumber").equals("one")){
 						orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");//委外订单号判断 第一次
 					}else{
@@ -1645,7 +1646,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			System.out.println("mapsort\n"+mapSort);
 		}
 
-		text(mapList,"采购入库单");
+		text(mapList,mapt.get("ordertype")+"入库单");
 		if(mapList2!=null&&mapList2.size()>0){
 			text(mapList2,"材料出库单");
 			text(mapList7,"印厂采购入库单");
@@ -1703,10 +1704,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 								System.out.println("mapItems4\t"+mapItems5);
 							}
 						}
-						text(mapList5,"采购发票单");
+						text(mapList5,mapt.get("ordertype")+"发票单");
 						if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
-							recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
+							recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 							recording(main,recording);
 							this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 							if(((Map) mapList.get(0)).get("CACCID").toString().equals("101")){
@@ -1778,7 +1779,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		}
 
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
-		recording=result(main,resturn1,"采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
+		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
 		recording(main,recording);
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
@@ -1801,10 +1802,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			}
 		}
 
-		text(mapList5,"采购发票单");
+		text(mapList5,mapt.get("ordertype")+"发票单");
 		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
 			JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
-			recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
+			recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 			recording(main,recording);
 			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 

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

@@ -1172,7 +1172,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			if(mapt.get("account").equals("101")){
 				map5.put("CDEFINE4",main.getLatestDateOfShipment2().substring(0,10));//最终船期
 			}
-
+			mapt.put("ordertype","委外");
 			if(mapt.get("account").equals("103")){//查询委外订单主表数据	顺序---1
 				orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 				map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
@@ -1189,6 +1189,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					map5.put("CGLTYPE","委外订单");//来源单据类型
 					map6.put("CGLTYPE","销售出库单");//来源单据类型
 				}else{
+					mapt.put("ordertype","采购");
 					if(mapt.get("orderNumber").equals("one")){
 						orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");//委外订单号判断
 					}else{
@@ -1452,7 +1453,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			mapt.put("itemSort",mapSort);
 			System.out.println("获取循环后当前是第几个账套\t"+mapt.get("account"));
 		}
-		text(mapList,"采购入库单");
+		text(mapList,mapt.get("ordertype")+"入库单");
 		/*if(true){
 			return null;
 		}*/
@@ -1467,10 +1468,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				maps.put(recordings[i].split("-")[0],map);
 			}
 			String account=mapList.getJSONObject(0).get("CACCID").toString();//获取账套号
+			//System.out.println("采购发票供应商编码\t"+mapt.get("CVENCODE"));
 			if (maps.containsKey(account)){
 				switch (maps.get(account).get("index")){
 					case "1":	//代表已完成第一道
-						if(!account.equals("102")||mapt.get("customerCode").equals("T020001")){
+						if(!account.equals("102")/*||mapt.get("CVENCODE").equals("T020001")*/){
 							//JSONObject jsonObject1=resturn1.getJSONObject(0);//采购入库单
 							String purchaseinName=maps.get(account).get("code");//获取销售发货单
 							//String purchaseinName=jsonObject1.get("U8ReceiptNo").toString();//获取销售发货单
@@ -1492,12 +1494,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							}
 							text(mapList3,"销售发货单");
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
-							recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
+							recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 							recording(main,recording);
 							this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 						}
 					case "2":
-						text(mapList5,"采购发票单");
+						text(mapList5,mapt.get("ordertype")+"发票单");
 						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());
@@ -1555,7 +1557,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
-		recording=result(main,resturn1,"采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
+		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
 		recording(main,recording);
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
@@ -1577,10 +1579,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 		}
 
-		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("102")||mapt.get("customerCode").equals("T020001")){
-			text(mapList5,"采购发票单");
+		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("102")/*||mapt.get("CVENCODE").equals("T020001")*/){
+			text(mapList5,mapt.get("ordertype")+"发票单");
 			JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
-			recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
+			recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 			recording(main,recording);
 			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 		}