合并

肖洋

2024-12-24 4fb4bd80f377e1d64692b83ed4bd1f0cf8cf6f5a

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -294,7 +294,7 @@
                    if (device != null)
                    {
                        CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
                        //if (conveyorLine.IsOccupied(router.ChildPosi))//出库站台未被占用
                        if (conveyorLine.IsOccupiedx(router.ChildPosi))//出库站台未被占用
                        {
                            return task;
                        }
@@ -337,7 +337,7 @@
                {
                    return candidateTask;
                }
                ConsoleHelper.WriteErrorLine($"任务号：【{occupiedStation.TaskNum}】出库地址：【{occupiedStation.NextAddress}】不允许放货");
                ConsoleHelper.WriteErrorLine($"任务号：【{candidateTask.TaskNum}】出库地址：【{candidateTask.NextAddress}】不允许放货");
            }

            return null;