From aeb971fe12b73d83d31a83b00f0a6e2876b24a00 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 21:21:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 158 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 99 insertions(+), 59 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 3c049b9..1d53210 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"
@@ -1,6 +1,7 @@
锘縰sing Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -31,10 +32,8 @@
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,
@@ -46,12 +45,12 @@
desStationCodes = task.SourceAddress,
desType = 5
};
- fOURBOTnewMovePodTask.requestID += i;
+ fOURBOTnewMovePodTask.requestID += task.TaskId;
try
{
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
string dataJson = fOURBOTReturn.data.ToString();
@@ -64,22 +63,34 @@
task.RGVTaskId = fOURBO.taskID;
task.ExceptionMessage = "";
task.TaskState = (int)TaskStatusEnum.Execut;
+ task.Dispatchertime = DateTime.Now;
}
catch (Exception ex)
{
task.ExceptionMessage = ex.Message;
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�", "", "");
}
}
- _taskService.UpdateData(tasks);
+ var uptasks = tasks.Where(task => string.IsNullOrEmpty(task.ExceptionMessage)).ToList();
+ if (uptasks.Count() > 0) _taskService.UpdateData(uptasks);
+ var errortasks = tasks.Where(task => !string.IsNullOrEmpty(task.ExceptionMessage)).ToList();
+ if (errortasks.Count() > 0)
+ {
+ foreach (var item in errortasks)
+ {
+ Thread.Sleep(500);
+ _taskService.ErrorTaskFeedback(item, true);
+ }
+ }
content.OK();
}
catch (Exception ex)
{
content.Error(ex.Message);
- }
- finally
- {
- _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�", "", "");
}
}
@@ -109,11 +120,12 @@
keepRobot = 1,
keepRobotTimeout = 1
};
+ fOURBOTnewMovePodTask.requestID += item.TaskId;
fOURBOTnewMovePodTask.desType = 1;
fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode == 0)
{
string dataJson = fOURBOTReturn.data.ToString();
@@ -124,6 +136,7 @@
}
//FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
item.RGVTaskId = fOURBO.taskID;
+ item.Dispatchertime = DateTime.Now;
item.TaskState = (int)TaskStatusEnum.TakeFinish;
}
}
@@ -136,7 +149,7 @@
}
finally
{
- _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�", "", "");
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞﹀褰㈡娴嬩换鍔�", "", "");
}
}
#endregion
@@ -170,9 +183,11 @@
};
requestData = request; // 淇濆瓨璇锋眰鏁版嵁鐢ㄤ簬鏃ュ織
//content.candidatePodIDs = tasks.Select(x => x.PalletCode).ToList();
- string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
+ string response = HttpHelper.Post("http://127.0.0.1:4523/m2/6165241-5857331-default/440906899?apifoxApiId=440906899", request.Serialize());
+
+ //string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode == 0)
{
//ReturnBlockPodResultDto getBlockPod = fOURBOTReturn.data as ReturnBlockPodResultDto ?? throw new Exception("鏈幏鍙栧埌闃荤鎵樼洏鍏崇郴鏁版嵁");
@@ -188,10 +203,19 @@
{
var task = tasks.First(x => x.PalletCode == item.outPod);
if (item.blockPods != null && item.blockPods.Count > 0)
+ item.blockPods = item.blockPods.Except(PalletCodes).ToList();
+ if (item.blockPods != null && item.blockPods.Count > 0)
{
- task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
+ #region 鍒ゆ柇闃荤鎵樻槸鍚︿负鍑哄簱浠诲姟
+ //var except = item.blockPods.Except(PalletCodes).ToList();
+ #endregion
+ 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 +261,7 @@
try
{
#region 鑾峰彇璐т綅
- var rGVLocationInfo = _rGVLocationInfoService.GetInFreeLocationInfo(item.Roadway);
+ var rGVLocationInfo = _rGVLocationInfoService.GetInFreeLocationInfo(item.Roadway.ObjToInt());
if (rGVLocationInfo == null)
{
item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
@@ -258,6 +282,7 @@
{
autoToRest = 1
};
+ fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmssfff") + item.TaskId;
item.CurrentAddress = item.NextAddress;
item.NextAddress = rGVLocationInfo.LocationCode;
item.TargetAddress = rGVLocationInfo.LocationCode;
@@ -265,15 +290,15 @@
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
var fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode == 0)
{
var data = fOURBOTReturn.data.ToString();
var fOURBO = data.DeserializeObject<FOURBOTnewMovePodTaskResponseData>();
item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
-
rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
+ item.Dispatchertime = DateTime.Now;
locationsToUpdate.Add(rGVLocationInfo);
#region 閲婃斁鍏ュ簱绔欏彴
@@ -300,6 +325,10 @@
item.ExceptionMessage = $"澶勭悊浠诲姟寮傚父锛歿ex.Message}";
//WriteError($"{nameof(TaskJob)}-{item.TaskId}", ex.Message, ex);
content.Error($"鍥涘悜杞︽帴鍙ｈ繑鍥為敊璇細{ex.Message}");
+ }
+ finally
+ {
+
}
}
#region MyRegion
@@ -405,7 +434,7 @@
}
finally
{
- _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂澶栧舰妫�娴嬩换鍔″け璐�", "", "");
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂澶栧舰妫�娴嬫垚鍔熶换鍔�", "", "");
}
}
#endregion
@@ -444,12 +473,14 @@
//FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
string dataJson = fOURBOTReturn.data.ToString();
FOURBOTnewMovePodTaskResponseData? fOURBO = JsonConvert.DeserializeObject<FOURBOTnewMovePodTaskResponseData>(dataJson);
+ content.OK(data: fOURBO);
if (fOURBO == null || fOURBO.taskID == 0)
{
throw new Exception($"鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID锛岃繑鍥炴暟鎹細{response}");
}
item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
+ item.Dispatchertime = DateTime.Now;
}
}
_taskService.UpdateData(tasks);
@@ -467,49 +498,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
@@ -534,7 +567,7 @@
}
string response = HttpHelper.Post(apiInfo.ApiAddress, moveBlock.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode == 0)
{
string dataJson = fOURBOTReturn.data.ToString();
@@ -552,6 +585,7 @@
var task = tasks.First(x => x.PalletCode == item.podID);
task.RGVTaskId = item.taskID;
task.TaskState = TaskStatusEnum.RGV_MoveTaskSend.ObjToInt();
+ task.Dispatchertime = DateTime.Now;
dt_Tasks.Add(task);
}
_taskService.UpdateData(dt_Tasks);
@@ -576,10 +610,11 @@
{
foreach (var item in tasks)
{
- var takes = _taskService.Repository.QueryFirst(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory);
+ var takes = _taskService.Repository.QueryFirst(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory && (x.TaskState == (int)TaskStatusEnum.RGV_NewMoveTask || x.TaskState == (int)TaskStatusEnum.RGV_MoveTaskSend));
if (takes == null)
{
item.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
+ item.Dispatchertime = DateTime.Now;
}
}
_taskService.UpdateData(tasks);
@@ -604,8 +639,12 @@
{
i++;
var stationManger = _stationMangerService.GetOutStationInfo(item.TargetAddress);
+ //if (stationManger.IsOccupied != LocationStatusEnum.Free.ObjToInt())
+ //{
+ // item.ExceptionMessage = $"鍑哄簱绔欏彴銆恵stationManger.StationCode}銆戣鍗犵敤";
+ // continue;
+ //}
item.NextAddress = stationManger.StationCode;
- if (stationManger.IsOccupied != LocationStatusEnum.Free.ObjToInt()) continue;
#region 涓嬪彂鍑哄簱浠诲姟
fOURBOTnewMovePodTask.priority = item.Grade;
fOURBOTnewMovePodTask.podID = item.PalletCode;
@@ -620,10 +659,10 @@
autoToRest = 1
};
fOURBOTnewMovePodTask.desType = 5;
- fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmss") + i;
+ fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmssfff") + item.TaskId;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode == 0)
{
string dataJson = fOURBOTReturn.data.ToString();
@@ -634,8 +673,9 @@
}
item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Execut;
- stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
- _stationMangerService.UpdateData(stationManger);
+ item.Dispatchertime = DateTime.Now;
+ //stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ //_stationMangerService.UpdateData(stationManger);
}
#endregion
}
--
Gitblit v1.9.3