dengjunjie
6 天以前 fd073a00f6813eada92b08f1884b115295ac1177
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneExtend/SignalInteraction.cs
@@ -48,21 +48,31 @@
                Dt_Task? task = GetTaskInfo(commonStackerCrane);
                if (task != null)
                {
                    if ((task.TaskType == TaskInboundTypeEnum.Inbound.ObjToInt()
                    if ((_taskService.TaskInboundTypes.Contains(task.TaskType)
                        || task.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt())
                       && task.TargetIsPickPlace && ASRSRqtPutGoods)//璇锋眰鏀捐揣
                    {
                        commonStackerCrane.SetValue(StackerCraneDBName.AGVAlwASRSPuttGoods, ASRSRqtPutGoods);
                    }
                    else if ((task.TaskType == TaskOutboundTypeEnum.Outbound.ObjToInt()
                    else if ((_taskService.TaskOutboundTypes.Contains(task.TaskType)
                        || task.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt())
                        && ASRSRqtGetGoods && task.SourceIsPickPlace)//璇锋眰鍙栬揣
                    {
                        commonStackerCrane.SetValue(StackerCraneDBName.AGVAlwASRSGetGoods, ASRSRqtGetGoods);
                    }
                    else if (_taskService.TaskOutboundTypes.Contains(task.TaskType) && ASRSPutAGoodsDone)
                    {
                    }
                    else
                    {
                        Dt_ShuttleCar? shuttleCar1 = GetShuttleCarInfo(ASRSRqtPutGoods ? task.TargetAddress : task.SourceAddress);
                        Dt_ShuttleCar? shuttleCar1 = _shuttleCarService.QueryCode(task.ShuttleCarCode);
                        if (task.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt() && task.Remark == "")
                        {
                            shuttleCar1 = _shuttleCarService.QueryNoCode(task.ShuttleCarCode);
                            task.Remark = shuttleCar1.ShuttleCarCode;
                            _taskService.UpdateData(task);
                        }
                        if (shuttleCar1 != null)
                        {
                            ShuttleCar shuttleCar = Storage.Devices.FirstOrDefault(x => x.DeviceName == shuttleCar1.ShuttleCarName) as ShuttleCar;