WGQ_WB19011.git

			@@ -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.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);
			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)
			{
			@@ -86,7 +116,6 @@
			return;
			}
			}
			// è¿æ®µä»£ç æå¸æå¨åºåºå£ææåå½åææªå®æçåºåºè¾éçº¿ä»»å¡æ¶taskæ¶taskä¸ååºåºä»»å¡æä¹ä¿®æ¹ä»£ç
			DecompositionTaskContainer.PartTask = new PartTaskEntity(task);

			LogTextHelper.WriteLine(Resources.LogDir + @"/èªå¨æ§è¡å åæºä»»å¡æµç¨/" + Stacker.Equipment.EquipName, "éæ©ä¸ä¸ªæªæ§è¡çå åæºçä»»å¡:{0}", DecompositionTaskContainer.PartTask.Id);