From 01caefd4f33e754ec8aacf38e392e62a4df18d44 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 12 三月 2026 18:30:45 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 104 insertions(+), 39 deletions(-)
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 5323c10..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"
@@ -20,13 +20,75 @@
{
public partial class TaskJob
{
-
- #region 涓嬪彂鍥涘悜杞﹀叆搴撲换鍔�
/// <summary>
/// 涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�
/// </summary>
/// <param name="tasks"></param>
- public void SendRGVInTask(List<Dt_Task> tasks)
+ public void SendRGVNewInTask(List<Dt_Task> tasks)
+ {
+ FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new();
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ int i = 0;
+ foreach (var task in tasks)
+ {
+ i++;
+ fOURBOTnewMovePodTask = new()
+ {
+ priority = task.Grade,
+ podID = task.PalletCode,
+ desExt = new
+ {
+ unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ },
+ desStationCodes = task.SourceAddress,
+ desType = 5
+ };
+ fOURBOTnewMovePodTask.requestID += i;
+ try
+ {
+ string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data = fOURBOTReturn;
+ if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+
+ string dataJson = fOURBOTReturn.data.ToString();
+ FOURBOTnewMovePodTaskResponseData? fOURBO = JsonConvert.DeserializeObject<FOURBOTnewMovePodTaskResponseData>(dataJson);
+ if (fOURBO == null || fOURBO.taskID == 0)
+ {
+ throw new Exception($"鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID锛岃繑鍥炴暟鎹細{response}");
+ }
+ //FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
+ task.RGVTaskId = fOURBO.taskID;
+ task.ExceptionMessage = "";
+ task.TaskState = (int)TaskStatusEnum.Execut;
+ }
+ catch (Exception ex)
+ {
+ task.ExceptionMessage = ex.Message;
+ }
+ }
+ _taskService.UpdateData(tasks);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�", "", "");
+ }
+ }
+
+ #region
+ /// <summary>
+ /// 涓嬪彂鍥涘悜杞﹀褰㈡娴嬩换鍔�
+ /// </summary>
+ /// <param name="tasks"></param>
+ public void SendRGVCheckShapeTask(List<Dt_Task> tasks)
{
FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new();
WebResponseContent content = new WebResponseContent();
@@ -127,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
{
@@ -175,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}銆戝彲鐢ㄧ┖璐т綅锛�";
@@ -405,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