From e5efee3f0b701eb448eb1a0b82a930e29a602c44 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 09 九月 2025 09:13:34 +0800
Subject: [PATCH] #自动下发分拣线单据

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2cfd50a..30c0c4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -364,7 +364,7 @@
             wrkMast.setEmptyMk("N"); // 绌烘澘
             wrkMast.setLinkMis("N");
             wrkMast.setBarcode(locMast.getBarcode());
-            if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null) {  //鑻ユ湁绌哄簱浣嶄笖閰嶇疆鍏佽鍒欑粦瀹氬叾澶囨枡搴撲綅鍙�
+            if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //鑻ユ湁绌哄簱浣嶄笖閰嶇疆鍏佽鍒欑粦瀹氬叾澶囨枡搴撲綅鍙�
                 wrkMast.setLocNo(locMastRgv.getLocNo());
                 wrkMast.setTakeNone("0");  //0rgv鏈彇锛�1rgv宸插彇璐�
             }
@@ -394,16 +394,13 @@
                 }
             }
             //淇敼agv澶囨枡鍖虹姸鎬�
-            if(locMastRgv.getLocSts().equals("O")){
+            if(locMastRgv.getLocSts().equals("O") && ioType != 107){
                 locMastRgv.setLocSts("S");
                 locMastRgv.setModiUser(userId);
                 locMastRgv.setModiTime(now);
                 if (!locMastService.updateById(locMastRgv)) {
                     throw new CoolException("棰勭害agv澶囨枡鍖哄簱浣嶇姸鎬佸け璐ワ紝搴撲綅鍙凤細"+locMastRgv.getLocNo());
                 }
-            }else{
-                throw new CoolException(locMastRgv.getLocNo() + "澶囨枡鍖轰笉鏄┖搴撲綅鐘舵��");
-
             }
             // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
             locMast = locMastService.selectById(dto.getLocNo());

--
Gitblit v1.9.1