From 82d372154be3f8f3948121179a0b17fa59bd96e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 29 一月 2023 09:01:05 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2809921..74c5e4b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -121,19 +121,19 @@
                 whsType = 1;
                 start = 1;
                 end = 14;
-                if (null != wrkMastService.selectPakoutOfStaNo(104)) {
-                    start = 8;
-                    theCrnNo = 2;
-                }
+//                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;
-                }
+//                if (null != wrkMastService.selectPakoutOfStaNo(204)) {
+//                    end = 14;
+//                    theCrnNo = 2;
+//                }
                 break;
             default:
                 throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -321,6 +321,10 @@
                     }
                 }
             }
+//            LocMast locMast0 = locMastService.findOutMost(locMasts.stream().map(LocMast::getLocNo).distinct().collect(Collectors.toList()));
+//            if (!Cools.isEmpty(locMast0)) {
+//                locMast = locMast0;
+//            }
             // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
 //            if (!locMastService.checkEmptyCount(locMast)) {
 //                locMast = null;

--
Gitblit v1.9.1