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 |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 078a7a4..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);

--
Gitblit v1.9.1