From 30b2d8dde49639824f2a9c8f5b3e9b99b4b09e80 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期日, 08 一月 2023 23:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

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

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 00e4dbf..2809921 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -115,16 +115,25 @@
         StartupDto startupDto = new StartupDto();
         int start;
         int end;
+        Integer theCrnNo = null;
         switch (sourceStaNo) {
             case 103:
                 whsType = 1;
                 start = 1;
                 end = 14;
+                if (null != wrkMastService.selectPakoutOfStaNo(104)) {
+                    start = 8;
+                    theCrnNo = 2;
+                }
                 break;
             case 203:
                 whsType = 2;
                 start = 8;
                 end = 21;
+                if (null != wrkMastService.selectPakoutOfStaNo(204)) {
+                    end = 14;
+                    theCrnNo = 2;
+                }
                 break;
             default:
                 throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -218,9 +227,17 @@
                     switch (curRow) {
                         case 1:
                             curRow = 1;
+                            if (null != theCrnNo) {
+                                curRow = 8;
+                                crnNo1 = crnNo1 + 1;
+                            }
                             break;
                         case 2:
                             curRow = 7;
+                            if (null != theCrnNo) {
+                                curRow = 14;
+                                crnNo1 = crnNo1 + 1;
+                            }
                             break;
                         case 3:
                             curRow = 8;
@@ -241,9 +258,17 @@
                             break;
                         case 3:
                             curRow = 15;
+                            if (null != theCrnNo) {
+                                curRow = 8;
+                                crnNo1 = crnNo1 - 1;
+                            }
                             break;
                         case 4:
                             curRow = 21;
+                            if (null != theCrnNo) {
+                                curRow = 14;
+                                crnNo1 = crnNo1 - 1;
+                            }
                             break;
                         default:
                             throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");

--
Gitblit v1.9.1