From 761260f2ac0aa211625c8904cc86fc2400a8adfc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 04 三月 2026 16:56:57 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 454 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 349 insertions(+), 105 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..b8b1bdd 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,10 +1,15 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.RGV.FOURBOT;
@@ -16,16 +21,19 @@
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();
+ WebResponseContent content = new WebResponseContent();
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;
@@ -37,51 +45,104 @@
fOURBOTnewMovePodTask.desType = 2;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data= fOURBOTReturn;
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ 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");
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Execut;
}
}
- _taskService.UpdateData(intasks);
- #endregion
-
- #region 鍑哄簱
- var outtasks = tasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
- foreach (var item in outtasks)
- {
- ///鍒ゆ柇鏄惁闇�瑕佺Щ搴�,鍑哄簱绔欏彴鏄惁绌洪棽
- if (IsNoMoveTask(item) && StationIsFree(item.TargetAddress))
- {
- #region 涓嬪彂鍑哄簱浠诲姟
- fOURBOTnewMovePodTask.priority = item.Grade;
- fOURBOTnewMovePodTask.podID = item.PalletCode;
- fOURBOTnewMovePodTask.destination = item.NextAddress;
- fOURBOTnewMovePodTask.desExt = new
- {
- 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;
- }
- #endregion
- }
- else
- {
- item.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
- }
- }
- _taskService.UpdateData(outtasks);
- #endregion
+ _taskService.UpdateData(tasks);
+ content.OK();
}
catch (Exception ex)
{
- WriteError(nameof(TaskJob), ex.Message, ex);
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�", "","");
+ }
+ }
+ #endregion
+
+ #region 澶勭悊鍑哄簱浠诲姟鏄惁闇�瑕佺Щ搴�
+ /// <summary>
+ /// 澶勭悊鍑哄簱浠诲姟鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="tasks"></param>
+ public void IsMoveTask(List<Dt_Task> tasks)
+ {
+
+ object requestData = null; // 娣诲姞鍙橀噺璁板綍璇锋眰鏁版嵁
+ WebResponseContent content =new WebResponseContent();
+ 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();
+ var request = new GetBlockPodContentListDto
+ {
+ content = new List<GetBlockPodContentDto>
+ {
+ new GetBlockPodContentDto
+ {
+ candidatePodIDs = PalletCodes,
+ num = 0 // 0琛ㄧず鍏ㄩ儴鍑猴紝濡傛灉闇�瑕侀檺鍒舵暟閲忓彲浠ヨ皟鏁�
+ }
+ }
+ };
+ requestData = request; // 淇濆瓨璇锋眰鏁版嵁鐢ㄤ簬鏃ュ織
+ //content.candidatePodIDs = tasks.Select(x => x.PalletCode).ToList();
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data= fOURBOTReturn;
+ if (fOURBOTReturn.returnCode == 0)
+ {
+ //ReturnBlockPodResultDto getBlockPod = fOURBOTReturn.data as ReturnBlockPodResultDto ?? throw new Exception("鏈幏鍙栧埌闃荤鎵樼洏鍏崇郴鏁版嵁");
+ var dataJson = fOURBOTReturn.data.ToString();
+ ReturnBlockPodResultDto? getBlockPod = JsonConvert.DeserializeObject<ReturnBlockPodResultDto>(dataJson);
+ if (getBlockPod.Result.Count==0)
+ {
+ throw new Exception("鏈幏鍙栧埌闃荤鎵樼洏鍏崇郴鏁版嵁");
+ }
+ foreach (var Result in getBlockPod.Result)
+ {
+ foreach (var item in Result.outPods)
+ {
+ 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);
+ }
+ }
+ }
+ _taskService.UpdateData(dt_Tasks);
+ content.OK();
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(requestData, content, "澶勭悊鍑哄簱浠诲姟鏄惁闇�瑕佺Щ搴�", "", "");
}
}
#endregion
@@ -94,57 +155,110 @@
public void SendCheckShapeingOkTask(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("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- List<Dt_RGVLocationInfo> rGVLocationInfos = new List<Dt_RGVLocationInfo>();
- List<Dt_StationManger> stationMangers = new List<Dt_StationManger>();
+ var tasksToUpdate = new List<Dt_Task>();
+ var locationsToUpdate = new List<Dt_RGVLocationInfo>();
+ var stationsToUpdate = new List<Dt_StationManger>();
+ #region 浠诲姟涓嬪彂
foreach (var item in tasks)
{
- #region 鑾峰彇璐т綅
- var rGVLocationInfo = _rGVLocationInfoService.GetFreeLocationInfo(item.Roadway);
- if (rGVLocationInfo == null)
+ try
{
- item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
- }
- #endregion
- else
- {
+ #region 鑾峰彇璐т綅
+ var rGVLocationInfo = _rGVLocationInfoService.GetFreeLocationInfo(item.Roadway);
+ if (rGVLocationInfo == null)
+ {
+ item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
+ continue;
+ }
+ #endregion
+ fOURBOTnewMovePodTask = new FOURBOTnewMovePodTask
+ {
+ priority = item.Grade,
+ podID = item.PalletCode,
+ destination = rGVLocationInfo.LocationCode,
+ desExt = new { unload = 1 }, // 鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ desType = 2
+ };
item.CurrentAddress = item.NextAddress;
item.NextAddress = rGVLocationInfo.LocationCode;
- fOURBOTnewMovePodTask.priority = item.Grade;
- fOURBOTnewMovePodTask.podID = item.PalletCode;
- fOURBOTnewMovePodTask.destination = item.NextAddress;
- fOURBOTnewMovePodTask.desExt = new
- {
- unload = 1//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
- };
- fOURBOTnewMovePodTask.desType = 2;
+ item.Roadway = rGVLocationInfo.RoadwayNo;
+
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
- FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ var fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data = fOURBOTReturn;
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ var data = fOURBOTReturn.data.ToString();
+ var fOURBO = data.DeserializeObject<FOURBOTnewMovePodTaskResponseData>();
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
+
rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
- rGVLocationInfos.Add(rGVLocationInfo);
+ locationsToUpdate.Add(rGVLocationInfo);
+
#region 閲婃斁鍏ュ簱绔欏彴
- Dt_StationManger stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
- stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
- stationMangers.Add(stationManger);
+ var stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
+ if (stationManger != null)
+ {
+ stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+ stationsToUpdate.Add(stationManger);
+ }
+ content.OK();
#endregion
}
+ else
+ {
+ item.ExceptionMessage = $"鍥涘悜杞︽帴鍙ｈ繑鍥為敊璇細{fOURBOTReturn.returnMsg}";
+ // 璁板綍澶辫触鐨勪换鍔�
+ content.Error($"鍥涘悜杞︽帴鍙ｈ繑鍥為敊璇細{fOURBOTReturn.returnMsg}");
+ }
}
- }
- _taskService.Db.Ado.BeginTran();
- _taskService.UpdateData(tasks);
- _rGVLocationInfoService.UpdateData(rGVLocationInfos);
- _stationMangerService.UpdateData(stationMangers);
- _taskService.Db.Ado.CommitTran();
+ catch (Exception ex)
+ {
+ item.ExceptionMessage = $"澶勭悊浠诲姟寮傚父锛歿ex.Message}";
+ //WriteError($"{nameof(TaskJob)}-{item.TaskId}", ex.Message, ex);
+ content.Error($"鍥涘悜杞︽帴鍙ｈ繑鍥為敊璇細{ex.Message}");
+ }
+ tasksToUpdate.Add(item);
+ }
+ #endregion
+ #region 鏇存柊鏁版嵁
+ // 濡傛灉鏈夐渶瑕佹洿鏂扮殑鏁版嵁锛屾墠鎵ц浜嬪姟
+ if (tasksToUpdate.Any() || locationsToUpdate.Any() || stationsToUpdate.Any())
+ {
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+
+ if (tasksToUpdate.Any())
+ _taskService.UpdateData(tasksToUpdate);
+ if (locationsToUpdate.Any())
+ _rGVLocationInfoService.UpdateData(locationsToUpdate);
+ if (stationsToUpdate.Any())
+ _stationMangerService.UpdateData(stationsToUpdate);
+
+ _unitOfWorkManage.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ WriteError(nameof(TaskJob), ex.Message, ex);
+ }
+ }
+ #endregion
}
catch (Exception ex)
{
WriteError(nameof(TaskJob), ex.Message, ex);
+ content.Error($"涓嬪彂澶栧舰妫�娴嬩换鍔″け璐ex.Message}");
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂澶栧舰妫�娴嬩换鍔″け璐�", "", "");
}
}
#endregion
@@ -153,6 +267,7 @@
public void SendCheckShapeingNGTask(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("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
@@ -171,10 +286,148 @@
fOURBOTnewMovePodTask.desType = 2;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data = fOURBOTReturn;
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ //FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
+ string dataJson = fOURBOTReturn.data.ToString();
+ FOURBOTnewMovePodTaskResponseData? fOURBO = JsonConvert.DeserializeObject<FOURBOTnewMovePodTaskResponseData>(dataJson);
+ if (fOURBO == null || fOURBO.taskID == 0)
+ {
+ throw new Exception($"鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID锛岃繑鍥炴暟鎹細{response}");
+ }
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
+ }
+ }
+ _taskService.UpdateData(tasks);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂澶栧舰妫�娴嬪け璐ヤ换鍔�", "", "");
+ }
+ }
+ #endregion
+
+ #region 娣诲姞绉诲簱浠诲姟
+ public void AddMoveTask(List<string> blockPods)
+ {
+ 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);
+ }
+ }
+ #endregion
+
+ #region 涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�
+ public void SendMoveTasks(List<Dt_Task> tasks)
+ {
+ WebResponseContent content = new WebResponseContent();
+ List<Dt_Task> dt_Tasks = new List<Dt_Task>();
+ List<MoveBlockPodContentDto> moveBlocks = new List<MoveBlockPodContentDto>();
+ try
+ {
+
+ 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>();
+ content.Data = fOURBOTReturn;
+ if (fOURBOTReturn.returnCode == 0)
+ {
+ string dataJson = fOURBOTReturn.data.ToString();
+ //MoveBlockPodsDataDto moveBlockPodsData = fOURBOTReturn.data as MoveBlockPodsDataDto ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞︽壒閲忔惉杩愰樆纰嶆墭杩斿洖鐨勪换鍔D");
+ MoveBlockPodsDataDto? moveBlockPodsData = JsonConvert.DeserializeObject<MoveBlockPodsDataDto>(dataJson);
+ if (moveBlockPodsData == null || moveBlockPodsData.succList.Count == 0)
+ {
+ throw new Exception($"鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID锛岃繑鍥炴暟鎹細{response}");
+ }
+
+ foreach (var item in moveBlockPodsData.succList)
+ {
+ if (item.taskID == 0)
+ continue; // 璺宠繃鏃犳晥鐨勪换鍔D
+ 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);
+ content.OK();
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(moveBlocks, content, "涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�", "", "");
+ }
+ }
+ #endregion
+
+ #region 澶勭悊寰呯Щ搴撳悗鍑哄簱浠诲姟
+ public void MoveToExecuteTask(List<Dt_Task> tasks)
+ {
+ try
+ {
+ foreach (var item in tasks)
+ {
+ var takes = _taskService.Repository.QueryFirst(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory);
+ if (takes == null)
+ {
+ item.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
}
}
_taskService.UpdateData(tasks);
@@ -186,41 +439,18 @@
}
#endregion
- #region 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
- public static bool IsNoMoveTask(Dt_Task task)
+ #region 涓嬪彂鍑哄簱浠诲姟
+ public void SendOutTask(List<Dt_Task> tasks)
{
- var isNoMove = true;
+ FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new();
+ WebResponseContent content = new WebResponseContent();
try
{
-
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- return isNoMove;
- }
- #endregion
-
- #region 鍒ゆ柇鍑哄簱鍙ｆ槸鍚︾┖闂�
- public bool StationIsFree(string StationCode)
- {
- Dt_StationManger stationManger = _stationMangerService.GetOutStationInfo(StationCode);
- return stationManger.IsOccupied == LocationStatusEnum.Free.ObjToInt();
- }
- #endregion
-
- #region 绉诲簱鍚庝笅鍙戝嚭搴撲换鍔�
- public void SendMoveToExecuteTask(List<Dt_Task> tasks)
- {
- try
- {
- FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new();
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;
@@ -232,18 +462,32 @@
fOURBOTnewMovePodTask.desType = 2;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data= fOURBOTReturn;
if (fOURBOTReturn.returnCode == 0)
{
- item.RGVTaskId = fOURBOTReturn.data.taskID;
+ string dataJson = fOURBOTReturn.data.ToString();
+ FOURBOTnewMovePodTaskResponseData? fOURBO = JsonConvert.DeserializeObject<FOURBOTnewMovePodTaskResponseData>(dataJson);
+ if (fOURBO == null || fOURBO.taskID == 0)
+ {
+ throw new Exception($"鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID锛岃繑鍥炴暟鎹細{response}");
+ }
+ item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Execut;
+ stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ _stationMangerService.UpdateData(stationManger);
}
#endregion
}
_taskService.UpdateData(tasks);
+ content.OK();
}
catch (Exception ex)
{
- WriteError(nameof(TaskJob), ex.Message, ex);
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞﹀嚭搴撲换鍔�", "", "");
}
}
#endregion
--
Gitblit v1.9.3