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_TaskInfoService/TaskService.cs | 157 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 140 insertions(+), 17 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 abb3c4b..507cece 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,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Dm;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
@@ -25,7 +26,10 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO;
+using WIDESEAWCS_DTO.RGV.FOURBOT;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoService;
@@ -44,6 +48,8 @@
private readonly IKLSLocationInfoService _kLSLocationInfoService;
private readonly IRGVLocationInfoService _rGVLocationInfoService;
private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
+ private readonly IApiInfoService _apiInfoService;
+ private readonly IStationMangerService _stationMangerService;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -63,7 +69,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) : 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) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -72,6 +78,7 @@
_kLSLocationInfoService = kLSLocationInfoService;
_rGVLocationInfoService = rGVLocationInfoService;
_hKLocationInfoService = hKLocationInfoService;
+ _apiInfoService = apiInfoService;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -140,9 +147,65 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
- dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
- BaseDal.UpdateData(dt_Task);
- content.OK("鍙栨秷浠诲姟鎴愬姛",dt_Task);
+
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
+ bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
+ dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
+ //鍥涘悜杞�
+ bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
+ //娴峰悍
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ //杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
+ dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
+ #region
+ if (isGALAXISTask)
+ {
+ var KLS = new CancelGALAXISTask
+ {
+ taskId = dt_Task.WMSTaskNum,
+ reportTime = DateTime.Now.ToString()
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, KLS.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success == true && agvContent.code == 0)
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+
+ }
+ }
+ #endregion
+
+ #region 鍥涘悜杞�
+ if (isAGV)
+ {
+ CancelSXCTake cancelSXCTake = new CancelSXCTake
+ {
+ taskID = dt_Task.RGVTaskId
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ }
+ }
+ #endregion
}
catch (Exception ex)
{
@@ -164,9 +227,67 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
+
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
+ bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
+ dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
+
+ //鍥涘悜杞�
+ bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
+
+ //娴峰悍
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ //淇敼鍘熸湰浠诲姟浼樺厛绾�
dt_Task.Grade = updateTaskPriority.taskPriority;
- BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ #region 鍑箰澹�
+ if (isGALAXISTask)
+ {
+ var 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));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, updateGALAXISTaskGrade.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success == true && agvContent.code == 0)
+ {
+
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ }
+ else {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ }
+ }
+ #endregion
+
+ #region 鍥涘悜杞�
+ if (isAGV)
+ {
+ var 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浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn .returnUserMsg== "鎴愬姛")
+ {
+
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ }
+ }
+ #endregion
+
}
catch (Exception ex)
{
@@ -179,8 +300,6 @@
/// 淇敼搴撲綅鍒嗗尯
/// </summary>
/// <returns></returns>
- ///
-
public WebResponseContent ModifyWMSLayoutZone(WMSUpdateLocationArea wMSUpdateLocationArea)
{
WebResponseContent content = new WebResponseContent();
@@ -191,27 +310,31 @@
var hk=new List<Dt_HKLocationInfo>();
if(wMSUpdateLocationArea.WarehouseId == 1)
{
- foreach (var LocationCode in wMSUpdateLocationArea.LocationCodes)
+ var rgvList = _rGVLocationInfoService.Repository.QueryData(x =>wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in rgvList)
{
- Dt_RGVLocationInfo dt_RGVLocationInfo = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- rgv.Add(dt_RGVLocationInfo);
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
+ rgv.AddRange(rgvList);
}
if (wMSUpdateLocationArea.WarehouseId == 2)
{
- foreach (var LocationCode in wMSUpdateLocationArea.LocationCodes)
+
+ var KLSLocationInfoList = _kLSLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in KLSLocationInfoList)
{
- Dt_KLSLocationInfo dt_KLSLocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- kls.Add(dt_KLSLocationInfo);
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
+ kls.AddRange(KLSLocationInfoList);
}
if (wMSUpdateLocationArea.WarehouseId == 3)
{
- foreach (var LocationCode in wMSUpdateLocationArea.LocationCodes)
+ var hkList = _hKLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in hkList)
{
- Dt_HKLocationInfo dt_HKLocationInfo = _hKLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
- hk.Add(dt_HKLocationInfo);
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
+ hk.AddRange(hkList);
}
Db.Ado.BeginTran();
_rGVLocationInfoService.UpdateData(rgv);
--
Gitblit v1.9.3