From 0abb8fc8c901a9aedf70c7c0e5bb86dbd2bd4031 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 11 一月 2023 13:45:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 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..f343216 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -115,16 +116,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 +228,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 +259,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("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -296,6 +322,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