u8推送增加流水号，预装箱单列表导出调整、采购发票获取供应商全称

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1710,10 +1710,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     if(i==0){
                         cell.setCellValue("合计");
                     }else if(i==x-11){
-                        System.out.println("list.getGroupName()\t"+list.getGroupName());
-                        System.out.println("list.getSmallPo()\t"+list.getSmallPo());
-                        System.out.println("list.getTotal()\t"+list.getTotal());
-                        System.out.println("list.getPacks()\t"+list.getPacks());
                         if(list.getPacks()!=null){
                             cell.setCellValue(list.getPacks().doubleValue());//箱数
                         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -332,7 +332,9 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			styleNo=parsms[1];
 			smallPo=parsms[2];
 			poNo=parsms[2];
-			distributionPoint=parsms[3];
+			if(parsms[3]!=null){
+				distributionPoint=parsms[3].trim();
+			}
 			startingBoxNumber=parsms[4];
 			endCaseNumber=parsms[5];
 			itemCode=parsms[6];

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

@@ -10,6 +10,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.InterfaceConnUtils;
 import org.jeecg.modules.documents.orderData.entity.SyOrderData;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
@@ -1139,6 +1140,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Autowired
 	private SyShippingOrderMapper syShippingOrderMapper;//托书主表
 
+	@Autowired
+	private RedisUtil redisUtil;//redisUtill
 	/**
 	 * 推送u8
 	 * @param main
@@ -1160,6 +1163,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 		JSONArray mapLists=new JSONArray();
 		//账套号
+		String pushsno001=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno001").toString());
+		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());
+		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);
 		if (main!=null){
 			Map<String, Order> mapSort=new HashMap<>();
 			String date2 = main.getLatestDateOfShipment2().substring(0,10);//装柜日期
@@ -1175,7 +1185,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			//String createDate=main.getCreateTime().toString();
 			String createDate=main.getTheFinalShippingDate().substring(0,10);//转化日期类型
 			JSONObject map=new JSONObject();//采购(委外)入库单
-			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
+			//map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
+			map.put("CVOUCHCODE",pushsno001);//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
 			map.put("DDATE", date2);//日期(格式2015-01-01)
 			map.put("CMAKER",createBy);//制单人
@@ -1183,17 +1194,20 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map.put("CHANDLER",createBy);//审核人
 			map.put("cVouchType",1);//传1
 
-			JSONObject map2=new JSONObject();//材料出库单
-			map2.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","rdrecord11","dnmaketime")));//单号
-			map2.put("DDATE",date2);//日期(格式2015-01-01)
-			//map2.put("CHANDLER",createBy);//审核人
-			map2.put("CGLTYPE","委外订单");//出库类别
-			map2.put("CRDCODE","22");//暂时设置成默认 Rd_Style有相关数据
-			map2.put("CMAKER",createBy);//制单人
-			map2.put("CMEMO",main.getRemarks());//备注
+
+			JSONObject map5=new JSONObject();//采购发票
+			//map5.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cpbvcode ","PurBillVouch","cmaketime")));//发票号
+			map5.put("CVOUCHCODE",pushsno002);//发票号
+			map5.put("DDATE",date2);//发票日期（格式2015-01-01）
+			map5.put("CTYPE","专用");//发票类型（01：专用 02：普票）
+			map5.put("CMAKER",createBy);//制单人
+			map5.put("CGLTYPE","入库单");
+			map5.put("CHANDLER",createBy);//审核人
+			map5.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map3=new JSONObject();//销售发货单
-			map3.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cDLCode","DispatchList","dcreatesystime")));//发货单号
+			//map3.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cDLCode","DispatchList","dcreatesystime")));//发货单号
+			map3.put("CVOUCHCODE",pushsno003);//发货单号
 			map3.put("DDATE",date2);//发货日期（yyyy-MM-dd）
 			map3.put("BRETURNFLAG","0");//退货标识(1：退货，0：发货)
 			map3.put("CMAKER",createBy);//制单人名称
@@ -1201,32 +1215,38 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map3.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map4=new JSONObject();//销售出库单
-			map4.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ccode","rdrecord32","dnmaketime")));//单据号
+			//map4.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ccode","rdrecord32","dnmaketime")));//单据号
+			map4.put("CVOUCHCODE",pushsno004);//单据号
 			map4.put("DDATE",date2);//订单日期（格式2015-01-01）
 			map4.put("CHANDLER",createBy);//审核人
 			map4.put("CRDCODE","26");//出库类别
 			map4.put("CMAKER",createBy);//制单人
 			map4.put("CMEMO",main.getRemarks());//备注
 
-			JSONObject map5=new JSONObject();//采购发票
-			map5.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cpbvcode ","PurBillVouch","cmaketime")));//发票号
-			map5.put("DDATE",date2);//发票日期（格式2015-01-01）
-			map5.put("CTYPE","专用");//发票类型（01：专用 02：普票）
-			map5.put("CMAKER",createBy);//制单人
-			map5.put("CGLTYPE","入库单");
-			map5.put("CHANDLER",createBy);//审核人
-			map5.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map6=new JSONObject();//销售发票
-			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode")));//发票号
+			//map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode")));//发票号
+			map6.put("CVOUCHCODE",pushsno005);//发票号
 			map6.put("DDATE",date2);//发票日期（yyyy-MM-dd）
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
 			map6.put("CVERIFIER",createBy);//制单人名称
 			map6.put("CMEMO",main.getRemarks());//备注
 
+
+			JSONObject map2=new JSONObject();//材料出库单
+			//map2.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","rdrecord11","dnmaketime")));//单号
+			map2.put("CVOUCHCODE",pushsno006);//单号
+			map2.put("DDATE",date2);//日期(格式2015-01-01)
+			//map2.put("CHANDLER",createBy);//审核人
+			map2.put("CGLTYPE","委外订单");//出库类别
+			map2.put("CRDCODE","22");//暂时设置成默认 Rd_Style有相关数据
+			map2.put("CMAKER",createBy);//制单人
+			map2.put("CMEMO",main.getRemarks());//备注
+
 			JSONObject map7=new JSONObject();//采购(委外)入库单
-			map7.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime"))));//获取单据号
+			//map7.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime"))));//获取单据号
+			map7.put("CVOUCHCODE",pushsno007 );//获取单据号
 			map7.put("DDATE",date2);//日期(格式2015-01-01)
 			map7.put("CMAKER",createBy);//制单人
 			map7.put("cVouchType",1);//传1
@@ -1682,17 +1702,21 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null&&main.getIsSucceed().indexOf("-7-")>0){//印花
 				JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
 				isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
+				redisUtil.set("pushsno006", pushsno006);//材料出库单
 				isSucceed(main,isSucceed);
 				//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){
 				JSONArray resturn7 = InterfaceConnUtils.doPost(mapList7,"purchasein_import");//采购入库单
 				isSucceed=result(main,resturn7,"印厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
+				redisUtil.set("pushsno001", pushsno007);//印厂采购入库单
+				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");
 
 				JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
 				isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
 				isSucceed(main,isSucceed);
+				redisUtil.set("pushsno006", pushsno006);//材料出库单
 				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 			}
 		}catch (Exception e){
@@ -1736,6 +1760,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 							recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
+							redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 							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")){
@@ -1749,6 +1774,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						text(mapList3,"销售发货单");
 						JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 						recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
+						redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 						String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
@@ -1779,6 +1805,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						//return null;//提示报错测试数据
 						JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");
 						recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
+						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 					case "4":
@@ -1807,6 +1834,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						text(mapList6,"销售发票单");
 						JSONArray resturn6 = InterfaceConnUtils.doPost(mapList6,"saleinvoice_import");//销售发票单
 						recording=result(main,resturn6,"销售发票单",((Map) mapList.get(0)).get("CACCID").toString(),"5");//销售发票单
+						redisUtil.set("pushsno005", pushsno005);//采购委外入库单
 						recording(main,recording);
 				}
 				return account+"账套推送成功!";
@@ -1815,6 +1843,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
 		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
+		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		recording(main,recording);
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
@@ -1843,6 +1872,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
 			JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 			recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
+			redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 			recording(main,recording);
 			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 
@@ -1854,6 +1884,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		text(mapList3,"销售发货单");
 		JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 		recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
+		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		recording(main,recording);
 		String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
@@ -1883,6 +1914,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		text(mapList4,"销售出库单");
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 		recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
+		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		recording(main,recording);
 
 		JSONObject jsonObject4=resturn4.getJSONObject(0);//销售出库单
@@ -1912,6 +1944,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		text(mapList6,"销售发票单");
 		JSONArray resturn6 = InterfaceConnUtils.doPost(mapList6,"saleinvoice_import");//销售发票单
 		recording=result(main,resturn6,"销售发票单",((Map) mapList.get(0)).get("CACCID").toString(),"5");//销售发票单
+		redisUtil.set("pushsno005", pushsno005);//采购委外入库单
 		recording(main,recording);
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn6.getJSONObject(0).get("U8ReceiptNo").toString()),"120");
 		return mapList.getJSONObject(0).get("CACCID").toString()+"账套推送成功!";
@@ -2438,7 +2471,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		Map<String,List<SyPackingListFabric>> listFabricMaps=getListFabricMaps(customers,listFabrics);//key：供应商编码，value：主表数据
 		Map<String,List<SyPackingListFabric>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
 		JSONArray jsonArrays1=new JSONArray();
-		String code=purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode");//发票号
+		//String code=purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode");//发票号
+		String code=redisUtil.get("pushsno005").toString();//发票号
 
 		for (String customer : customers.keySet()){
 			SyPackingListFabric syPackingListFabric=listFabricMaps.get(customer).get(0);
@@ -2460,8 +2494,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			JSONObject  jsonObject1=new JSONObject();
 
 			Map<String,Object> order=syPackingListTailoringMapper.getSoMainCode(syPackingListFabric.getRdrecord32Code());//随便哪一个做主表信息
-			System.out.println("syPackingListFabric.getRdrecord32Code\t"+order);
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
+			redisUtil.set("pushsno005", code);//采购委外入库单
 			codeMaps.put(code,listFabricMaps.get(customer));
 			jsonObject1.put("CVOUCHCODE",code);//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -587,6 +587,9 @@ public class SyPackingListTailoringController implements Job {
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
 				 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
 			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getShippingOrderNumber())){
+				 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
+			 }
 			 if(oConvertUtils.isNotEmpty(stratDate)){
 				 queryWrapper.ge("b.hod",stratDate);//起始日期
 			 }
@@ -787,6 +790,9 @@ public class SyPackingListTailoringController implements Job {
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
 			 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
 		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getShippingOrderNumber())){
+			 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
+		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
 			 queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
 		 }
@@ -1274,6 +1280,37 @@ public class SyPackingListTailoringController implements Job {
 		 return result;
 	 }
 
+	 /**
+	  * 获取token
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "初始化流水号")
+	 @ApiOperation(value="初始化流水号", notes="初始化流水号")
+	 @RequestMapping(value = "/getSno", method = {RequestMethod.GET})
+	 public Result getToken1() {
+		 Result result=new Result();
+//		 if(redisUtil.get("pushNo")!=null){
+//			 result.setTimestamp(redisUtil.getExpire("pushNo"));
+//			 result.setResult(redisUtil.get("pushNo"));
+//		 }else{
+		 //String token = redisUtil.get("采购入库单").toString();//生成token
+		 //token=org.jeecg.modules.system.util.oConvertUtils.addOne(token);
+		 String token = "dz0000001";
+		 //token=org.jeecg.modules.system.util.oConvertUtils.addOne(token);
+		 redisUtil.set("pushsno001", token);//采购委外入库单
+		 redisUtil.set("pushsno002", token);//采购委外发票
+		 redisUtil.set("pushsno003", token);//销售发货单
+		 redisUtil.set("pushsno004", token);//销售出库单
+		 redisUtil.set("pushsno005", token);//销售发票单
+		 redisUtil.set("pushsno006", token);//材料出库单
+		 //redisUtil.expire("采购入库单", -1); //redis-server.exe /path/to/redis.conf
+		 //result.setTimestamp(redisUtil.getExpire("采购入库单"));
+		 //result.setResult(redisUtil.get("采购入库单"));
+		// result.setMessage("采购入库单");
+//		 }
+		 return result;
+	 }
 	 /**
 	  * 获取token
 	  *

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.hibernate.engine.jdbc.Size;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.InterfaceConnUtils;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
@@ -1105,6 +1106,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return ids;
 	}
 
+	@Autowired
+	private RedisUtil redisUtil;//redisUtill
+
 	String saveBatch(SyPackingListTailoring main,Map<String,Object> mapt){
 		mapt.put("customerCode","xxx");//进入方法时设置客户编码为空
 		if(main==null){
@@ -1117,6 +1121,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		JSONArray mapList6=new JSONArray();
 
 		JSONArray mapLists=new JSONArray();
+		String pushsno001=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno001").toString());
+		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());
+		String pushsno005=org.jeecg.modules.system.util.oConvertUtils.addOne(redisUtil.get("pushsno005").toString());
 		System.out.println("maptererere\t"+mapt);
 		//账套号
 		if (main!=null){
@@ -1135,7 +1144,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			String createDate=main.getTheFinalShippingDate().substring(0,10);//转化日期类型
 			String date2 = main.getLatestDateOfShipment2().substring(0,10);//装柜日期
 			JSONObject map=new JSONObject();//采购(委外)入库单
-			map.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime")));//获取单据号
+			map.put("CVOUCHCODE", pushsno001);//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
 			map.put("DDATE",date2);//日期(格式2015-01-01)
 			map.put("CMEMO",main.getMemo());//备注
@@ -1144,7 +1153,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map.put("cVouchType",1);//传1
 
 			JSONObject map3=new JSONObject();//销售发货单
-			map3.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cDLCode","DispatchList","dcreatesystime")));//发货单号
+			map3.put("CVOUCHCODE",pushsno002);//发货单号
 			map3.put("DDATE",date2);//发货日期（yyyy-MM-dd）
 			map3.put("BRETURNFLAG","0");//退货标识(1：退货，0：发货)
 			map3.put("CMAKER",createBy);//制单人名称
@@ -1152,7 +1161,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map3.put("CMEMO",main.getMemo());//备注
 
 			JSONObject map4=new JSONObject();//销售出库单
-			map4.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ccode","rdrecord32","dnmaketime")));//单据号
+			map4.put("CVOUCHCODE",pushsno003);//单据号
 			map4.put("DDATE",date2);//订单日期（格式2015-01-01）
 			map4.put("CHANDLER",createBy);//审核人
 			map4.put("CRDCODE","26");//出库类别
@@ -1160,7 +1169,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map4.put("CMEMO",main.getMemo());//备注
 
 			JSONObject map5=new JSONObject();//采购发票
-			map5.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cpbvcode ","PurBillVouch","cmaketime")));//发票号
+			map5.put("CVOUCHCODE",pushsno004);//发票号
 			map5.put("DDATE",date2);//发票日期（格式2015-01-01）
 			map5.put("CTYPE","专用");//发票类型（01：专用 02：普票）
 			map5.put("CMAKER",createBy);//制单人
@@ -1169,7 +1178,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 
 			JSONObject map6=new JSONObject();//销售发票
-			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","dcreatesystime")));//发票号
+			map6.put("CVOUCHCODE",pushsno005);//发票号
 			map6.put("DDATE",date2);//发票日期（yyyy-MM-dd）
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
@@ -1556,6 +1565,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						recording(main,recording);
 						String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 						this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
+						redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 					case "3":
 						String consignmentName=maps.get(account).get("code");//获取销售发货单
 						List<Map<String,Object>> consignmentMaps= syPackingListTailoringMapper.getDispatchLists(consignmentName);
@@ -1578,6 +1588,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						text(mapList4,"销售出库单");
 						JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 						recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
+						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 //				 	case "4":
@@ -1610,6 +1621,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
 		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
+		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		recording(main,recording);
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
@@ -1642,6 +1654,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		text(mapList3,"销售发货单");
 		JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 		recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
+		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		recording(main,recording);
 		String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 		this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
@@ -1669,6 +1682,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		text(mapList4,"销售出库单");
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 		recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
+		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		recording(main,recording);
 
 		JSONObject jsonObject4=resturn4.getJSONObject(0);//销售出库单
@@ -1968,7 +1982,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		Map<String,List<SyPackingListTailoring>> listTailoringMaps=getListTailoringMaps(customers,listTailorings);//key：供应商编码，value：对应主表
 		Map<String,List<SyPackingListTailoring>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
 		JSONArray jsonArrays1=new JSONArray();
-		String code=purchaseWarehousingMapper.getMaxCode("cpbvcode ","PurBillVouch","cmaketime");//发票号
+		String code=redisUtil.get("pushsno002").toString();//发票号
 
 		for (String customer : customers.keySet()){
 			SyPackingListTailoring syPackingListTailoring=listTailoringMaps.get(customer).get(0);
@@ -1989,6 +2003,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			List<Map<String,Object>> invoices=getInvoices1(customers.get(customer));
 			JSONObject  jsonObject1=new JSONObject();
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
+			redisUtil.set("pushsno002", code);//采购委外入库单
 			codeMaps.put(code,listTailoringMaps.get(customer));
 //			String istc=syPackingListTailoring.getIsTc();
 //			if (istc!=null&&istc.equals("1")){
@@ -2011,8 +2026,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2().substring(0,10));//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
-
-			jsonObject1.put("CDEFINE12",cvenName);//供应商全称
+			if(syPackingListTailoring.getSupplierCode()!=null){
+				String	venName=syPackingListTailoringMapper.getCvenName(syPackingListTailoring.getSupplierCode());
+				jsonObject1.put("CDEFINE12",cvenName);//供应商全称
+			}
 			jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
 			jsonObject1.put("IEXCHRATE",orderData.get("nflat"));//汇率
 			jsonObject1.put("CEXCH_NAME",orderData.get("cexchname"));//币种名称
@@ -2123,7 +2140,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		Map<String,List<SyPackingListTailoring>> listTailoringMaps=getListTailoringMaps(customers,listTailorings);//key：供应商编码，value：主表数据
 		Map<String,List<SyPackingListTailoring>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
 		JSONArray jsonArrays1=new JSONArray();
-		String code=purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode");//发票号
+		String code=redisUtil.get("pushsno005").toString();//发票号
 		for (String customer : customers.keySet()){
 			SyPackingListTailoring syPackingListTailoring=listTailoringMaps.get(customer).get(0);
 			List<SyPackingListTailoringItem> listFabricItems=listTailoringItemMaps.get(customer);
@@ -2142,6 +2159,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
 
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
+			redisUtil.set("pushsno005", code);//采购委外入库单
 			codeMaps.put(code,listTailoringMaps.get(customer));
 			jsonObject1.put("CVOUCHCODE",code);//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人