推送bug调整

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

@@ -1208,6 +1208,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		String pushsno002=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno002").toString());
 		String pushsno003=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno003").toString());
 		String pushsno004=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno004").toString());
+		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		String pushsno005=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno005").toString());
 		String pushsno006=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno006").toString());
 		String pushsno007=org.jeecg.modules.system.util.oConvertUtils.addOne(pushsno001);
@@ -1444,14 +1445,20 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 				if(mapt.get("account").equals("103")){
 					mapItem.put("CBATCH",item.getDyelotNumber());//批号-缸号
+					mapItem3.put("CBATCH",item.getDyelotNumber());//批号-缸号
 					mapItem4.put("CBATCH",item.getDyelotNumber());//批号-缸号
+					mapItem5.put("CBATCH",item.getDyelotNumber());//批号-缸号
+					mapItem6.put("CBATCH",item.getDyelotNumber());//批号-缸号
 				}else{
 					/*if(item.getPlanLotNumber().indexOf("-")<0){
 						throw new JeecgBootException("缸号不规范，请先进行维护在推送接口");
 					}*/
 					String cbatch=item.getDyelotNumber().substring(0,item.getDyelotNumber().indexOf("-"));
-					mapItem.put("CBATCH",item.getPlanLotNumber());//缸号
-					mapItem4.put("CBATCH",item.getPlanLotNumber());//缸号
+					mapItem.put("CBATCH",cbatch);//缸号
+					mapItem3.put("CBATCH",cbatch);//缸号
+					mapItem4.put("CBATCH",cbatch);//缸号
+					mapItem5.put("CBATCH",cbatch);//缸号
+					mapItem6.put("CBATCH",cbatch);//缸号
 				}
 				num1++;
 				Map<String,Object> orderDataItem=null;// inum
@@ -1744,7 +1751,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		text(mapList,mapt.get("ordertype")+"入库单");
 		if(mapList2!=null&&mapList2.size()>0){
 			text(mapList2,"材料出库单");
-			text(mapList7,"印厂采购入库单");
+			text(mapList7,"染厂采购入库单");
 		}
 		String isSucceed=null;
 		//try{
@@ -1756,9 +1763,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 			}
 			else if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()==null){
-				redisUtil.set("pushsno001", pushsno007);//印厂采购入库单
+				redisUtil.set("pushsno001", pushsno007);//染厂采购入库单
 				JSONArray resturn7 = InterfaceConnUtils.doPost(mapList7,"purchasein_import");//采购入库单
-				isSucceed=result(main,resturn7,"印厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
+				isSucceed=result(main,resturn7,"染厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
 				pushsno001=org.jeecg.modules.system.util.oConvertUtils.addOne(pushsno001);
 				isSucceed(main,isSucceed);
 				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn7.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
@@ -1852,7 +1859,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						}
 						text(mapList4,"销售出库单");
 						//return null;//提示报错测试数据
-						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");
 						recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
@@ -1961,7 +1967,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		}
 
 		text(mapList4,"销售出库单");
-		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 		recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
 		recording(main,recording);
@@ -2607,6 +2612,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						item.setRemarks2("TC证书");
 					}
 				}
+				jsonObject.put("CBATCH",item.getDyelotNumber());//批号-缸号
 				jsonObject.put("CBMEMO",item.getRemarks2());//子表备注
 				//jsonObject.put("size",item.getInventoryCode());//存货编码
 				jsonObject.put("DISAUTOIDCOL","AUTOID");//对应类型

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

@@ -1125,6 +1125,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		String pushsno002=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno002").toString());
 		String pushsno003=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno003").toString());
 		String pushsno004=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno004").toString());
+		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		String pushsno005=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno005").toString());
 		System.out.println("maptererere\t"+mapt);
 		//账套号
@@ -1586,7 +1587,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							}
 						}
 						text(mapList4,"销售出库单");
-						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 						recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
@@ -1680,7 +1680,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 
 		text(mapList4,"销售出库单");
-		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 		recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
 		recording(main,recording);
@@ -2097,7 +2096,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		System.out.println("jsonArrays1\n"+jsonArrays1);
 		text(jsonArrays1,"测试合并推送成衣采购发票");
 		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"purinvoice_import");//采购发票单
-		Map<String,String> codeMaps2 = result(resturnJsonArrays,"采购发票",account);
+		Map<String,String> codeMaps2 =new HashMap<>();
+		if(maps.get("account1").equals("101")||account.equals("103")){//账套只有101或者账套是103的为委外发票
+			codeMaps2 = result(resturnJsonArrays,"委外发票",account);
+		}else{
+			codeMaps2 = result(resturnJsonArrays,"采购发票",account);
+		}
 		for (String code1 : codeMaps.keySet()){
 			List<SyPackingListTailoring> listTailoringList=codeMaps.get(code1);
 			//List<String> ids=new ArrayList<>();
@@ -2456,12 +2460,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public Map<String,List<String>> getSuppliers(List<SyPackingListTailoring> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (SyPackingListTailoring tailoring : listTailorings){
-			if(mapLists.containsKey(tailoring.getSupplier()+"-"+tailoring.getSalesman1())){
-				mapLists.get(tailoring.getSupplier()+"-"+tailoring.getSalesman1()).add(tailoring.getRdrecord32Code());
+			if(mapLists.containsKey(tailoring.getSupplierCode()+"-"+tailoring.getSalesman1())){
+				mapLists.get(tailoring.getSupplierCode()+"-"+tailoring.getSalesman1()).add(tailoring.getRdrecord32Code());
 			}else{
 				List<String> list=new ArrayList<>();
 				list.add(tailoring.getRdrecord32Code());
-				mapLists.put(tailoring.getSupplier()+"-"+tailoring.getSalesman1(),list);
+				mapLists.put(tailoring.getSupplierCode()+"-"+tailoring.getSalesman1(),list);
 			}
 		}
 		return mapLists;
@@ -2496,12 +2500,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public Map<String,List<String>> getSuppliers2(List<SyPackingListTailoring> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (SyPackingListTailoring tailoring : listTailorings){
-			if(mapLists.containsKey(tailoring.getSupplier())){
-				mapLists.get(tailoring.getSupplier()).add(tailoring.getRdrecord32Code());
+			if(mapLists.containsKey(tailoring.getSupplierCode())){
+				mapLists.get(tailoring.getSupplierCode()).add(tailoring.getRdrecord32Code());
 			}else{
 				List<String> list=new ArrayList<>();
 				list.add(tailoring.getRdrecord32Code());
-				mapLists.put(tailoring.getSupplier(),list);
+				mapLists.put(tailoring.getSupplierCode(),list);
 			}
 		}
 		return mapLists;