From 6d97c9dfd51e148ba2f97114f18889871c278fa6 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 03 一月 2025 16:38:55 +0800
Subject: [PATCH] 化成空托回流请求MoM接口改动
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 79 ++++-----------------------------------
1 files changed, 9 insertions(+), 70 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 5b06bf3..0bcc2a8 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -508,76 +508,8 @@
if (task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
{
- #region WMS鍚屾浠诲姟瀹屾垚
-
- var keys = new Dictionary<string, object>()
- {
- {"taskNum", task.TaskNum}
- };
- // 鑾峰彇WMSip鍦板潃
- var configs = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsBasex = configs.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
- var completeTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
- if (wmsBasex == null || completeTask == null)
- {
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var wmsIpAddressx = wmsBasex + completeTask;
-
- var results = HttpHelper.GetAsync(wmsIpAddressx, keys).Result;
- content = JsonConvert.DeserializeObject<WebResponseContent>(results);
- if (!content.Data.IsNullOrEmpty())
- {
- if (content.Data.ToString() == "NG")
- {
- task.Remark = "NG";
- }
- }
- task.ExceptionMessage += " " + content.Message;
-
- #endregion WMS鍚屾浠诲姟瀹屾垚
-
-
- if (!task.Roadway.Contains("GW"))
- {
- var routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
- if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = routers.FirstOrDefault().ChildPosi;
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
- BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
- }
- else
- {
- task.TaskState = (int)TaskOutStatusEnum.OutFinish;
- //濡傞珮娓╁嚭搴撳悗 NG 鍒欏皢浠诲姟鏍囪涓篘G 骞跺湪鍑哄簱鐢宠鍚庡皢浠诲姟鍑鸿嚦NG鍙�
- if (task.Remark == "NG")
- {
- BaseDal.UpdateData(task);
- }
- else
- {
- BaseDal.DeleteData(task);
- ConsoleHelper.WriteWarningLine($"楂樻俯鍑哄簱鐩殑鍦板潃{task.TargetAddress}");
- }
-
- var taskHty = task.Adapt<Dt_Task_Hty>();
- _taskHtyRepository.AddData(taskHty);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
- }
-
- //鏆備笉鑰冭檻澶氫釜鍑哄簱鍙�
-
- if (task.Roadway.Contains("CH") && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
- {
- Dt_Task? newTask = UpdatePosition(task.TaskNum, task.CurrentAddress);
- if (newTask != null)
- {
- task = newTask;
- }
- }
+ content = StackCraneTaskCompleted(task.TaskNum);
+ return content;
}
}
@@ -630,6 +562,13 @@
}
else if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
{
+ if (App.User.UserId > 0)
+ {
+ content = StackCraneTaskCompleted(task.TaskNum);
+ return content;
+ }
+
+
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
--
Gitblit v1.9.3