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 | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6df78ab..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("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -180,7 +180,6 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
- // 閲嶅簱浣� 1 - 4鎺�
if (whsType == 1) {
for (int i = 0; i < shelves.group; i ++) {
curRow = shelves.start(curRow);
@@ -190,25 +189,20 @@
Integer crnNo1 = shelves.getCrnNo(curRow);
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
+ if (curRow == 3 || curRow == 4) {
+ curRow = 3;
+ }
break;
}
}
-// // 杞诲簱浣� 5 - 12鎺�
-// } else {
-// curRow = curRow - 4;
-// for (int i = 0; i < shelves.group; i ++) {
-// curRow = shelves.start(curRow);
-// if (curRow < 0) {
-// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// Integer crnNo1 = shelves.getCrnNo(curRow);
-// if (basCrnpService.checkSiteError(crnNo1 + 1, true)) {
-// // 鍋忕Щ閲忚ˉ鍋�
-// curRow = curRow + 4;
-// crnNo = crnNo1 + 1;
-// break;
-// }
-// }
+ } else if (whsType == 2) {
+ if (curRow == sRow) {
+ curRow = eRow;
+ } else {
+ curRow = sRow;
+ }
+ crnNo = whsType;
+ basCrnpService.checkSiteStatus(crnNo, true);
}
}
@@ -461,4 +455,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1