From 9597b1df912c1ca4401a74970d9472e268b3a9c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 07 12月 2024 15:12:59 +0800
Subject: [PATCH] 33

---
 CC/iWareSql/DataAccess/StationHandlerV2.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CC/iWareSql/DataAccess/StationHandlerV2.cs b/CC/iWareSql/DataAccess/StationHandlerV2.cs
index 221b9af..e9bb05c 100644
--- a/CC/iWareSql/DataAccess/StationHandlerV2.cs
+++ b/CC/iWareSql/DataAccess/StationHandlerV2.cs
@@ -181,7 +181,7 @@
                     var emptyStationList = edm.V_EmptyStation.ToList();
 
                     //涓嶉殢鏈烘帓搴�
-                    emptyStationList = emptyStationList.OrderBy(x => x.LaneNo).ThenBy(x => x.LayerNo).ThenBy(x => x.ColumnNo).ToList();
+                    //emptyStationList = emptyStationList.OrderBy(x => x.LaneNo).ThenBy(x => x.LayerNo).ThenBy(x => x.ColumnNo).ToList();
 
 
                     //澧炲姞璇ュ簱浣嶆槸鍚﹁浠诲姟鍗犵敤鐨勭瓫閫� [EditBy shaocx,2022-06-02]
@@ -190,9 +190,14 @@
                     int placeType = TCSCommon.GetPlaceTypeByWidthLength(upiObj, upiObj.Length, upiObj.Width, ref usePlaceTypeList);
                     //浼樺厛鏌ヨ
                     var my_emptyStationList = emptyStationList.Where(x => usePlaceTypeList.Contains(x.PlaceType)).OrderBy(x => x.PlaceType).ToList();
+                    //鍒嗙粍鎺掑簭
                     if (my_emptyStationList?.Count() > 0)
                     {
-                        wms_base_place toPlace = StationHandler.GetPlaceByPlaceId(my_emptyStationList.First().Id, edm);
+                        var gg = my_emptyStationList.GroupBy(x => x.PlaceType).OrderBy(x => x.Key);
+                        var fistGG = gg.First();
+                        //閲嶆柊鎺掑簭
+                        var new_List = fistGG.ToList().OrderBy(x => x.LaneNo).ThenBy(x => x.ColumnNo).ToList();
+                        wms_base_place toPlace = StationHandler.GetPlaceByPlaceId(new_List.First().Id, edm);
                         return toPlace;
                     }
                     else

--
Gitblit v1.9.3