From b691bff6fc5b24e56e1587e0cecfad58396fc061 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 26 十一月 2024 17:57:10 +0800
Subject: [PATCH] 改了一堆，忘记改了些啥了
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 2e30b02..28a58a4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -5,6 +5,8 @@
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
+using WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -28,6 +30,8 @@
private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
private readonly ISys_ConfigService _sys_ConfigService;
private readonly IMapper _mapper;
+ private readonly IDt_StationManagerService _stationManagerService;
+ private readonly IDt_StationManagerRepository _stationManagerRepository;
private Dictionary<string, OrderByType> _taskOrderBy = new()
{
@@ -42,13 +46,15 @@
public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskExecuteDetailRepository = taskExecuteDetailRepository;
_mapper = mapper;
_sys_ConfigService = sys_ConfigService;
+ _stationManagerService = stationManagerService;
+ _stationManagerRepository = stationManagerRepository;
}
/// <summary>
@@ -565,9 +571,9 @@
#region WMS鍚屾浠诲姟瀹屾垚
var keys = new Dictionary<string, object>()
- {
- {"taskNum", taskNum}
- };
+ {
+ {"taskNum", taskNum}
+ };
// 鑾峰彇WMSip鍦板潃
var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
@@ -580,12 +586,26 @@
var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;
content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (!content.Data.IsNullOrEmpty())
+ {
+ if (content.Data.ToString() == "NG")
+ {
+ task.Remark = "NG";
+ BaseDal.UpdateData(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴愶紝MOM杩斿洖NG");
+ }
+ else if (task.Roadway.Contains("GW"))
+ {
+ BaseDal.DeleteData(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴愶紝楂樻俯搴撴暟鎹垹闄�");
+ }
+ }
#endregion
#region 鏇存柊浠诲姟鐘舵��
- var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
+ var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTask)?.ConfigValue;
if (wmsBase == null || updateTask == null)
{
throw new InvalidOperationException("WMS IP 鏈厤缃�");
--
Gitblit v1.9.3