From 173c2665d9d53534489a5374abe855dad19b86a6 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 11 十月 2024 08:40:39 +0800
Subject: [PATCH] 入库：添加仓库编码逻辑

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 9a23068..c7a658d 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -116,6 +116,7 @@
             }
 
 
+            agvWrkMast.setModiTime(new Date());
             //淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
             agvWrkMastService.updateById(agvWrkMast);
@@ -279,15 +280,22 @@
                 //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
                 agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
             }
+//            else {
+//                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+//                if (!agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
+//                    agvWrkMast.setSourceLocNo("");
+//                }
+//                agvWrkMastService.updateById(agvWrkMast);
+//            }
 
             if(!isJSON(orderNo)){
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo);
+                orderService.checkComplete(orderNo,agvWrkMast.getLocNo());
             }else{
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o);
+                    orderService.checkComplete(o,agvWrkMast.getLocNo());
                 });
             }
 
@@ -320,6 +328,7 @@
             String orderNo = getOrderNoByWrkNo(wrkNo);
             //淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
+            agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             //淇敼婧愬簱浣嶇姸鎬佷负O
             if (agvWrkMast.getIoType() == 110) {
@@ -382,12 +391,12 @@
             agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
             if(!isJSON(orderNo)){
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo);
+                orderService.checkComplete(orderNo,agvWrkMast.getLocNo());
             }else{
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o);
+                    orderService.checkComplete(o,agvWrkMast.getLocNo());
                 });
             }
 
@@ -420,6 +429,7 @@
             }
             //淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
+            agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             //淇敼婧愬簱浣嶇姸鎬佷负O
             agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
@@ -438,12 +448,12 @@
             agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
             if(!isJSON(orderNo)){
                 //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
-                orderService.checkComplete(orderNo);
+                orderService.checkComplete(orderNo,agvWrkMast.getLocNo());
             }else{
                 List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                 maps.forEach(map -> {
                     String o = map.get("orderNo").toString();
-                    orderService.checkComplete(o);
+                    orderService.checkComplete(o,agvWrkMast.getLocNo());
                 });
             }
             //涓婃姤mes
@@ -472,6 +482,7 @@
             }
 
             agvWrkMast.setWrkSts(202L);
+            agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             if(agvWrkMast.getIoType() == 1){
                 //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
@@ -537,6 +548,7 @@
             Map<String, Object> devNoMap = devNoMaps.get(0);
             if((int)devNoMap.get("num") < maxWrokNum){
                 agvWrkMast.setLocNo(devNoMap.get("dev_no").toString());
+                agvWrkMast.setModiTime(new Date());
                 agvWrkMastService.updateById(agvWrkMast);
                 log.info("after锛�" + devNoMap.toString()  +  ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());
             }

--
Gitblit v1.9.1