Merge branch 'xiaoyang' into dev

wanshenmean

16 小时以前 e4921e003cc293fea714bdaf74dc6a6b6b750295

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/ManualInbound/ManualInboundTaskHandler.cs

@@ -53,13 +53,24 @@
            try
            {
                // 写入任务号
                conveyorLine.SetValue(ConveyorLineDBNameNew.TaskNo, (short)task.TaskNum, childDeviceCode);
                // 写入起始地址
                conveyorLine.SetValue(ConveyorLineDBNameNew.Source, short.Parse(task.SourceAddress ?? "0"), childDeviceCode);
                var isTaskNum = conveyorLine.SetValue(ConveyorLineDBNameNew.TaskNo, (short)task.TaskNum, childDeviceCode);
                if (!isTaskNum) return;
                QuartzLogHelper.LogInfo(_logger, $"任务号写入PLC成功，任务号【{task.TaskNum}】", conveyorLine.DeviceCode);
                Thread.Sleep(500);

                //// 写入起始地址
                //conveyorLine.SetValue(ConveyorLineDBNameNew.Source, short.Parse(task.SourceAddress ?? "0"), childDeviceCode);
                //QuartzLogHelper.LogInfo(_logger, $"任务号写入PLC成功，任务号【{task.TaskNum}】", conveyorLine.DeviceCode);
                //Thread.Sleep(500);

                // 写入目标地址
                conveyorLine.SetValue(ConveyorLineDBNameNew.Target, short.Parse(task.NextAddress ?? "0"), childDeviceCode);
                var isTarget = conveyorLine.SetValue(ConveyorLineDBNameNew.Target, short.Parse(task.NextAddress ?? "0"), childDeviceCode);
                if (!isTarget) return;
                QuartzLogHelper.LogInfo(_logger, $"目标地址写入PLC成功，目标地址【{task.NextAddress}】", conveyorLine.DeviceCode);
                Thread.Sleep(500);

                // 写入托盘号
                conveyorLine.SetValue(ConveyorLineDBNameNew.Barcode, task.PalletCode, childDeviceCode);
                //conveyorLine.SetValue(ConveyorLineDBNameNew.Barcode, task.PalletCode, childDeviceCode);

                // 更新任务状态到下一阶段
                var updateResult = _taskService.UpdateTaskStatusToNext(task);
@@ -72,7 +83,7 @@
                // 写入ACK标志
                conveyorLine.SetValue(ConveyorLineDBNameNew.WCS_ACK, (short)1, childDeviceCode);

                QuartzLogHelper.LogInfo(_logger, $"ManualInboundTaskHandler: 手动任务写入PLC成功，任务号【{task.TaskNum}】，源地址【{task.SourceAddress}】", conveyorLine.DeviceCode);
                QuartzLogHelper.LogInfo(_logger, $"ManualInboundTaskHandler: 手动任务写入PLC成功，任务号【{task.TaskNum}】，源地址【{task.SourceAddress}】，目标地址【{task.NextAddress}】", conveyorLine.DeviceCode);
            }
            catch (Exception ex)
            {