From adc3f07cd3d717c08e60ff7d3aa8210b5167da29 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 七月 2022 10:17:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 036b48d..a8a43d8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -163,17 +163,15 @@
         // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
         if (null == locMast) {
             Shelves shelves = new Shelves(rowCount, crn_qty);
-            if (whsType == 1) {
-                for (int i = 0; i < shelves.group; i ++) {
-                    curRow = shelves.start(curRow);
-                    if (curRow < 0) {
-                        throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-                    }
-                    Integer crnNo1 = shelves.get(curRow);
-                    if (basCrnpService.checkSiteError(crnNo1, true)) {
-                        crnNo = crnNo1;
-                        break;
-                    }
+            for (int i = 0; i < shelves.group; i ++) {
+                curRow = shelves.start(curRow);
+                if (curRow < 0) {
+                    throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+                }
+                Integer crnNo1 = shelves.get(curRow);
+                if (basCrnpService.checkSiteError(crnNo1, true)) {
+                    crnNo = crnNo1;
+                    break;
                 }
             }
         }
@@ -281,6 +279,9 @@
      * 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
      */
     private Integer getWhsType(Integer sourceStaNo, int times) {
+        if (true) {
+            return 4;
+        }
         if (times >= 16) {
             return 4;
         }
@@ -302,6 +303,10 @@
 //            case 223:
             case 227:
                 return 3;
+            case 305:
+            case 303:
+            case 301:
+                return 4;
             default:
                 throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
         }

--
Gitblit v1.9.1