From 249e5581656200f6d8a86898fb5bd3b2af51f364 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 13:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index a46a44a..abc32af 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -53,7 +53,7 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > 1;
}
@Override
@@ -63,7 +63,7 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, true);
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, pakin);
}
public static void main(String[] args) {
@@ -82,8 +82,8 @@
} else {
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
-
- for (int i = 0; i<locNos.size(); i++) {
+ // 鍏ュ簱澶栧眰搴撲綅婊炵┖
+ for (int i = 0; i<locNos.size() - 1; i++) {
LocMast locMast = this.selectById(locNos.get(i));
if (locMast.getLocSts().equals("O")) {
if (i == 0) {
@@ -119,4 +119,17 @@
workService.shuttleTransfer(groupLoc);
}
+ @Override
+ public Integer getOutCrnNo(LocMast locMast) {
+ int row = Utils.getRow(locMast.getLocNo());
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 1;
+ }
+ if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 3;
+ } else {
+ return locMast.getCrnNo();
+ }
+ }
+
}
--
Gitblit v1.9.1