From 94f4944f45d15de23041c1bc937196aef566c2c5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 03 十一月 2025 09:53:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   11 ++++++++---
 1 files changed, 8 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 0dc32ac..f74a52c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -341,10 +341,15 @@
 
         // 1.鎸夎鍒欐煡鎵惧簱浣�
         if (Cools.isEmpty(locMast) && crnNo != 0) {
+            boolean levSign = true;
+            if (staDescId == 1  && crnNo<3) {
+                levSign = false;
+            }
+
             List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-                    .eq("row1", nearRow)
-                    .eq("loc_sts", "O")
-                    .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
+                .eq("row1", nearRow)
+                .eq("loc_sts", "O")
+                .orderBy("inv_wh",false).orderBy("lev1",levSign).orderBy("bay1",true));
 
             for (LocMast locMast1 : locMasts) {
                 if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {

--
Gitblit v1.9.1