From 0ea5c25c84ec189aad8fdd3f412b1e6399a30612 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期日, 18 九月 2022 15:58:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 7b5e110..500ae96 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -214,7 +214,6 @@
                 ioType = 107;
             }
             assert ioType != null;
-            locMastService.breakUp(dto.getLocNo(), excludeLocNos);
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(dto.getLocNo());
             // 鑾峰彇璺緞
@@ -276,6 +275,7 @@
             } else {
                 throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
             }
+            locMastService.breakUp(dto.getLocNo(), excludeLocNos);
         }
     }
 
@@ -527,7 +527,7 @@
             throw new CoolException("鏈壘鍒板簱浣�");
         }
         if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
-            throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
+//            throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");   todo:luxiaotao
         }
         Date now = new Date();
         // 鑾峰彇宸ヤ綔鍙�
@@ -947,7 +947,7 @@
                 Collections.reverse(locMasts);
                 break;
             default:
-                throw new IllegalStateException("Unexpected value: " + locMasts.get(0).getRow1());
+                break;
         }
         if (locNos.size() > locMasts.size()) {
             throw new CoolException("鏈嶅姟鍣ㄩ敊璇�");
@@ -968,7 +968,7 @@
                     throw new CoolException("鏈壘鍒板簱浣�");
                 }
                 if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
-                    throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
+//                    throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");   todo:luxiaotao
                 }
                 // 鑾峰彇宸ヤ綔鍙�
                 int workNo = commonService.getWorkNo(WorkNoType.PICK.type);

--
Gitblit v1.9.1