From 853f7a71577bd8694c848985e1eb21c74d30eba9 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 21:19:23 +0800
Subject: [PATCH] fix(WCS): 修复输送线任务处理逻辑并更新设备映射
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneCommandBuilder.cs | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneCommandBuilder.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneCommandBuilder.cs
index b3a4cff..1fd63c4 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneCommandBuilder.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneCommandBuilder.cs
@@ -1,9 +1,7 @@
-using Microsoft.Extensions.Logging;
-using System;
+using Serilog;
using System.Diagnostics.CodeAnalysis;
using WIDESEAWCS_Common.Constants;
using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
@@ -37,11 +35,6 @@
private readonly IRouterService _routerService;
/// <summary>
- /// 鍫嗗灈鏈哄懡浠ら厤缃�
- /// </summary>
- private readonly StackerCraneCommandConfig _config;
-
- /// <summary>
/// 鏃ュ織璁板綍鍣�
/// </summary>
private readonly ILogger _logger;
@@ -56,12 +49,10 @@
public StackerCraneCommandBuilder(
ITaskService taskService,
IRouterService routerService,
- StackerCraneCommandConfig config,
ILogger logger)
{
_taskService = taskService;
_routerService = routerService;
- _config = config;
_logger = logger;
}
@@ -75,7 +66,7 @@
/// <returns>鍫嗗灈鏈哄懡浠ゅ璞★紝杞崲澶辫触杩斿洖 null</returns>
public object? ConvertToStackerCraneTaskCommand([NotNull] Dt_Task task)
{
- return BuildCommand(task, CreateStandardCommand(task));
+ return BuildCommand(task, CreateStandardCommand(task));
// 鏍规嵁宸烽亾鑾峰彇鍛戒护绫诲瀷
//string commandType = GetCommandType(task.Roadway);
@@ -99,20 +90,20 @@
/// </remarks>
/// <param name="roadway">宸烽亾缂栫爜</param>
/// <returns>鍛戒护绫诲瀷锛圫tandard 鎴� Formation锛�</returns>
- private string GetCommandType(string roadway)
- {
- foreach (var mapping in _config.RoadwayCommandMapping)
- {
- if (roadway.Contains(mapping.Key))
- {
- QuartzLogHelper.LogDebug(_logger, "GetCommandType锛氬尮閰嶅贩閬� {Roadway}锛屽懡浠ょ被鍨�: {CommandType}", $"GetCommandType锛氬尮閰嶅贩閬� {roadway}锛屽懡浠ょ被鍨�: {mapping.Value}", roadway, roadway, mapping.Value);
- return mapping.Value;
- }
- }
+ //private string GetCommandType(string roadway)
+ //{
+ // foreach (var mapping in _config.RoadwayCommandMapping)
+ // {
+ // if (roadway.Contains(mapping.Key))
+ // {
+ // QuartzLogHelper.LogDebug(_logger, "GetCommandType锛氬尮閰嶅贩閬� {Roadway}锛屽懡浠ょ被鍨�: {CommandType}", $"GetCommandType锛氬尮閰嶅贩閬� {roadway}锛屽懡浠ょ被鍨�: {mapping.Value}", roadway, roadway, mapping.Value);
+ // return mapping.Value;
+ // }
+ // }
- QuartzLogHelper.LogDebug(_logger, "GetCommandType锛氬贩閬� {Roadway} 鏈尮閰嶏紝浣跨敤榛樿鍛戒护绫诲瀷: {DefaultType}", $"GetCommandType锛氬贩閬� {roadway} 鏈尮閰嶏紝浣跨敤榛樿鍛戒护绫诲瀷: {_config.DefaultCommandType}", roadway, roadway, _config.DefaultCommandType);
- return _config.DefaultCommandType;
- }
+ // QuartzLogHelper.LogDebug(_logger, "GetCommandType锛氬贩閬� {Roadway} 鏈尮閰嶏紝浣跨敤榛樿鍛戒护绫诲瀷: {DefaultType}", $"GetCommandType锛氬贩閬� {roadway} 鏈尮閰嶏紝浣跨敤榛樿鍛戒护绫诲瀷: {_config.DefaultCommandType}", roadway, roadway, _config.DefaultCommandType);
+ // return _config.DefaultCommandType;
+ //}
/// <summary>
/// 鍒涘缓鏍囧噯鍛戒护
@@ -204,6 +195,10 @@
if (task.TaskType == (int)TaskOutboundTypeEnum.OutEmpty)
{
taskType = StackerCraneConst.EmptyPalletTaskType;
+ }
+ else if (task.TaskType == (int)TaskInboundTypeEnum.InEmpty)
+ {
+ taskType = StackerCraneConst.EmptyInPalletTaskType;
}
else
taskType = task.TaskType;
@@ -391,4 +386,4 @@
&& short.TryParse(parts[2], out layer);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3