美瑞安淮安立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
helongyang
4 天以前 753361f589444455fe1b20476c658201ccd92c38 
 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/°å²Ä²Ö/StackerCraneJob_BC.cs


@@ -107,6 +107,7 @@


                    commonStackerCrane.CheckStackerCraneTaskCompleted();//防止任务完成事件监测超时，再手动触发一次


                    if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal && commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)


                    {


                        Thread.Sleep(1000);


                        Dt_Task? task = GetTask(commonStackerCrane);


                        if (task != null)


                        {


@@ -353,7 +354,14 @@


                    {


                        return existTask;


                    }


                    else if (existTask != null && existTask.TaskState != (int)TaskStatusEnum.SC_Execute)


                    else if (existTask != null && existTask.TaskState == (int)TaskStatusEnum.MesPending) //判断挂起


                    {


                        existTask.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();


                        task.TaskState=TaskStatusEnum.MesPending.ObjToInt();


                        _taskRepository.UpdateData(existTask);


                        _taskRepository.UpdateData(task);


                    }


                    else if (existTask != null && existTask.TaskState != (int)TaskStatusEnum.SC_Execute && existTask.TaskState != (int)TaskStatusEnum.MesPending)


                    {


                        return null;


                    }