批量推送

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

@@ -1338,6 +1338,7 @@ public class SyPackingListFabricController implements Job {
 		 updateWrapper.set("push_State","3");
 		 //updateWrapper.set("recording_Status",1);//推送中
 		 updateWrapper.ne("push_State","4");//不等于4
+		 updateWrapper.ne("push_State","1");//不等于4
 		 updateWrapper.in("id",ids);
 		 syPackingListFabricService.update(updateWrapper);
 		 result.setSuccess(true);

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

@@ -1288,7 +1288,7 @@ public class SyPackingListTailoringController implements Job {
 	 @AutoLog(value = "初始化流水号")
 	 @ApiOperation(value="初始化流水号", notes="初始化流水号")
 	 @RequestMapping(value = "/getSno", method = {RequestMethod.GET})
-	 public Result getToken1() {
+	 public Result getToken1(String token,String name) {
 		 Result result=new Result();
 //		 if(redisUtil.get("pushNo")!=null){
 //			 result.setTimestamp(redisUtil.getExpire("pushNo"));
@@ -1296,14 +1296,10 @@ public class SyPackingListTailoringController implements Job {
 //		 }else{
 		 //String token = redisUtil.get("采购入库单").toString();//生成token
 		 //token=org.jeecg.modules.system.util.oConvertUtils.addOne(token);
-		 String token = "dz0000001";
+		// 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.set(name, token);//采购委外入库单
+		 result.setMessage(token);
 		 //redisUtil.expire("采购入库单", -1); //redis-server.exe /path/to/redis.conf
 		 //result.setTimestamp(redisUtil.getExpire("采购入库单"));
 		 //result.setResult(redisUtil.get("采购入库单"));
@@ -1522,6 +1518,7 @@ public class SyPackingListTailoringController implements Job {
 		 UpdateWrapper updateWrapper=new UpdateWrapper();
 		 updateWrapper.set("push_State","3");
 		 updateWrapper.ne("push_State","4");//不等于4
+		 updateWrapper.ne("push_State","1");//不等于4
 		 //updateWrapper.set("recording_Status",1);//推送中
 		 updateWrapper.in("id",ids);
 		 syPackingListTailoringService.update(updateWrapper);

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

@@ -1153,7 +1153,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map.put("cVouchType",1);//传1
 
 			JSONObject map3=new JSONObject();//销售发货单
-			map3.put("CVOUCHCODE",pushsno002);//发货单号
+			map3.put("CVOUCHCODE",pushsno003);//发货单号
 			map3.put("DDATE",date2);//发货日期（yyyy-MM-dd）
 			map3.put("BRETURNFLAG","0");//退货标识(1：退货，0：发货)
 			map3.put("CMAKER",createBy);//制单人名称
@@ -1161,7 +1161,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map3.put("CMEMO",main.getMemo());//备注
 
 			JSONObject map4=new JSONObject();//销售出库单
-			map4.put("CVOUCHCODE",pushsno003);//单据号
+			map4.put("CVOUCHCODE",pushsno004);//单据号
 			map4.put("DDATE",date2);//订单日期（格式2015-01-01）
 			map4.put("CHANDLER",createBy);//审核人
 			map4.put("CRDCODE","26");//出库类别
@@ -1169,7 +1169,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map4.put("CMEMO",main.getMemo());//备注
 
 			JSONObject map5=new JSONObject();//采购发票
-			map5.put("CVOUCHCODE",pushsno004);//发票号
+			map5.put("CVOUCHCODE",pushsno002);//发票号
 			map5.put("DDATE",date2);//发票日期（格式2015-01-01）
 			map5.put("CTYPE","专用");//发票类型（01：专用 02：普票）
 			map5.put("CMAKER",createBy);//制单人