From 0031e41fb8dd0367c9d6237deda6ca7091523f68 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 30 三月 2025 09:08:01 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 75f735c..c848525 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -362,7 +362,7 @@
             }
             // 鏇存柊搴撲綅鎺掑彿
             if (Cools.isEmpty(locMast)){
-                rowLastno.setCurrentRow(curRow);
+                rowLastno.setCurrentRow((curRow-13));
                 rowLastnoService.updateById(rowLastno);
             }
         }
@@ -372,17 +372,12 @@
         // 1.鎸夎鍒欐煡鎵惧簱浣�
         if (Cools.isEmpty(locMast) && crnNo != 0) {
             List<LocMast> locMasts = null;
-            if (Utils.isNorth(sourceStaNo)){
-                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-                        .eq("row1", nearRow)
-                        .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
-                        .orderBy("lev1",true).orderBy("bay1",false));
-            }else {
+
                 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));
-            }
+
 
             for (LocMast locMast1 : locMasts) {
                 if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {

--
Gitblit v1.9.1