From 159f0c64d0d05b2c08c1881e904cd359ee62af24 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 29 九月 2025 14:01:14 +0800
Subject: [PATCH] #和得服务器

---
 src/main/java/com/zy/common/service/CommonService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f6d0189..29ce278 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -162,7 +162,7 @@
                                                             FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto,
                                                             RowLastnoType rowLastnoType) {
         int attempt = times;
-        while (attempt < crnNumber * 2) {
+        while (attempt < crnNumber * 4) {
             int[] params = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
             curRow = params[1];
             int crnNo = params[2];
@@ -375,7 +375,7 @@
             List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("row1", nearRow)
                     .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
-                    .orderBy("lev1", false).orderBy("bay1", true));
+                    .orderBy("lev1", true).orderBy("bay1", false));
             for (LocMast locMast1 : locMasts) {
                 if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                     continue;
@@ -440,7 +440,7 @@
             List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("row1", nearRow)
                     .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
-                    .orderBy("lev1", true).orderBy("bay1", true));
+                    .orderBy("lev1", true).orderBy("bay1", false));
             for (LocMast locMast1 : locMasts) {
                 if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                     continue;

--
Gitblit v1.9.1