From 4dffb4cbf5febb2e8f7436f28ca3470a35bee5d4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 28 四月 2025 12:43:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 11f066a..854ca6f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -100,19 +100,27 @@
// whsType = getWhsType(sourceStaNo, times);
StartupDto startupDto = new StartupDto();
- if (sourceStaNo < 200){
+// if (sourceStaNo < 200){
+// whsType = 1;
+// } else if (sourceStaNo > 199 && sourceStaNo < 300){
+// whsType = 2;
+// } else if (sourceStaNo > 299 && sourceStaNo < 400){
+// whsType = 3;
+// } else if (sourceStaNo > 399){
+// whsType = 4;
+// }
+
+ if (sourceStaNo ==101||sourceStaNo==103){
whsType = 1;
- } else if (sourceStaNo > 199 && sourceStaNo < 300){
+ } else if (sourceStaNo ==105||sourceStaNo==107){
whsType = 2;
- } else if (sourceStaNo > 299 && sourceStaNo < 400){
- whsType = 3;
- } else if (sourceStaNo > 399){
- whsType = 4;
+ } else{
+ throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// ===============>>>> 寮�濮嬫墽琛�
@@ -160,6 +168,9 @@
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
locMast = shallowLoc;
crnNo = locMast.getCrnNo();
--
Gitblit v1.9.1