From 7e8c8abedab8d33ea5faff80545e566aa71306d6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 21 五月 2024 14:48:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 a8263ce..bbc5f3e 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -564,7 +564,7 @@
         agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);
 
         //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 107.鐩樼偣鍑哄簱
-        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107){
+        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111){
             //淇敼鍑哄簱绔欑偣鐘舵��
             agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
         }
@@ -609,13 +609,22 @@
             agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
             agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
             // 鑷姩璋冩嫧鍑哄簱鍙栨秷
-        } else if(wrkMast.getIoType() == 108 ) {
+        } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) {
             // 婧愬簱浣�
             String locNo = wrkMast.getSourceLocNo();
             // 鐩爣搴撲綅
             String targetLocNo = wrkMast.getLocNo();
             agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
-            agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+            if (wrkMast.getIoType() == 108) {
+                if (wrkMast.getWrkSts() != 22) {
+                    agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+                }
+            } else {
+                if (wrkMast.getWrkSts() != 22) {
+                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
+                }
+            }
+
             List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
             // 鏇存柊璁㈠崟
             for (AgvLocDetl agvLocDetl : agvLocDetls) {

--
Gitblit v1.9.1