1

huangxiaoqiang

5 天以前 ce8f204db035e6fb7147edb4440591502f5c8567

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

@@ -146,13 +146,29 @@

                if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null)
                {
                    if (_taskRepository.QueryFirst(x => x.PalletCode == command.Barcode) != null)
                    {

                        var taskExecuting = _taskRepository.QueryFirst(x => x.PalletCode == command.Barcode && (x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting|| x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish));

                        if (taskExecuting != null)
                        {
                            taskExecuting.ExceptionMessage = "未接收到线体完成信号系统内部自动完成";
                            _taskService.Delete(taskExecuting);
                        }

                        ConsoleHelper.WriteErrorLine($"当前托盘存在任务：【{command.Barcode}】");

                        WriteInfo(conveyorLine.DeviceName, $"当前托盘存在任务{command.Barcode}");
                        
                    }
                    WriteInfo(conveyorLine.DeviceName, "当前托盘存在任务");
                }

                var content = CreateAndSendTask(taskDTO);
                if (content.Status)
                {
                    var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
                    var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode, command.Barcode);
                    if (task != null)
                    {
                        //var taskCommand = MapTaskCommand(task, command);
@@ -231,7 +247,7 @@

                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                    }
                    else if (task.TargetAddress == "1020-1")
                    else if (task.TargetAddress == "1020-1" || task.TargetAddress == "1049-8")
                    {
                        var next = task.NextAddress;
                        var taskCommand = MapTaskCommand(task, command);