From 4625b33a4d712a3d1a0e0b58f4060cd7dedcb7db Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 16:47:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 94 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 4fe5f4f..89e086e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -111,20 +111,21 @@
*/
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
- int start = 2;
- int end = 30;
+ int start;
+ int end;
switch (sourceStaNo) {
- case 107:
- whsType = 2;
- end = 17;
+ case 103:
+ whsType = 1;
+ start = 1;
+ end = 14;
break;
- case 118:
- whsType = 3;
- start = 18;
+ case 203:
+ whsType = 2;
+ start = 8;
+ end = 21;
break;
default:
- whsType = 1;
- break;
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
@@ -141,7 +142,6 @@
int crnNo = 0;
// 鐩爣搴撲綅
LocMast locMast = null;
-
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
if (!Cools.isEmpty(matNos)) {
@@ -164,7 +164,8 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", start).le("row1", end));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "D").ge("row1", start).le("row1", end));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo());
@@ -184,6 +185,8 @@
}
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+
+ int currentRow = 1;
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
for (int i = 0; i < shelves.group; i ++) {
@@ -191,9 +194,43 @@
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- Integer crnNo1 = shelves.get(curRow) + 1;
- if (whsType != 1) {
- crnNo1 = whsType;
+ currentRow = curRow;
+ int crnNo1 = shelves.get(curRow);
+ if (whsType == 1) {
+ switch (curRow) {
+ case 1:
+ curRow = 1;
+ break;
+ case 2:
+ curRow = 7;
+ break;
+ case 3:
+ curRow = 8;
+ break;
+ case 4:
+ curRow = 14;
+ break;
+ default:
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ switch (curRow) {
+ case 1:
+ curRow = 8;
+ break;
+ case 2:
+ curRow = 14;
+ break;
+ case 3:
+ curRow = 15;
+ break;
+ case 4:
+ curRow = 21;
+ break;
+ default:
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ crnNo1 = crnNo1 + 1;
}
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
@@ -223,32 +260,25 @@
}
// 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
+ rowLastno.setCurrentRow(currentRow);
rowLastnoService.updateById(rowLastno);
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
if (locMast == null) {
- List<Integer> rows;
- 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;
+ List<Integer> rows = Utils.getGroupLoc(curRow);
+
+ List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
+ if (!Cools.isEmpty(locMasts)) {
+ Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
+ for (LocMast one : locMasts) {
+ if (one.getRow1().equals(innermostRow)) {
+ locMast = one;
break;
- case 2:
- rows = SECOND_GROUP_ROW_LIST;
- break;
- default:
- throw new CoolException("鍏ュ簱閫昏緫鏁呴殰銆�" + curRow + "銆�");
+ }
}
}
-
- locMast = locMastService.queryFreeLocMast(null, rows, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
--
Gitblit v1.9.1