From 3e837690e8a1d3b6e86f3db72d2d84eab1bc7114 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 6月 2025 17:10:50 +0800
Subject: [PATCH] 修复提交
---
DEmon/iWareCc/DoStackerTaskAuto/Chain/选择一个未执行的堆垛机的任务.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git "a/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs"
index d8b484f..f18f42e 100644
--- "a/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/DoStackerTaskAuto/Chain/\351\200\211\346\213\251\344\270\200\344\270\252\346\234\252\346\211\247\350\241\214\347\232\204\345\240\206\345\236\233\346\234\272\347\232\204\344\273\273\345\212\241.cs"
@@ -61,7 +61,7 @@
return;
}
- 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 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);
if (task == null)
{
@@ -86,6 +86,7 @@
return;
}
}
+ // 杩欐浠ｇ爜鎴戝笇鏈涘湪鍑哄簱鍙ｆ湁鏂欏拰褰撳墠鏈夋湭瀹屾垚鐨勫嚭搴撹緭閫佺嚎浠诲姟鏃秚ask鏃秚ask涓嶅彇鍑哄簱浠诲姟鎬庝箞淇敼浠ｇ爜
DecompositionTaskContainer.PartTask = new PartTaskEntity(task);
LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鎵ц鍫嗗灈鏈轰换鍔℃祦绋�/" + Stacker.Equipment.EquipName, "閫夋嫨涓�涓湭鎵ц鐨勫爢鍨涙満鐨勪换鍔�:{0}", DecompositionTaskContainer.PartTask.Id);
--
Gitblit v1.9.3