From 07d83d2d583f96ddd7df98bbb202c98f3b073cd4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 10 三月 2026 13:41:02 +0800
Subject: [PATCH] 添加前端任务状态枚举，以及历史任务页面
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 149 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 28 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 7e831ac..57bffd8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,10 +16,12 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using SixLabors.ImageSharp.ColorSpaces;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -69,7 +71,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -80,6 +82,7 @@
_hKLocationInfoService = hKLocationInfoService;
_apiInfoService = apiInfoService;
_trackloginfoService = trackloginfoService;
+ _stationMangerService = stationMangerService;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -94,7 +97,8 @@
if (!content.Status) throw new Exception(content.Message);
if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
{
- continue;
+ throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆�/鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ //continue;
}
switch (item.taskType)
{
@@ -144,6 +148,9 @@
public WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask)
{
WebResponseContent content = new WebResponseContent();
+ var KLS = new CancelGALAXISTask();
+ CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
+ CancelSXCTake cancelSXCTake = new CancelSXCTake();
try
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
@@ -161,7 +168,7 @@
#region 鍑箰澹�
if (isGALAXISTask)
{
- var KLS = new CancelGALAXISTask
+ KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString()
@@ -174,11 +181,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{agvContent.data.returnInfo}");
}
}
@@ -187,9 +194,10 @@
#region 鍥涘悜杞�
if (isAGV)
{
- CancelSXCTake cancelSXCTake = new CancelSXCTake
+ cancelSXCTake = new CancelSXCTake
{
- taskID = dt_Task.RGVTaskId
+ taskID = dt_Task.RGVTaskId,
+ withoutRunning = 1
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
@@ -199,18 +207,18 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
}
}
#endregion
#region 娴峰悍
if (isHK)
{
- CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask
+ cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
cancelType = "CANCEL"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
@@ -223,11 +231,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{hIKROBOTReturn.data}");
}
}
@@ -237,6 +245,33 @@
catch (Exception ex)
{
content.Error(ex.Message);
+ }
+ finally
+ {
+ // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
+ object logObject = null;
+ string deviceName = "";
+
+ if (KLS != null )
+ {
+ logObject = KLS;
+ deviceName = "鍑箰澹獳GV";
+ }
+ else if (cancelHIKROBOTTask != null )
+ {
+ logObject = cancelHIKROBOTTask;
+ deviceName = "娴峰悍鏈哄櫒浜�";
+ }
+ else if (cancelSXCTake != null )
+ {
+ logObject = cancelSXCTake;
+ deviceName = "鍥涘悜杞�";
+ }
+
+ if (logObject != null)
+ {
+ _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
+ }
}
return content;
}
@@ -250,6 +285,9 @@
public WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority)
{
WebResponseContent content = new WebResponseContent();
+ var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade();
+ var request = new UpdateAgvSXCTake();
+ var Hkrequest = new HIKROBOTTaskGrade();
try
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
@@ -269,11 +307,10 @@
#region 鍑箰澹�
if (isGALAXISTask)
{
- var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
+ updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString(),
- district = dt_Task.Roadway,//浠诲姟搴撳尯
priorityCode = updateTaskPriority.taskPriority,
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateGALAXISTaskGrade));
@@ -284,11 +321,11 @@
{
BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK($"淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"{dt_Task.WMSTaskNum}浠诲姟澶辫触,閿欒淇℃伅锛歿agvContent.data.returnInfo}");
}
}
#endregion
@@ -296,23 +333,23 @@
#region 鍥涘悜杞�
if (isAGV)
{
- var request = new UpdateAgvSXCTake
+ request = new UpdateAgvSXCTake
{
taskID = dt_Task.RGVTaskId,
priority = updateTaskPriority.taskPriority
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateAgvSXCTake));
- if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ if (apiInfo == null) throw new Exception("鏈壘鍒版洿鏂板洓鍚戣溅浠诲姟浼樺厛绾ф帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{fOURBOTReturn.data}");
}
}
@@ -320,23 +357,23 @@
#region 娴峰悍
if (isHK)
{
- var request = new HIKROBOTTaskGrade
+ Hkrequest = new HIKROBOTTaskGrade
{
robotTaskCode = dt_Task.WMSTaskNum,//浠诲姟鍙�
initPriority = updateTaskPriority.taskPriority//浼樺厛绾�
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(HIKROBOTTaskGrade));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
- HIKROBOTReturn hIKROBOTReturn=response.DeserializeObject<HIKROBOTReturn>();
- if (hIKROBOTReturn.code == "SUCCESS0"&&hIKROBOTReturn.message=="鎴愬姛")
+ string response = HttpHelper.Post(apiInfo.ApiAddress, Hkrequest.Serialize());
+ HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
+ if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭瘂hIKROBOTReturn.data}");
}
}
#endregion
@@ -344,6 +381,33 @@
catch (Exception ex)
{
content.Error(ex.Message);
+ }
+ finally
+ {
+ // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
+ object logObject = null;
+ string deviceName = "";
+
+ if (updateGALAXISTaskGrade != null )
+ {
+ logObject = updateGALAXISTaskGrade;
+ deviceName = "鍑箰澹獳GV";
+ }
+ else if (Hkrequest != null)
+ {
+ logObject = Hkrequest;
+ deviceName = "娴峰悍鏈哄櫒浜�";
+ }
+ else if (request != null )
+ {
+ logObject = request;
+ deviceName = "鍥涘悜杞�";
+ }
+
+ if (logObject != null)
+ {
+ _trackloginfoService.AddTrackLog(logObject, content, $"淇敼{deviceName}浠诲姟浼樺厛绾�", "", "");
+ }
}
return content;
}
@@ -1042,8 +1106,10 @@
/// <exception cref="NotImplementedException"></exception>
public WebResponseContent IQCResult(IQCResultDTO iQC)
{
+ WebResponseContent content = new WebResponseContent();
try
{
+ #region 瀹瑰櫒涓婃灦
Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == iQC.StationCode) ?? throw new Exception($"鏈壘鍒扮珯鍙般�恵iQC.StationCode}銆戜俊鎭�");
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOToccupyStation)) ?? throw new Exception("鏈壘鍒扮珯鐐瑰鍣ㄤ笂鏋舵帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
FOURBOToccupyStation fOURBOToccupyStation = new FOURBOToccupyStation()
@@ -1053,7 +1119,34 @@
};
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode != 0 && fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})")
+ throw new Exception(fOURBOTReturn.returnUserMsg);
+ #endregion
+
+ #region 鍒涘缓鍥涘悜杞︿换鍔�
+ var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New);
+ #endregion
+ #region 鍛煎彨鍥涘悜杞�
+ apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new()
+ {
+ priority = task.Grade,
+ podID = task.PalletCode,
+ //desNodeID = task.SourceAddress,
+ desExt = new
+ {
+ unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ },
+ desStationCodes = task.SourceAddress,
+ desType = 5
+ };
+ response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+ fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data = fOURBOTReturn;
if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+ task.TaskState = (int)TaskStatusEnum.Execut;
+ BaseDal.UpdateData(task);
+ #endregion
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -1072,10 +1165,10 @@
{
try
{
- var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x=> fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
+ var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x => fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
foreach (var item in Agvlocation)
{
- item.LocationStatus = (int)(fOURBOTStorageStatusNotify.disable==0?EnableStatusEnum.Normal:EnableStatusEnum.Disable);
+ item.EnableStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
}
_rGVLocationInfoService.UpdateData(Agvlocation);
return WebResponseContent.Instance.OK();
--
Gitblit v1.9.3