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_IBasicInfoService/IRGVLocationInfoService.cs | 10 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs | 143 +++++++++++++++++++---------
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 61 ++++++-----
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 75 +++++++-------
4 files changed, 179 insertions(+), 110 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;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs"
index 28b70bc..11101ee 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs"
@@ -11,18 +11,24 @@
{
public interface IRGVLocationInfoService : IService<Dt_RGVLocationInfo>
{
- public IRepository<Dt_RGVLocationInfo> Repository { get; }
+ public IRepository<Dt_RGVLocationInfo> Repository { get; }
/// <summary>
/// 鑾峰彇鍏ュ簱鍙敤绌鸿揣浣�
/// </summary>
/// <param name="AreaCode"></param>
/// <param name="containerType"></param>
/// <returns></returns>
- Dt_RGVLocationInfo GetInFreeLocationInfo(string AreaCode);
+ Dt_RGVLocationInfo GetInFreeLocationInfo(int AreaCode);
/// <summary>
/// 鑾峰彇鎵�鏈夌┖璐т綅
/// </summary>
/// <returns></returns>
List<Dt_RGVLocationInfo> GetFreeLocationInfos();
+ /// <summary>
+ /// 鑾峰彇绉诲簱鍙敤绌鸿揣浣�
+ /// </summary>
+ /// <param name="locationInfo"></param>
+ /// <returns></returns>
+ (List<Dt_Task>, List<Dt_RGVLocationInfo>) GetMoveFreeLocationInfo(List<Dt_RGVLocationInfo> locationInfos);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index b1e6b0f..fc3e3d6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -96,42 +96,49 @@
//var task = BaseDal.QueryFirst(x => x.RGVTaskId == Rgv.content.taskID);
var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵Rgv.content.taskID}銆�");
- if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
+ if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
{
- if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
- {
- task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
- //BaseDal.UpdateData(task);//缁欒川妫�闂ㄥ啓鍏ュ惎鍔ㄤ俊鍙�
- TaskFeedback(task, 4);
- var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice ?? throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
- device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
- }
- else
- {
- TaskFromCompleted(task, deviceTypeEnum);
- }
+
}
- else if (Rgv.messageType == 10)
+ else
{
- if (Rgv.content.status == 2) TaskFeedback(task, 1);
- if (Rgv.content.status == 4)
+ if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
{
- if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
{
- task.TaskState = (int)TaskStatusEnum.CheckShapeing;
- BaseDal.UpdateData(task);
+ task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
+ //BaseDal.UpdateData(task);//缁欒川妫�闂ㄥ啓鍏ュ惎鍔ㄤ俊鍙�
+ TaskFeedback(task, 4);
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice ?? throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
+ device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
+ else
{
- TaskCompleted(task, deviceTypeEnum);
+ TaskFromCompleted(task, deviceTypeEnum);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPInbound && !string.IsNullOrEmpty(task.ExceptionMessage))
+ }
+ else if (Rgv.messageType == 10)
+ {
+ if (Rgv.content.status == 2) TaskFeedback(task, 1);
+ if (Rgv.content.status == 4)
{
- ErrorTaskFeedback(task, !task.ExceptionMessage.Contains("澶栨澶辫触"));
- }
- else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
- {
- TaskCompleted(task, deviceTypeEnum);
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ {
+ task.TaskState = (int)TaskStatusEnum.CheckShapeing;
+ BaseDal.UpdateData(task);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPInbound && !string.IsNullOrEmpty(task.ExceptionMessage))
+ {
+ ErrorTaskFeedback(task, !task.ExceptionMessage.Contains("澶栨澶辫触"));
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
index 3c049b9..1f4eef1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
@@ -189,9 +189,10 @@
var task = tasks.First(x => x.PalletCode == item.outPod);
if (item.blockPods != null && item.blockPods.Count > 0)
{
- task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
+ var responseContent = AddMoveTask(item.blockPods, task);//娣诲姞绉诲簱浠诲姟
+ if (!responseContent.Status) task.ExceptionMessage = responseContent.Message;
+ else task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
dt_Tasks.Add(task);
- AddMoveTask(item.blockPods);//娣诲姞绉诲簱浠诲姟
}
else
{
@@ -237,7 +238,7 @@
try
{
#region 鑾峰彇璐т綅
- var rGVLocationInfo = _rGVLocationInfoService.GetInFreeLocationInfo(item.Roadway);
+ var rGVLocationInfo = _rGVLocationInfoService.GetInFreeLocationInfo(item.Roadway.ObjToInt());
if (rGVLocationInfo == null)
{
item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
@@ -467,49 +468,51 @@
#endregion
#region 娣诲姞绉诲簱浠诲姟
- public void AddMoveTask(List<string> blockPods)
+ public WebResponseContent AddMoveTask(List<string> blockPods, Dt_Task task)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_RGVLocationInfo> _UpRGVLocationInfos = new List<Dt_RGVLocationInfo>();
List<Dt_RGVLocationInfo> rGVLocationInfos = _rGVLocationInfoService.Repository.QueryData(x => blockPods.Contains(x.PalletCode));
- var FreeLocationInfos = _rGVLocationInfoService.GetFreeLocationInfos();
- if (FreeLocationInfos.Count < 1) throw new Exception($"鎴愬搧搴撳垱寤虹Щ搴撲换鍔℃棤鍙敤绌鸿揣浣�");
- foreach (var item in rGVLocationInfos)
+ var Items = _rGVLocationInfoService.GetMoveFreeLocationInfo(rGVLocationInfos);
+
+ List<Dt_Task> tasks = Items.Item1;
+ List<Dt_RGVLocationInfo> _UpRGVLocationInfos = Items.Item2;
+ if (tasks.Count < blockPods.Count) throw new Exception("鍙Щ搴撶┖璐т綅灏戜簬闇�绉诲簱鎵樼洏鏁伴噺");
+
+ tasks.ForEach(x =>
{
- Dt_RGVLocationInfo? rGVLocationInfo = FreeLocationInfos.Where(x => x.Layer == item.Layer && x.RoadwayNo != item.RoadwayNo).OrderBy(n => Math.Abs(n.Row - item.Row)).FirstOrDefault();
- rGVLocationInfo ??= FreeLocationInfos.First();
- Dt_Task dt_Task = new()
- {
- TaskNum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- //WMSTaskNum = taskDTO.taskCode,
- //WMSId = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- Grade = 1,
- PalletCode = item.PalletCode,
- Roadway = item.RoadwayNo,
- TaskState = TaskStatusEnum.RGV_NewMoveTask.ObjToInt(),
- TaskType = TaskTypeEnum.CPMoveInventory.ObjToInt(),
- SourceAddress = item.LocationCode,
- CurrentAddress = item.LocationCode,
- NextAddress = rGVLocationInfo.LocationCode,
- TargetAddress = rGVLocationInfo.LocationCode,
- Creater = "WCS",
- };
- tasks.Add(dt_Task);
- item.LocationStatus = LocationStatusEnum.MoveLock.ObjToInt();
- rGVLocationInfo.LocationStatus = LocationStatusEnum.MoveLock.ObjToInt();
- _UpRGVLocationInfos.Add(rGVLocationInfo);
- FreeLocationInfos.Remove(rGVLocationInfo);
+ x.TaskNum = _taskService.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
+ x.WMSTaskNum = task.WMSTaskNum;
+ });
+ rGVLocationInfos.ForEach(x =>
+ {
+ x.LocationStatus = LocationStatusEnum.MoveLock.ObjToInt();
+ });
+ _UpRGVLocationInfos.ForEach(x =>
+ {
+ x.LocationStatus = LocationStatusEnum.MoveLock.ObjToInt();
+ });
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ _rGVLocationInfoService.UpdateData(rGVLocationInfos);
+ _rGVLocationInfoService.UpdateData(_UpRGVLocationInfos);
+ _taskService.AddData(tasks);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
}
- _rGVLocationInfoService.UpdateData(rGVLocationInfos);
- _rGVLocationInfoService.UpdateData(_UpRGVLocationInfos);
- _taskService.AddData(tasks);
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception(ex.Message);
+ }
}
catch (Exception ex)
{
- throw new Exception(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
#endregion
--
Gitblit v1.9.3