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/asrs/task/handler/WorkMastHandler.java | 4 ++--
src/main/resources/mapper/LocMastMapper.xml | 6 ------
src/main/java/com/zy/common/model/Shelves.java | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 ++--
src/main/java/com/zy/common/service/CommonService.java | 41 ++++++++++++++++++++++++++++++-----------
5 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 194a274..f5e6c6a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -59,7 +59,7 @@
}
// 鍏ュ簱 --------------------------------------------------------------------------------
- if (wrkMast.getWrkSts() == 5) {
+ if (wrkMast.getWrkSts() == 10) {
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
@@ -89,7 +89,7 @@
}
// 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getWrkSts() == 15) {
+ } else if (wrkMast.getWrkSts() == 18) {
if (!Cools.isEmpty(wrkDetls)) {
if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index ec8c777..b531d7e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -254,7 +254,7 @@
break;
}
// 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(5L);
+ wrkMast.setWrkSts(10L);
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
@@ -323,7 +323,7 @@
break;
}
// 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
+ wrkMast.setWrkSts(18L);
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/common/model/Shelves.java b/src/main/java/com/zy/common/model/Shelves.java
index d88945c..bfd666d 100644
--- a/src/main/java/com/zy/common/model/Shelves.java
+++ b/src/main/java/com/zy/common/model/Shelves.java
@@ -110,7 +110,7 @@
}
public static void main(String[] args) throws InterruptedException {
- Shelves shelves = new Shelves(2,2);
+ Shelves shelves = new Shelves(1,1);
System.out.println(shelves.nodes.toString());
int start = 1;
while (true) {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a7a07e6..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);
@@ -179,6 +189,9 @@
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
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;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index a1cdb4b..2c261f9 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -49,12 +49,6 @@
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
- <if test="locType2 != null">
- and loc_type2 = #{locType2}
- </if>
- <if test="locType3 != null">
- and loc_type3 = #{locType3}
- </if>
and loc_sts='O'
order by loc_sts desc,row1 asc, lev1 asc, bay1 asc
</select>
--
Gitblit v1.9.1