From 9464abb3b9c67bd5e9fb23502e51518cb61d8541 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 09:43:48 +0800
Subject: [PATCH] 将定时任务的springboot实现改成多线程池newScheduledThreadPool

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 d423ccb..12b4c6d 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -66,6 +66,7 @@
             }
 
 
+            agvWrkMast.setModiTime(new Date());
             //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
             agvWrkMastService.updateById(agvWrkMast);
@@ -77,6 +78,11 @@
                 agvWrkMastLogService.save(agvWrkMast);
                 //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
                 agvWrkDetlLogService.save(wrkNo);
+            } else {
+                if (!agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
+                    agvWrkMast.setSourceLocNo("");
+                }
+                agvWrkMastService.updateById(agvWrkMast);
             }
 
             switch (agvWrkMast.getIoType()){
@@ -142,6 +148,7 @@
                     agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
                     break;
                 case 108:
+                case 114:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                     //鏇存柊搴撳瓨鏄庣粏
                     agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
@@ -256,6 +263,7 @@
             String orderNo = getOrderNoByWrkNo(wrkNo);
             //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
+            agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             //淇敼婧愬簱浣嶇姸鎬佷负O
             if (agvWrkMast.getIoType() == 110) {
@@ -347,6 +355,7 @@
             }
             //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
             agvWrkMast.setWrkSts(207L);
+            agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             //淇敼婧愬簱浣嶇姸鎬佷负O
             agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
@@ -392,6 +401,7 @@
             }
 
             agvWrkMast.setWrkSts(202L);
+            agvWrkMast.setModiTime(new Date());
             agvWrkMastService.updateById(agvWrkMast);
             if(agvWrkMast.getIoType() == 1){
                 //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y
@@ -457,6 +467,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