From facf9495e8e73c72b63996f416874657f30068bd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 27 九月 2025 13:19:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    4 ++--
 1 files changed, 2 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 1e12032..8b8f807 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -204,7 +204,7 @@
         }
 
         //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
-        for (int i = times; i <= crnNumber * 2; i++) {
+        for (int i = times; i <= crnNumber * 4; i++) {
             int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber, whsType);
             curRow = locNecessaryParameters[1];
             crnNo = locNecessaryParameters[2];
@@ -656,7 +656,7 @@
                     continue;
                 }
                 for (LocMast locMastGro1 : locMasts1) {
-                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
+                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("S") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
                         break;
                     }
                     if (locMastGro1.getLocSts().equals("O")) {

--
Gitblit v1.9.1