Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

helongyang

2025-07-25 ce7315f883bd198a5b7054f8afed741c9cbb560e

Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/StackerCraneJob_BC.cs

@@ -354,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;
                    }