From c08372ebf93b19997a2e4f3a6d3e81cfc041ee9b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 31 八月 2022 14:48:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 73ec6ea..a7e31df 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -123,8 +123,7 @@
                 whsType = 3;
                 break;
             default:
-                whsType = 1;
-                break;
+                throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
         }
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = getWorkNo(0);
@@ -184,6 +183,19 @@
 
         // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
         if (null == locMast) {
+            switch (whsType) {
+                case 1:
+                    crnNo = 1;
+                    break;
+                case 2:
+                    crnNo = 2;
+                    break;
+                case 3:
+                    crnNo = 3;
+                    break;
+                default:
+                    throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+            }
             Shelves shelves = new Shelves(rowCount, crn_qty);
             for (int i = 0; i < shelves.group; i ++) {
                 curRow = shelves.start(curRow);
@@ -201,6 +213,9 @@
             }
         }
 
+        if (!basCrnpService.checkSiteError(crnNo, true)) {
+            throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
+        }
         if (crnNo == 0) {
             throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
         }

--
Gitblit v1.9.1