From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs"
index 97f8d03..7a17157 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs"
@@ -62,17 +62,17 @@
                     if (mathCurrentRow <= maxDepth)
                     {
                         locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 <= maxDepth).ToList();
-                        if (beRelocation.Row> maxDepth)
+                        if (beRelocation.Row <= maxDepth)
                         {
-                            locationInfos = locationInfos.Where(x=>x.Row>maxDepth).ToList();
+                            locationInfos = locationInfos.Where(x=>x.Row <= maxDepth).ToList();
                         }
                     }
                     else
                     {
                         locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 > maxDepth).ToList();
-                        if (beRelocation.Row <= maxDepth)
+                        if (beRelocation.Row > maxDepth)
                         {
-                            locationInfos = locationInfos.Where(x => x.Row <= maxDepth).ToList();
+                            locationInfos = locationInfos.Where(x => x.Row > maxDepth).ToList();
                         }
                     }
                 }

--
Gitblit v1.9.3