合并

刘磊

2024-12-13 375ca5b5c67b377d3a9133a60994c76997c5d9d9

合并

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -606,9 +606,17 @@
                    else
                    {
                        task.TaskState = (int)TaskOutStatusEnum.OutFinish;

                        BaseDal.DeleteData(task);
                        ConsoleHelper.WriteWarningLine($"高温出库目的地址{task.TargetAddress}");
                        //如高温出库后 NG 则将任务标记为NG 并在出库申请后将任务出至NG口
                        if (task.Remark == "NG")
                        {
                            BaseDal.UpdateData(task);
                        }
                        else
                        {
                            BaseDal.DeleteData(task);
                            ConsoleHelper.WriteWarningLine($"高温出库目的地址{task.TargetAddress}");
                        }
                        
                        var taskHty = task.Adapt<Dt_Task_Hty>();
                        _taskHtyRepository.AddData(taskHty);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs

@@ -160,14 +160,23 @@
                    CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode);
                    break;
                case 1:

                    //if (stationManager.stationArea.Contains("GW"))
                    //{
                    //    var taskGW = _taskRepository.QueryFirst(x => x.TargetAddress == childDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutPending));
                    //    if (taskGW != null)
                    //    {
                    //        command.ConveyorLineBarcode = taskGW.PalletCode;
                    //    }
                    //var taskGW = _taskRepository.QueryFirst(x => x.TargetAddress == childDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutPending));
                    //if (taskGW != null)
                    //{
                    //    command.ConveyorLineBarcode = taskGW.PalletCode;
                    //}
                    //}
                    //如高温出库后任务标记NG异常则将任务更新为异常排出任务
                    Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW"));
                    if (NGtask != null)
                    {
                        CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask);
                        break;
                    }

                    RequestWmsTask(conveyorLine, command, childDeviceCode);
                    break;
            }
@@ -308,5 +317,33 @@
                //_taskRepository.AddData(taskGW);
            }
        }

        /// <summary>
        /// 高温出库后任务完成 如果任务标识NG则将任务改为异常排出任务
        /// </summary>
        /// <param name="conveyorLine"></param>
        /// <param name="command"></param>
        /// <param name="childDeviceCode"></param>
        /// <param name="task"></param>
        /// <exception cref="Exception"></exception>
        private void CreateAbNormalOutbound(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode, Dt_Task task)
        {
            Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode);

            if (stationManager == null || string.IsNullOrWhiteSpace(stationManager.stationNGChildCode) || string.IsNullOrWhiteSpace(stationManager.stationNGLocation))
            {
                throw new Exception("未配置站台的对应NG口信息");
            }

            task.SourceAddress = task.TargetAddress;
            task.TargetAddress = stationManager.stationNGLocation;
            task.TaskState = (int)TaskOutStatusEnum.OutNew;
            task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
            task.Grade = 10;    //此处 出库至异常排出口的任务应除火警外最优先执行

            _taskRepository.UpdateData(task);
            //Dt_Task task= _taskRepository.QueryFirst(x=>)
            //_taskRepository.QueryFirst()
        }
    }
}