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/asrs/service/impl/BasCrnpServiceImpl.java |  103 +++++++++++++++++-----------------
 src/main/java/com/zy/common/service/CommonService.java         |   19 +++++
 2 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 262e32b..50180bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,7 +4,6 @@
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.mapper.BasCrnpMapper;
 import com.zy.asrs.service.BasCrnpService;
 import com.zy.asrs.service.BasDevpService;
@@ -57,57 +56,57 @@
 
         if (pakin) {
             //TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD
-            int staNo = 0;
-            switch (crnNo){
-                case 1:
-                    staNo = 123;
-                    break;
-                case 2:
-                    staNo = 121;
-                    break;
-                case 3:
-                    staNo = 119;
-                    break;
-                case 4:
-                    staNo = 117;
-                    break;
-                case 5:
-                    staNo = 115;
-                    break;
-                case 6:
-                    staNo = 113;
-                    break;
-                case 7:
-                    staNo = 111;
-                    break;
-                case 8:
-                    staNo = 109;
-                    break;
-                case 9:
-                    staNo = 106;
-                    break;
-                case 10:
-                    staNo = 105;
-                    break;
-                case 11:
-                    staNo = 103;
-                    break;
-                case 12:
-                    staNo = 101;
-                    break;
-            }
-            int maxCount = 2;
-            BasDevp devp = basDevpService.selectById(staNo);
-            if(!Cools.isEmpty(devp)){
-                maxCount = devp.getInQty();
-            }
-
-            int storeCount = wrkMastService.getStoreCount(crnNo);
-
-            if(storeCount >= maxCount){
-                log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
-                return false;
-            }
+//            int staNo = 0;
+//            switch (crnNo){
+//                case 1:
+//                    staNo = 123;
+//                    break;
+//                case 2:
+//                    staNo = 121;
+//                    break;
+//                case 3:
+//                    staNo = 119;
+//                    break;
+//                case 4:
+//                    staNo = 117;
+//                    break;
+//                case 5:
+//                    staNo = 115;
+//                    break;
+//                case 6:
+//                    staNo = 113;
+//                    break;
+//                case 7:
+//                    staNo = 111;
+//                    break;
+//                case 8:
+//                    staNo = 109;
+//                    break;
+//                case 9:
+//                    staNo = 106;
+//                    break;
+//                case 10:
+//                    staNo = 105;
+//                    break;
+//                case 11:
+//                    staNo = 103;
+//                    break;
+//                case 12:
+//                    staNo = 101;
+//                    break;
+//            }
+//            int maxCount = 2;
+//            BasDevp devp = basDevpService.selectById(staNo);
+//            if(!Cools.isEmpty(devp)){
+//                maxCount = devp.getInQty();
+//            }
+//
+//            int storeCount = wrkMastService.getStoreCount(crnNo);
+//
+//            if(storeCount >= maxCount){
+//                log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
+//                return false;
+//            }
 
             if ("N".equals(crnp.getInEnable())) {
                 log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
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