From 0022263c834570d17b6bd75f9fc87cfd74ec7133 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 09 三月 2026 08:15:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index a3d6471..d1adc19 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -235,10 +235,12 @@
             }
         }
         // 2. 鏍¢獙宸ヤ綔妗d腑杩愯涓殑鎵樼洏鐮�
-        int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode));
-        if (wrkMastCount != 0) {
-            log.warn("鏉$爜鍦ㄥ伐浣滄。宸插瓨鍦細{}", barcode);
-            throw new CoolException("鏉$爜鍦ㄥ伐浣滄。锛岃鏇存崲鏉$爜锛�" + barcode);
+        if (type != 2) {
+            int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+            if (wrkMastCount != 0) {
+                log.warn("鏉$爜鍦ㄥ伐浣滄。宸插瓨鍦細{}", barcode);
+                throw new CoolException("鏉$爜鍦ㄥ伐浣滄。锛岃鏇存崲鏉$爜锛�" + barcode);
+            }
         }
 
         // 3. 鏍¢獙AGV浠诲姟鍒楄〃涓湭瀹屾垚鐨勬墭鐩樼爜锛氭鏌ユ槸鍚︽湁鏈畬鎴愮殑AGV浠诲姟锛坕s_deleted=0锛�

--
Gitblit v1.9.1