From 4ccff12cf03a050f060b40180873ecd459b2333f Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 10 四月 2025 12:34:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   10 ++--------
 1 files changed, 2 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..00559b3 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -362,7 +362,6 @@
             }
             // 鏇存柊搴撲綅鎺掑彿
             if (Cools.isEmpty(locMast)){
-                rowLastno.setCurrentRow(curRow);
                 rowLastnoService.updateById(rowLastno);
             }
         }
@@ -372,17 +371,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