合并冲突

wanshenmean

2024-11-07 959aa7cefa8f416452444160cdd4edbea2cadae7

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs

@@ -35,7 +35,7 @@
            bool isOutboundAndOutFinish = taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.SC_OutFinish;
            bool isOutboundAndLineOutExecuting = taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting;

            if (isOutTray || isOutboundAndOutFinish || !isOutboundAndLineOutExecuting)
            if (isOutTray || isOutboundAndOutFinish || isOutboundAndLineOutExecuting)
            {
                // 发送命令到输送线
                conveyorLine.SendCommand(taskCommand, childDeviceCode);
@@ -44,7 +44,7 @@
                // 更新任务状态
                _taskService.UpdateTaskStatusToNext(taskOut);
            }
            else if (taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
            else if (taskOut.TaskType == (int)TaskOutboundTypeEnum.OutTray && taskOut.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
            {
                // 完成WMS任务
                CompleteWmsTask(taskOut, command, conveyorLine, childDeviceCode, ProtocalDetailValue);