From 720f154250c5a9aff4ac3cf6a28e001ad038d7e9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 19 十一月 2021 14:10:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 20fc60e..ebe039b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -105,12 +105,12 @@
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
// 鐢熸垚宸ヤ綔鍙�
+ if (sourceStaNo == 103) {
+ whsType = 1;
+ } else if (sourceStaNo == 203) {
+ whsType = 2;
+ }
int workNo = getWorkNo(0);
-// if (locTypeDto.getLocType3() == 1) { // 杞昏揣淇″彿
-// whsType = 2; // 5 - 12 杞讳粨
-// } else if (locTypeDto.getLocType3() == 2) { // 閲嶈揣淇″彿
-// whsType = 1; // 1 - 4 閲嶄粨
-// }
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -192,15 +192,17 @@
if (curRow == 3 || curRow == 4) {
curRow = 3;
}
- if (curRow == 5 || curRow == 6) {
- curRow = 4;
- }
- if (curRow == 7 || curRow == 8) {
- curRow = 5;
- }
break;
}
}
+ } else if (whsType == 2) {
+ if (curRow == sRow) {
+ curRow = eRow;
+ } else {
+ curRow = sRow;
+ }
+ crnNo = whsType;
+ basCrnpService.checkSiteStatus(crnNo, true);
}
}
--
Gitblit v1.9.1