From fd067b408ae97f16c13b0e25b9c870d23f4d0ba3 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周二, 10 12月 2024 22:52:08 +0800
Subject: [PATCH] 首页
---
CC/iWareSql/DataAccess/StationHandlerV2.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CC/iWareSql/DataAccess/StationHandlerV2.cs b/CC/iWareSql/DataAccess/StationHandlerV2.cs
index 717e298..e9bb05c 100644
--- a/CC/iWareSql/DataAccess/StationHandlerV2.cs
+++ b/CC/iWareSql/DataAccess/StationHandlerV2.cs
@@ -131,7 +131,7 @@
}
if (lockPlaceDict.ContainsKey(validatePlace.Id))
{
- Log4NetHelper.WriteInfoLog(LogType.SrmTheadService, "lockPlaceDict宸茬粡鏈夎閿佷簡,validatePlace.Id:" + validatePlace.Id + ",瀛楀吀涓殑鍘熷洜鏄�:" + lockPlaceDict[validatePlace.Id] + "锛屾湰娆″師鍥犳槸锛�" + lockReason);
+ Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39_IssueInboundTask, "lockPlaceDict宸茬粡鏈夎閿佷簡,validatePlace.Id:" + validatePlace.Id + ",瀛楀吀涓殑鍘熷洜鏄�:" + lockPlaceDict[validatePlace.Id] + "锛屾湰娆″師鍥犳槸锛�" + lockReason);
return true;
}
else
@@ -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