From 40065db48672852d0c27ade2dd4ed57ea1023c72 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 二月 2023 13:40:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 21 +++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 9 +--------
src/main/resources/mapper/LocMastMapper.xml | 2 --
src/main/java/com/zy/common/service/CommonService.java | 2 +-
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index d18b33a..457bd8b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,14 +90,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-
- List<String> matnrs = new ArrayList<>();
- for (FullStoreParam.MatCodeStore matCodeStore : param.getList()) {
- Mat mat = matService.selectByMatnr(matCodeStore.getMatnr());
- if (mat != null && !matnrs.contains(mat.getMaktx())) {
- matnrs.add(mat.getMaktx());
- }
- }
+ List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1de3954..66ba35f 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -199,6 +199,27 @@
}
+ public static Integer getInnermostRow(String locNo){
+ int row = getRow(locNo);
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return 1;
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ return 11;
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
public static List<Integer> getGroupLoc(Integer row){
if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
return CommonService.FIRST_GROUP_ROW_LIST;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a94b6b1..e209893 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -211,7 +211,7 @@
List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
if (!Cools.isEmpty(locMasts)) {
- Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
+ Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
for (LocMast one : locMasts) {
if (one.getRow1().equals(innermostRow)) {
locMast = one;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 606b666..c6e2029 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -63,8 +63,6 @@
#{item}
</foreach>
and loc_sts = 'O'
- and loc_no not in ('0100101', '0100201', '0100301')
- and ctn_no != '00201'
group by ctn_no
) a
where count = #{rowsLen}
--
Gitblit v1.9.1