From dd7419c236ba76ead528513872dbd4eda7bf572d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 15:21:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java    |    2 +-
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java   |    4 ++++
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java |    2 ++
 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java      |    2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index f875725..3faa438 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -578,6 +578,10 @@
         if(wrkMast.getIoType() == 110){
             agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
         }
+        if (wrkMast.getIoType() == 10) {
+            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
+            agvLocMastService.updateLocStsByLocNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(wrkMast.getLocNo()));
+        }
 
     }
 
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 1e5476d..eced838 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -61,6 +61,7 @@
     @Autowired
     private AgvWrkMastService agvWrkMastService;
 
+
     public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
         AgvWrkMast agvWrkMast = this.selectById(wrkNo);
         //鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗g姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
@@ -108,6 +109,7 @@
         agvWrkMast.setLocNo(locMast.getLocNo());
         agvWrkMast.setWrkSts(201L);
         agvWrkMastService.updateById(agvWrkMast);
+
         return 0;
 
     }
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 855a1f2..2839148 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -71,7 +71,7 @@
             agvWrkMastService.updateById(agvWrkMast);
             // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉�
             String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F";
-            if (agvWrkMast.getIoType() == 10 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 ) {
+            if (agvWrkMast.getIoType() == 10 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 || agvWrkMast.getIoType() == 113) {
                 // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
                 if ((agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111) && agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
                     agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 9c46105..48424db 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -196,7 +196,7 @@
     }
     private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
         Date now = new Date();
-        AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1);
+        AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
         if (Cools.isEmpty(devpNo)) {
             throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
         }

--
Gitblit v1.9.1