同步代码

schangxiang@126.com

2025-08-20 b7bb4bf8ee6d007e0e7c3cacfc4fab77049beb58

 DEmon/iWareCc/DoStackerTaskAuto/Chain/Ñ¡ÔñÒ»¸öδִÐеĶѶâ»úµÄÈÎÎñ.cs

@@ -60,8 +60,38 @@
                        LogTextHelper.WriteLine(Resources.LogDir + @"/自动执行堆垛机任务流程/" + Stacker.Equipment.EquipName, "选择一个未执行的堆垛机的任务:堆垛机{0}不能执行任务--{1}", Stacker.Equipment.EquipName, msg);
                        return;
                    }
                    TASKPartTask task = null;

                    var task = dbModel.TASKPartTasks.OrderByDescending(x => x.priority).ThenBy(x => x.createtime).FirstOrDefault(x => x.type == (int)EPartTaskType.堆垛机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.equipid == Stacker.Equipment.Id);
                    var currentGate = CacheEntity.Conveyors.Find(x => x.Equipment.EquipName == "conveyor2").Gates.FirstOrDefault(x => x.Place.PlaceTypeName == "gate21");
                    var currentGate22 = CacheEntity.Conveyors.Find(x => x.Equipment.EquipName == "conveyor2").Gates.FirstOrDefault(x => x.Place.PlaceTypeName == "gate22");
                    var isGate = !currentGate.RIsEmpty || !currentGate22.RIsEmpty;

                    var currentCovTask = dbModel.TASKPartTasks.FirstOrDefault(x => x.isfinished == 0 && x.sourceplace == "100201" && x.toplace == "100202");

                    // é€‰æ‹©æ‰§è¡Œå…¥åº“还是出库的任务(优先出库再入库)
                    if (isGate || currentCovTask != null)
                    {
                        task = dbModel.TASKPartTasks
                            .OrderByDescending(x => x.maintasktype != (int)EMainTaskType.出库任务)
                            .OrderByDescending(x => x.priority).ThenBy(x => x.createtime)
                            .FirstOrDefault(x => x.type == (int)EPartTaskType.堆垛机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.equipid == Stacker.Equipment.Id);

                    }
                    else
                    {
                        task = dbModel.TASKPartTasks
                           .OrderBy(x => x.maintasktype == (int)EMainTaskType.出库任务)
                           .OrderByDescending(x => x.priority)
                           .ThenBy(x => x.createtime)
                           .FirstOrDefault(x => x.type == (int)EPartTaskType.堆垛机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.equipid == Stacker.Equipment.Id);
                        if (task == null)
                        {
                            task = dbModel.TASKPartTasks
                                .OrderBy(x => x.maintasktype != (int)EMainTaskType.出库任务)
                                .OrderByDescending(x => x.priority).ThenBy(x => x.createtime)
                                .FirstOrDefault(x => x.type == (int)EPartTaskType.堆垛机任务 && x.isreleased == (int)EYesOrNo.否 && x.isfinished == (int)EYesOrNo.否 && x.equipid == Stacker.Equipment.Id);
                        }
                    }

                    if (task == null)
                    {