From df65c19219670915339b6f7c1505ff1acb1159d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 29 一月 2023 13:07:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 22 ++++++++++++++--------
1 files changed, 14 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..fb8428b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -57,6 +57,8 @@
private SlaveProperties slaveProperties;
@Autowired
private MatService matService;
+ @Autowired
+ private LocRuleService locRuleService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -121,19 +123,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 +323,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