From 34e1dd894d2eb810171776f5cf7166229660ccdf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:41:57 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/controller/AgvBasDevpController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 6f6c36f..a1d9d75 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -237,7 +237,11 @@
         String barcode = map.get("barcode").toString();
         AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
         if (agvWrkMast == null) {
-            R.error("宸ヤ綔妗d笉瀛樺湪");
+            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode));
+            if (agvWrkMast != null && agvWrkMast.getWrkSts() != 205) {
+                return R.error("宸ヤ綔妗g姸鎬佷笉瀵�,杩樺湪鎼繍涓�");
+            }
+            return R.error("宸ヤ綔妗d笉瀛樺湪");
         }
         if (agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110) {
             throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");

--
Gitblit v1.9.1