From cb7dd7a126955cd9d84f24494220f6ce68e99589 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 17 八月 2022 15:06:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index dd4be5a..47f8d6c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -113,7 +113,17 @@
*/
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
- whsType = 1;
+ switch (sourceStaNo) {
+ case 107:
+ whsType = 2;
+ break;
+ case 118:
+ whsType = 3;
+ break;
+ default:
+ whsType = 1;
+ break;
+ }
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
@@ -178,7 +188,10 @@
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- Integer crnNo1 = shelves.get(curRow);
+ Integer crnNo1 = shelves.get(curRow) + 1;
+ if (whsType != 1) {
+ crnNo1 = whsType;
+ }
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
break;
@@ -215,18 +228,24 @@
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
if (locMast == null) {
List<Integer> rows;
- switch (curRow) {
- case 1:
- rows = FIRST_GROUP_ROW_LIST;
- break;
- case 2:
- rows = SECOND_GROUP_ROW_LIST;
- break;
- default:
- throw new CoolException("鍏ュ簱閫昏緫鏁呴殰銆�" + curRow + "銆�");
+ if (whsType == 2) {
+ rows = FIRST_GROUP_ROW_LIST;
+ } else if (whsType == 3) {
+ rows = SECOND_GROUP_ROW_LIST;
+ } else {
+ switch (curRow) {
+ case 1:
+ rows = FIRST_GROUP_ROW_LIST;
+ break;
+ case 2:
+ rows = SECOND_GROUP_ROW_LIST;
+ break;
+ default:
+ throw new CoolException("鍏ュ簱閫昏緫鏁呴殰銆�" + curRow + "銆�");
+ }
}
- locMast = locMastService.queryFreeLocMast(curRow, rows, locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast(null, rows, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
--
Gitblit v1.9.1