From 88676143aeceaeec3bd108f9cd609c4f3470ba96 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 30 七月 2025 15:07:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs"
index 700950d..45d2faa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs"
@@ -72,14 +72,13 @@
                         throw new Exception($"鏈壘鍒拌揣浣嶄俊鎭�");
                     }
                     int maxDepth = locationInfos.Max(x => x.Depth);
-                    int mathCurrentRow = beRelocation.Row - Convert.ToInt32(Math.Ceiling(beRelocation.Row / maxDepth / 2.0)) * maxDepth * 2;
-                    if (mathCurrentRow <= maxDepth)
+                    if (beRelocation.Row <= maxDepth)
                     {
-                        locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 <= maxDepth).ToList();
+                        locationInfos = locationInfos.Where(x => x.Row <= maxDepth).ToList();
                     }
-                    else
+                    else if (beRelocation.Row > maxDepth)
                     {
-                        locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 > maxDepth).ToList();
+                        locationInfos = locationInfos.Where(x => x.Row > maxDepth).ToList();
                     }
                 }
 
@@ -103,6 +102,7 @@
                         Dt_LocationInfo? locationInfo = GetUsableLocation_CSJ(locationInfos, undefinedTypeEmptyLocation, palletType);
                         if (locationInfo != null)
                         {
+                            //鍚屼竴鍒楀悓涓�灞傚瓨鏀剧殑璐х墿涓�鑷�
                             if (locationInfo.Depth < locationInfoDepth.Max(x => x.Depth))
                             {
                                 Dt_LocationInfo? locationInfoExist = null;
@@ -167,6 +167,7 @@
                         Dt_LocationInfo? locationInfo = GetUsableLocation_CSJ(locationInfos, definedTypeEmptyLocation, palletType);
                         if (locationInfo != null)
                         {
+                            //鍚屼竴鍒楀悓涓�灞傚瓨鏀剧殑璐х墿涓�鑷�
                             if (locationInfo.Depth < locationInfoDepth.Max(x => x.Depth))
                             {
                                 Dt_LocationInfo? locationInfoExist = null;

--
Gitblit v1.9.3