From f56f8d4bf3bf088579a169519ef2547d40586f76 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 四月 2026 18:42:53 +0800
Subject: [PATCH] 添加平库货位上下架容器接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs | 144 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 25 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 62c53d9..4e6faa9 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;
@@ -20,10 +22,10 @@
}
private Dictionary<string, OrderByType> _emptyAssignOrderBy = new Dictionary<string, OrderByType>()
{
+ { nameof(Dt_RGVLocationInfo.Row), OrderByType.Asc },
{ nameof(Dt_RGVLocationInfo.Depth), OrderByType.Desc },
{ nameof(Dt_RGVLocationInfo.Layer), OrderByType.Asc },
//{ nameof(Dt_RGVLocationInfo.Column), OrderByType.Asc },
- { nameof(Dt_RGVLocationInfo.Row), OrderByType.Asc },
};
private Dictionary<string, OrderByType> _DepthAscOrderBy = new Dictionary<string, OrderByType>()
{
@@ -35,40 +37,132 @@
{
return BaseDal.QueryData(x => x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
}
+
+ public (List<Dt_Task>, List<Dt_RGVLocationInfo>) GetMoveFreeLocationInfo(List<Dt_RGVLocationInfo> locationInfos)
+ {
+ Dt_RGVLocationInfo? rGVLocationInfo = null;
+ 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 鍒ゆ柇宸烽亾鏄惁鏈夎揣
+ 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.Free.ObjToInt()).FirstOrDefault();//鍒ゆ柇娴呮繁搴﹁揣浣嶆槸鍚︽湁璐�
+ if (rGVLocationInfo != null) break;
+ return item;
+ }
+ else
+ {
+ rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth < item.Depth && x.LocationStatus != LocationStatusEnum.Free.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.Free.ObjToInt()).Any()) rGVLocationInfo = null;
+ else return rGVLocationInfo;
+ }
+ }
+ else return item;
+ }
+ }
+ }
+ #endregion
+ return rGVLocationInfo;
+ }
/// <summary>
/// 鏌ユ壘鍏ュ簱鍙敤璐т綅
/// </summary>
/// <param name="AreaCode"></param>
/// <returns></returns>
- public Dt_RGVLocationInfo? GetInFreeLocationInfo(string AreaCode)
+ public Dt_RGVLocationInfo? GetInFreeLocationInfo(int AreaCode)
{
Dt_RGVLocationInfo? rGVLocationInfo = null;
- List<Dt_RGVLocationInfo> rGVLocationInfos = BaseDal.QueryData(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
+ 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 鍒ゆ柇宸烽亾鏄惁鏈夎揣
- List<string> LocationCodes = new List<string>();
- foreach (var item in rGVLocationInfos)
- {
- Dt_RGVLocationInfo dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == item.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth < item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
- if (dt_RGVLocationInfo == null) return dt_RGVLocationInfo;
- dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == item.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth > item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _DepthAscOrderBy);
- }
- if (rGVLocationInfo != null)
- {
- List<string> NoRoadwayNos = new List<string>();
- while (true)
- {
- Dt_RGVLocationInfo dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == rGVLocationInfo.RoadwayNo && x.Depth < rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
- if (dt_RGVLocationInfo == null) return rGVLocationInfo;
-
- rGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == dt_RGVLocationInfo.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth > dt_RGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _DepthAscOrderBy);
- dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == rGVLocationInfo.RoadwayNo && x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
- if (dt_RGVLocationInfo == null) return rGVLocationInfo;
-
- }
- }
+ //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 rGVLocationInfo;
+ //return FreerGVLocationInfo;
}
}
}
--
Gitblit v1.9.3