From 4e839ad077304eaecb6dfb35fdc9b0d30a209a76 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 28 二月 2026 13:21:55 +0800
Subject: [PATCH] 优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 205 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 155 insertions(+), 50 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 81a498f..10a85c8 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"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Helper;
@@ -16,16 +17,18 @@
public partial class TaskJob
{
- #region 涓嬪彂鍥涘悜杞︿换鍔�
- public void SendRGVTask(List<Dt_Task> tasks)
+ #region 涓嬪彂鍥涘悜杞﹀叆搴撲换鍔�
+ /// <summary>
+ /// 涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�
+ /// </summary>
+ /// <param name="tasks"></param>
+ public void SendRGVInTask(List<Dt_Task> tasks)
{
FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new();
try
{
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- #region 鍏ュ簱
- var intasks = tasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).ToList();
- foreach (var item in intasks)
+ foreach (var item in tasks)
{
fOURBOTnewMovePodTask.priority = item.Grade;
fOURBOTnewMovePodTask.podID = item.PalletCode;
@@ -39,45 +42,59 @@
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Execut;
}
}
- _taskService.UpdateData(intasks);
- #endregion
+ _taskService.UpdateData(tasks);
+ }
+ catch (Exception ex)
+ {
+ WriteError(nameof(TaskJob), ex.Message, ex);
+ }
+ }
+ #endregion
- #region 鍑哄簱
- var outtasks = tasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
- foreach (var item in outtasks)
+ #region 澶勭悊鍑哄簱浠诲姟鏄惁闇�瑕佺Щ搴�
+ /// <summary>
+ /// 澶勭悊鍑哄簱浠诲姟鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="tasks"></param>
+ public void IsMoveTask(List<Dt_Task> tasks)
+ {
+ try
+ {
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GetBlockPodContentDto)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ List<Dt_Task> dt_Tasks = new List<Dt_Task>();
+ //var PalletCodes = tasks.Select(x => x.PalletCode).ToList();
+ GetBlockPodContentDto content = new GetBlockPodContentDto();
+ content.CandidatePodIDs = tasks.Select(x => x.PalletCode).ToList();
+ string response = HttpHelper.Post(apiInfo.ApiAddress, content.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode == 0)
{
- ///鍒ゆ柇鏄惁闇�瑕佺Щ搴�,鍑哄簱绔欏彴鏄惁绌洪棽
- if (IsNoMoveTask(item) && StationIsFree(item.TargetAddress))
+ ReturnBlockPodResultDto getBlockPod = fOURBOTReturn.data as ReturnBlockPodResultDto ?? throw new Exception("鏈幏鍙栧埌闃荤鎵樼洏鍏崇郴鏁版嵁");
+ foreach (var Result in getBlockPod.Result)
{
- #region 涓嬪彂鍑哄簱浠诲姟
- fOURBOTnewMovePodTask.priority = item.Grade;
- fOURBOTnewMovePodTask.podID = item.PalletCode;
- fOURBOTnewMovePodTask.destination = item.NextAddress;
- fOURBOTnewMovePodTask.desExt = new
+ foreach (var item in Result.outPods)
{
- unload = 1//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
- };
- fOURBOTnewMovePodTask.desType = 2;
- string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
- FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- if (fOURBOTReturn.returnCode == 0)
- {
- item.RGVTaskId = fOURBOTReturn.data.taskID;
- item.TaskState = (int)TaskStatusEnum.Execut;
+ var task = tasks.First(x => x.PalletCode == item.outPod);
+ if (item.blockPods.Count > 0)
+ {
+ task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
+ dt_Tasks.Add(task);
+ AddMoveTask(item.blockPods);
+ }
+ else
+ {
+ task.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
+ dt_Tasks.Add(task);
+ }
}
- #endregion
}
- else
- {
- item.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
- }
+ _taskService.UpdateData(dt_Tasks);
}
- _taskService.UpdateData(outtasks);
- #endregion
}
catch (Exception ex)
{
@@ -112,6 +129,7 @@
{
item.CurrentAddress = item.NextAddress;
item.NextAddress = rGVLocationInfo.LocationCode;
+ item.Roadway = rGVLocationInfo.RoadwayNo;
fOURBOTnewMovePodTask.priority = item.Grade;
fOURBOTnewMovePodTask.podID = item.PalletCode;
fOURBOTnewMovePodTask.destination = item.NextAddress;
@@ -124,7 +142,8 @@
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
rGVLocationInfos.Add(rGVLocationInfo);
@@ -173,7 +192,8 @@
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
}
}
@@ -186,32 +206,114 @@
}
#endregion
- #region 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
- public static bool IsNoMoveTask(Dt_Task task)
+ #region 娣诲姞绉诲簱浠诲姟
+ public void AddMoveTask(List<string> blockPods)
{
- var isNoMove = true;
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)
+ {
+ Dt_RGVLocationInfo? rGVLocationInfo = FreeLocationInfos.Where(x => x.Layer == item.Layer).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);
+ }
+ _rGVLocationInfoService.UpdateData(rGVLocationInfos);
+ _rGVLocationInfoService.UpdateData(_UpRGVLocationInfos);
+ _taskService.AddData(tasks);
}
catch (Exception ex)
{
throw new Exception(ex.Message);
}
- return isNoMove;
}
#endregion
- #region 鍒ゆ柇鍑哄簱鍙ｆ槸鍚︾┖闂�
- public bool StationIsFree(string StationCode)
+ #region 涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�
+ public void SendMoveTasks(List<Dt_Task> tasks)
{
- Dt_StationManger stationManger = _stationMangerService.GetOutStationInfo(StationCode);
- return stationManger.IsOccupied == LocationStatusEnum.Free.ObjToInt();
+ try
+ {
+ List<Dt_Task> dt_Tasks = new List<Dt_Task>();
+ List<MoveBlockPodContentDto> moveBlocks = new List<MoveBlockPodContentDto>();
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(MoveBlockPodContentDto)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅鎵归噺鎼繍闃荤鎵樹换鍔℃帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
+ foreach (var item in tasks)
+ {
+ MoveBlockPodContentDto moveBlock = new MoveBlockPodContentDto()
+ {
+ podID = item.PalletCode,
+ des = item.TargetAddress
+ };
+ moveBlocks.Add(moveBlock);
+ }
+ string response = HttpHelper.Post(apiInfo.ApiAddress, moveBlocks.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode == 0)
+ {
+ MoveBlockPodsDataDto moveBlockPodsData = fOURBOTReturn.data as MoveBlockPodsDataDto ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞︽壒閲忔惉杩愰樆纰嶆墭杩斿洖鐨勪换鍔D");
+
+ foreach (var item in moveBlockPodsData.succList)
+ {
+ var task = tasks.First(x => x.PalletCode == item.podID);
+ task.RGVTaskId = item.taskID;
+ task.TaskState = TaskStatusEnum.RGV_MoveTaskSend.ObjToInt();
+ dt_Tasks.Add(task);
+ }
+ _taskService.UpdateData(dt_Tasks);
+ }
+ }
+ catch (Exception ex)
+ {
+ WriteError(nameof(TaskJob), ex.Message, ex);
+ }
}
#endregion
- #region 绉诲簱鍚庝笅鍙戝嚭搴撲换鍔�
- public void SendMoveToExecuteTask(List<Dt_Task> tasks)
+ #region 澶勭悊寰呯Щ搴撳悗鍑哄簱浠诲姟
+ public void MoveToExecuteTask(List<Dt_Task> tasks)
+ {
+ try
+ {
+ foreach (var item in tasks)
+ {
+ if (_taskService.Repository.QueryFirst(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory) == null)
+ item.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
+ }
+ _taskService.UpdateData(tasks);
+ }
+ catch (Exception ex)
+ {
+ WriteError(nameof(TaskJob), ex.Message, ex);
+ }
+ }
+ #endregion
+
+ #region 涓嬪彂鍑哄簱浠诲姟
+ public void SendOutTask(List<Dt_Task> tasks)
{
try
{
@@ -219,8 +321,8 @@
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
foreach (var item in tasks)
{
- if (_taskService.Repository.QueryData(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory).Any()) continue;
- if (!StationIsFree(item.TargetAddress)) continue;
+ var stationManger = _stationMangerService.GetOutStationInfo(item.TargetAddress);
+ if (stationManger.IsOccupied != LocationStatusEnum.Free.ObjToInt()) continue;
#region 涓嬪彂鍑哄簱浠诲姟
fOURBOTnewMovePodTask.priority = item.Grade;
fOURBOTnewMovePodTask.podID = item.PalletCode;
@@ -234,8 +336,11 @@
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Execut;
+ stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ _stationMangerService.UpdateData(stationManger);
}
#endregion
}
--
Gitblit v1.9.3