杰生

hx-service/storage/src/main/java/com/fjhx/stock/service/StockCheckrecordService.java

@@ -20,7 +20,7 @@ public interface StockCheckrecordService extends BaseService<StockCheckrecord> {
      * @param instructions 指令
      * @param stockHouseId 盘点仓库id
      */
-    void checkStart(String instructions, String stockHouseId);
+    void checkStart(String instructions, Long checkForwardSessionId, String stockHouseId);
 
     /**
      * 盘点回调
@@ -33,6 +33,6 @@ public interface StockCheckrecordService extends BaseService<StockCheckrecord> {
      * @param instructions 指令
      * @param stockHouseId 盘点仓库id
      */
-    void checkEnd(String instructions, String stockHouseId);
+    void checkEnd(String instructions, Long checkForwardSessionId, String stockHouseId);
 
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -55,7 +55,7 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
     private StockCheckrecorddetailService stockCheckrecorddetailService;
 
     @Override
-    public void checkStart(String instructions, String stockHouseId) {
+    public void checkStart(String instructions, Long checkForwardSessionId, String stockHouseId) {
         JSONObject data = new JSONObject();
         // 盘点指令
         data.put("instructions", instructions);
@@ -65,6 +65,8 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         data.put("businessType", "3");
         // 盘点仓库id  一楼仓库'c185883dba22478cb593d33f6b66cc53' 四楼仓库'0b8f584250bb4b40b72d641ce4849d15'
         data.put("stockHouseId", stockHouseId);
+        data.put("forwardSessionId", checkForwardSessionId);
+        data.put("forwardUserId", instructions);
 
         // 创建记录rfid的list
         map.put(stockHouseId, Collections.synchronizedList(new ArrayList<>()));
@@ -84,7 +86,7 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void checkEnd(String instructions, String stockHouseId) {
+    public void checkEnd(String instructions, Long checkForwardSessionId, String stockHouseId) {
         Date date = new Date();
 
         JSONObject data = new JSONObject();
@@ -92,6 +94,8 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         data.put("instructions", instructions);
         // 关闭rfid扫描type
         data.put("type", "9");
+        data.put("forwardSessionId", checkForwardSessionId);
+        data.put("forwardUserId", instructions);
         // 关闭扫描
         WebSocketServer.sendInfo(WebSocketEventListener.WEB_STOCK_PROGRAM, WebSocketEventListener.OPERATING_UPPER_COMPUTER, data);
 

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -1,5 +1,6 @@
 package com.fjhx.task.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.stock.service.StockBackPlanService;
 import com.fjhx.stock.service.StockCheckrecordService;
 import com.fjhx.task.service.ScheduleTaskService;
@@ -69,14 +70,16 @@ public class ScheduleTaskController {
             return;
         }
         log.error("开始扫描");
+        Long check1ForwardSessionId = IdWorker.getId();
+        Long check4ForwardSessionId = IdWorker.getId();
 
-        stockCheckrecordService.checkStart("check1", "c185883dba22478cb593d33f6b66cc53");
-        stockCheckrecordService.checkStart("check4", "0b8f584250bb4b40b72d641ce4849d15");
+        stockCheckrecordService.checkStart("check1", check1ForwardSessionId, "c185883dba22478cb593d33f6b66cc53");
+        stockCheckrecordService.checkStart("check4", check4ForwardSessionId, "0b8f584250bb4b40b72d641ce4849d15");
 
         ThreadUtil.sleep(1000 * 60 * 10);
 
-        stockCheckrecordService.checkEnd("check1", "c185883dba22478cb593d33f6b66cc53");
-        stockCheckrecordService.checkEnd("check4", "0b8f584250bb4b40b72d641ce4849d15");
+        stockCheckrecordService.checkEnd("check1", check1ForwardSessionId, "c185883dba22478cb593d33f6b66cc53");
+        stockCheckrecordService.checkEnd("check4", check4ForwardSessionId, "0b8f584250bb4b40b72d641ce4849d15");
     }
 
 }

hx-service/storage/src/main/java/com/fjhx/u/controller/UUserController.java

@@ -1,5 +1,6 @@
 package com.fjhx.u.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.stock.service.StockCheckrecordService;
 import com.fjhx.u.service.UUserService;
 import org.springblade.core.tool.api.R;
@@ -31,9 +32,10 @@ public class UUserController {
     @GetMapping("/test")
     public R test(@RequestParam("sleep") Integer sleep) {
         new Thread(() -> {
-            stockCheckrecordService.checkStart("check1", "c185883dba22478cb593d33f6b66cc53");
+            long id = IdWorker.getId();
+            stockCheckrecordService.checkStart("check1", id, "c185883dba22478cb593d33f6b66cc53");
             ThreadUtil.sleep(1000L * 60 * sleep);
-            stockCheckrecordService.checkEnd("check1", "c185883dba22478cb593d33f6b66cc53");
+            stockCheckrecordService.checkEnd("check1", id, "c185883dba22478cb593d33f6b66cc53");
         }).start();
 
         return R.success();
@@ -42,9 +44,10 @@ public class UUserController {
     @GetMapping("/test4")
     public R test4(@RequestParam("sleep") Integer sleep) {
         new Thread(() -> {
-            stockCheckrecordService.checkStart("check4", "0b8f584250bb4b40b72d641ce4849d15");
+            long id = IdWorker.getId();
+            stockCheckrecordService.checkStart("check4", id, "0b8f584250bb4b40b72d641ce4849d15");
             ThreadUtil.sleep(1000L * 60 * sleep);
-            stockCheckrecordService.checkEnd("check4", "0b8f584250bb4b40b72d641ce4849d15");
+            stockCheckrecordService.checkEnd("check4", id, "0b8f584250bb4b40b72d641ce4849d15");
         }).start();
 
         return R.success();