From c20bd338ddf092a3d9be15d68652d20b9645437d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 15:08:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java             |    7 +++++++
 src/main/java/com/zy/common/service/CommonService.java |   17 +++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2fb451b..64e2cfa 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -28,6 +28,13 @@
 
     private static final DecimalFormat fmt = new DecimalFormat("##0.00");
 
+    public static boolean isNorth(Integer sourceStaNo){
+        if ((sourceStaNo>1000 && sourceStaNo < 1040) || (sourceStaNo>2000 && sourceStaNo > 2010)|| (sourceStaNo > 3000 && sourceStaNo < 3010)){
+            return true;
+        }
+        return false;
+    }
+
     public static float scale(Float f) {
         if (f == null || f == 0f || Float.isNaN(f)) {
             return 0f;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 619bcf2..e9a4dfd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -369,10 +369,19 @@
 
         // 1.鎸夎鍒欐煡鎵惧簱浣�
         if (Cools.isEmpty(locMast) && crnNo != 0) {
-            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));
+            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("row1",false).orderBy("lev1",true).orderBy("bay1",true));
+            }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)) {
                     continue;

--
Gitblit v1.9.1