From 41613aec0de9e753fed15f8171efbe6dbc042f83 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 12 三月 2026 14:31:45 +0800
Subject: [PATCH] 优化成品库货位分配逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs | 143 ++++++++++++++++++++++++++++++++---------------
1 files changed, 98 insertions(+), 45 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
index 4562f62..abb818a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
@@ -4,7 +4,9 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
+using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Helper;
@@ -35,19 +37,60 @@
{
return BaseDal.QueryData(x => x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
}
- /// <summary>
- /// 鏌ユ壘鍏ュ簱鍙敤璐т綅
- /// </summary>
- /// <param name="AreaCode"></param>
- /// <returns></returns>
- public Dt_RGVLocationInfo? GetInFreeLocationInfo(string AreaCode)
+
+ public (List<Dt_Task>, List<Dt_RGVLocationInfo>) GetMoveFreeLocationInfo(List<Dt_RGVLocationInfo> locationInfos)
{
Dt_RGVLocationInfo? rGVLocationInfo = null;
- Dt_RGVLocationInfo? FreerGVLocationInfo = null;
- List<Dt_RGVLocationInfo> rGVLocationInfos = BaseDal.QueryData(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);//鏌ユ壘鎵�鏈夌┖璐т綅
- if (rGVLocationInfos == null || rGVLocationInfos.Count < 1) return rGVLocationInfo;
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ List<Dt_RGVLocationInfo> upFreeLocationInfos = new List<Dt_RGVLocationInfo>();
+ List<Dt_RGVLocationInfo> FreeLocationInfos = GetFreeLocationInfos();//鑾峰彇鎵�鏈夌┖璐т綅
+ try
+ {
+ List<string> LocationCodes = new List<string>();
+ foreach (var locationInfo in locationInfos)
+ {
+ FreeLocationInfos = FreeLocationInfos.Where(x => !LocationCodes.Contains(x.LocationCode)).ToList();
+ var rGVLocationInfos = FreeLocationInfos.Where(x => x.WarehouseId == locationInfo.WarehouseId).ToList();//鏌ユ壘鍚屽尯鍩熷彲鐢ㄧ┖璐т綅
+ rGVLocationInfo = GetFreeLocationInfo(rGVLocationInfos);
+ if (rGVLocationInfo == null)
+ {
+ rGVLocationInfos = FreeLocationInfos.Where(x => x.WarehouseId != locationInfo.WarehouseId).ToList();//鏌ユ壘涓嶅悓鍖哄煙鍙敤绌鸿揣浣�
+ rGVLocationInfo = GetFreeLocationInfo(rGVLocationInfos);
+ }
+ if (rGVLocationInfo == null) break;
+ Dt_Task dt_Task = new()
+ {
+ Grade = 1,
+ PalletCode = locationInfo.PalletCode,
+ Roadway = locationInfo.RoadwayNo,
+ TaskState = TaskStatusEnum.RGV_NewMoveTask.ObjToInt(),
+ TaskType = TaskTypeEnum.CPMoveInventory.ObjToInt(),
+ SourceAddress = locationInfo.LocationCode,
+ CurrentAddress = locationInfo.LocationCode,
+ NextAddress = rGVLocationInfo.LocationCode,
+ TargetAddress = rGVLocationInfo.LocationCode,
+ Creater = "WCS",
+ };
+ tasks.Add(dt_Task);
+ upFreeLocationInfos.Add(rGVLocationInfo);
+ LocationCodes.Add(rGVLocationInfo.LocationCode);
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ return (tasks, upFreeLocationInfos);
+ }
+ /// <summary>
+ /// 鑾峰彇鍙敤绌鸿揣浣�
+ /// </summary>
+ /// <param name="rGVLocationInfos"></param>
+ /// <returns></returns>
+ public Dt_RGVLocationInfo? GetFreeLocationInfo(List<Dt_RGVLocationInfo> rGVLocationInfos)
+ {
+ Dt_RGVLocationInfo? rGVLocationInfo = null;
#region 鍒ゆ柇宸烽亾鏄惁鏈夎揣
- List<string> LocationCodes = new List<string>();
foreach (var items in rGVLocationInfos.GroupBy(x => x.RoadwayNo))//鏍规嵁宸烽亾鍙峰垎缁�
{
foreach (var item in items)
@@ -70,46 +113,56 @@
if (dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).Any()) rGVLocationInfo = null;
else return rGVLocationInfo;
}
- //var Depth = 0;
- //while (item.Depth - rGVLocationInfo.Depth != 0)
- //{
- // if (rGVLocationInfo.Depth < item.Depth) Depth = rGVLocationInfo.Depth - 1;
- // else Depth = rGVLocationInfo.Depth + 1;
- // rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth == Depth).FirstOrDefault();
- // if (rGVLocationInfo != null && rGVLocationInfo.LocationStatus == (int)LocationStatusEnum.Free) return rGVLocationInfo;
- //}
- }//鍒ゆ柇娴呮繁搴﹁揣浣嶆槸鍚︽湁璐�
+ }
else return item;
}
-
- //if (rGVLocationInfo != null)//娴呮繁搴﹁揣浣嶆湁璐э紝鎵炬繁娣卞害璐т綅鏄惁鏈夎揣
- //{
- // if (item.LocationType == 1) break;//宸烽亾绫诲瀷涓哄崟鍚戯紝鐩存帴璺宠繃
- // foreach (var locationInfo in rGVLocationInfos.Where(x => x.RoadwayNo == items.Key).OrderByDescending(x => x.Depth))
- // {
- // if (!dt_RGVLocationInfos.Where(x => x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && x.Depth < locationInfo.Depth).Any()) return locationInfo;
- // }
- // //rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).OrderBy(x => x.Depth).FirstOrDefault();//鎵炬祬娣卞害绌鸿揣浣�
- // //if (rGVLocationInfo != null)
- // //{
- // // if (dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).FirstOrDefault() == null)//鍒ゆ柇娣辨繁搴﹁揣浣嶆槸鍚︽湁璐�
- // // return rGVLocationInfo;
- // //}
- //}
- //if (rGVLocationInfo == null)
- //{
- // rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth > item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).FirstOrDefault();//鍒ゆ柇娴呮繁搴﹁揣浣嶆槸鍚︽湁璐�
- // if (item.LocationType == 1) break;//宸烽亾绫诲瀷涓哄崟鍚戯紝鐩存帴璺宠繃
- // foreach (var locationInfo in rGVLocationInfos.Where(x => x.RoadwayNo == items.Key).OrderByDescending(x => x.Depth))
- // {
- // if (!dt_RGVLocationInfos.Where(x => x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && x.Depth < locationInfo.Depth).Any()) return locationInfo;
- // }
- //}
- //else return item;
}
}
#endregion
- return FreerGVLocationInfo;
+ return rGVLocationInfo;
+ }
+ /// <summary>
+ /// 鏌ユ壘鍏ュ簱鍙敤璐т綅
+ /// </summary>
+ /// <param name="AreaCode"></param>
+ /// <returns></returns>
+ public Dt_RGVLocationInfo? GetInFreeLocationInfo(int AreaCode)
+ {
+ Dt_RGVLocationInfo? rGVLocationInfo = null;
+ Dt_RGVLocationInfo? FreerGVLocationInfo = null;
+ List<Dt_RGVLocationInfo> rGVLocationInfos = BaseDal.QueryData(x => x.WarehouseId == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);//鏌ユ壘鎵�鏈夌┖璐т綅
+ if (rGVLocationInfos == null || rGVLocationInfos.Count < 1) return rGVLocationInfo;
+ return GetFreeLocationInfo(rGVLocationInfos);
+ #region 鍒ゆ柇宸烽亾鏄惁鏈夎揣
+ //foreach (var items in rGVLocationInfos.GroupBy(x => x.RoadwayNo))//鏍规嵁宸烽亾鍙峰垎缁�
+ //{
+ // foreach (var item in items)
+ // {
+ // List<Dt_RGVLocationInfo> dt_RGVLocationInfos = BaseDal.QueryData(x => x.RoadwayNo == items.Key);//鏌ユ壘褰撳墠宸烽亾鍙疯揣浣�
+ // if (item.LocationType == 1)
+ // {
+ // rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth < item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).FirstOrDefault();//鍒ゆ柇娴呮繁搴﹁揣浣嶆槸鍚︽湁璐�
+ // if (rGVLocationInfo != null) break;
+ // return item;
+ // }
+ // else
+ // {
+ // rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth < item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).OrderByDescending(x => x.Depth).FirstOrDefault();//鍒ゆ柇娴呮繁搴﹁揣浣嶆槸鍚︽湁璐�
+ // if (rGVLocationInfo != null)
+ // {
+ // rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).OrderBy(x => x.Depth).FirstOrDefault();
+ // if (rGVLocationInfo != null)
+ // {
+ // if (dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).Any()) rGVLocationInfo = null;
+ // else return rGVLocationInfo;
+ // }
+ // }
+ // else return item;
+ // }
+ // }
+ //}
+ #endregion
+ //return FreerGVLocationInfo;
}
}
}
--
Gitblit v1.9.3