fix(WCS): 修复输送线任务处理逻辑并更新设备映射

wanshenmean

11 小时以前 853f7a71577bd8694c848985e1eb21c74d30eba9

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/ConveyorLineTargetAddressSelector.cs

@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using WIDESEAWCS_Core.LogHelper;
using Serilog;
using WIDESEAWCS_QuartzJob;

namespace WIDESEAWCS_Tasks
@@ -136,7 +135,14 @@
            // 记录入库场景的调试日志，包含子设备和目标地址信息
            WriteDebug(conveyorLine, "入库下一地址", childDeviceCode, nextAddress);
            // 委托通用处理方法，入库对应上层（isUpper: true）
            HandleDeviceRequest(conveyorLine, nextAddress, childDeviceCode, Layer.Upper);
            //HandleDeviceRequest(conveyorLine, nextAddress, childDeviceCode, Layer.Upper);

            var cvState = conveyorLine.GetValue<ConveyorLineDBNameNew, byte>(ConveyorLineDBNameNew.CV_State, nextAddress);
            bool isAvailable = cvState == 2;
            if (isAvailable)
            {
                conveyorLine.SetValue(ConveyorLineDBNameNew.Target, Convert.ToInt16(nextAddress), childDeviceCode);
            }
        }

        /// <summary>
@@ -154,7 +160,14 @@
            // 记录出库场景的调试日志，包含子设备和目标地址信息
            WriteDebug(conveyorLine, "出库下一地址", childDeviceCode, nextAddress);
            // 委托通用处理方法，出库对应下层（isUpper: false）
            HandleDeviceRequest(conveyorLine, nextAddress, childDeviceCode, Layer.Lower);
            //HandleDeviceRequest(conveyorLine, nextAddress, childDeviceCode, Layer.Lower);

            var cvState = conveyorLine.GetValue<ConveyorLineDBNameNew, byte>(ConveyorLineDBNameNew.CV_State, nextAddress);
            bool isAvailable = cvState == 2;
            if (isAvailable)
            {
                conveyorLine.SetValue(ConveyorLineDBNameNew.Target, Convert.ToInt16(nextAddress), childDeviceCode);
            }
        }

        /// <summary>
@@ -276,7 +289,7 @@
            if (device == null)
            {
                // 设备未找到时记录调试日志，方便排查配置问题
                _logger.LogDebug("FindDevice：未找到 {DeviceName}", deviceName);
                _logger.Debug("FindDevice：未找到 {DeviceName}", deviceName);
            }
            return device; // 可能为 null，由调用方负责 null 检查
        }
@@ -418,10 +431,7 @@
            string deviceType)
        {
            // 记录当前请求状态的调试日志，供排查问题使用
            _logger.LogDebug("ProcessDeviceRequest：{DeviceType}，子设备: {ChildDeviceCode}，物料请求: {MaterialReq}，出料请求: {OutputReq}",
                deviceType, childDeviceCode, materialRequest, outputRequest);
            // 同步写入 Quartz 日志文件（双写可追溯，这里保留与原逻辑一致的行为）
            QuartzLogger.Debug($"ProcessDeviceRequest：{deviceType}，子设备: {childDeviceCode}，物料请求: {materialRequest}，出料请求: {outputRequest}", conveyorLine.DeviceCode);
            QuartzLogHelper.LogDebug(_logger, "ProcessDeviceRequest：{DeviceType}，子设备: {ChildDeviceCode}，物料请求: {MaterialReq}，出料请求: {OutputReq}", $"ProcessDeviceRequest：{deviceType}，子设备: {childDeviceCode}，物料请求: {materialRequest}，出料请求: {outputRequest}", conveyorLine.DeviceCode, deviceType, childDeviceCode, materialRequest, outputRequest);

            // 分支判断：设备是需要物料还是需要出料
            if (materialRequest)
@@ -432,8 +442,7 @@
                // 2. 回复 ACK 确认信号，告知设备已收到请求
                conveyorLine.SetValue(ConveyorLineDBNameNew.WCS_ACK, 1, childDeviceCode);
                // 3. 记录信息日志，表明已完成目标地址设置和 ACK 回复
                _logger.LogInformation("ProcessDeviceRequest：{DeviceType} 需要物料，已设置目标地址和ACK", deviceType);
                QuartzLogger.Info($"ProcessDeviceRequest：{deviceType} 需要物料，已设置目标地址和ACK", conveyorLine.DeviceCode);
                QuartzLogHelper.LogInfo(_logger, "ProcessDeviceRequest：{DeviceType} 需要物料，已设置目标地址和ACK", $"ProcessDeviceRequest：{deviceType} 需要物料，已设置目标地址和ACK", conveyorLine.DeviceCode, deviceType);
            }
            else
            {
@@ -457,10 +466,7 @@
        private void WriteDebug(CommonConveyorLine conveyorLine, string scenario, string childDeviceCode, string nextAddress)
        {
            // 写入结构化日志（可被 Serilog 等日志框架捕获）
            _logger.LogDebug("Handle{Scenario}：子设备: {ChildDeviceCode}，目标地址: {NextAddress}",
                scenario, childDeviceCode, nextAddress);
            // 写入 Quartz 专用日志文件（供定时任务轨迹追踪）
            QuartzLogger.Debug($"Handle{scenario}：子设备: {childDeviceCode}，目标地址: {nextAddress}", conveyorLine.DeviceCode);
            QuartzLogHelper.LogDebug(_logger, "Handle{Scenario}：子设备: {ChildDeviceCode}，目标地址: {NextAddress}", $"Handle{scenario}：子设备: {childDeviceCode}，目标地址: {nextAddress}", conveyorLine.DeviceCode, scenario, childDeviceCode, nextAddress);
        }
    }
}
}