From 2c5cd00985bb587710c67a4f642b6413c2590141 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 十二月 2022 11:29:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 20da86e..1e48dab 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -114,11 +114,11 @@
int end = 30;
int dualCrnNo;
switch (sourceStaNo) {
- case 107:
+ case 203:
whsType = 1;
dualCrnNo = 2;
break;
- case 118:
+ case 102:
whsType = 2;
start = 31;
end = 32;
@@ -277,6 +277,14 @@
if (whsType == 1) {
List<Integer> rows = Utils.getGroupLoc(curRow);
+// Iterator<Integer> iterator = rows.iterator();
+// while (iterator.hasNext()) {
+// Integer next = iterator.next();
+// if (next.equals(17) || next.equals(18)) {
+// iterator.remove();
+// }
+// }
+
List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
if (!Cools.isEmpty(locMasts)) {
Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
@@ -294,8 +302,7 @@
} else {
if (Utils.isShallowLoc(slaveProperties, curRow)) {
Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
- locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
- // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
+ locMast = locMastService.queryFreeLocMast0(deepRow, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (locMast !=null && !locMastService.checkEmptyCount(locMast)) {
locMast = null;
@@ -303,7 +310,7 @@
}
if (Cools.isEmpty(locMast)) {
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast0(curRow, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (!locMastService.checkEmptyCount(locMast)) {
locMast = null;
--
Gitblit v1.9.1