From b7bb4bf8ee6d007e0e7c3cacfc4fab77049beb58 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 20 8月 2025 17:08:43 +0800
Subject: [PATCH] 同步代码
---
DEmon/iWareCc/DecomposeTask/Chain/按策略获取一个待分解任务.cs | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git "a/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs"
index 95c644c..c79be7d 100644
--- "a/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/DecomposeTask/Chain/\346\214\211\347\255\226\347\225\245\350\216\267\345\217\226\344\270\200\344\270\252\345\276\205\345\210\206\350\247\243\344\273\273\345\212\241.cs"
@@ -51,12 +51,30 @@
{
try
{
- var mTask = dbModel.TASKMainTasks.OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙�);
+ TASKMainTask mTask = null;
+ var taskPart = dbModel.TASKPartTasks.FirstOrDefault(x => x.maintasktype == (int)EMainTaskType.鍑哄簱浠诲姟 && x.isfinished == 0);
+ if (taskPart != null)
+ {
+ mTask = dbModel.TASKMainTasks.OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙� && x.tasktype == (int)EMainTaskType.鍏ュ簱浠诲姟);
+ }
+ else
+ {
+ mTask = dbModel.TASKMainTasks.OrderBy(x => x.tasktype == (int)EMainTaskType.鍑哄簱浠诲姟).OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙�);
+ if (mTask == null)
+ {
+ mTask = dbModel.TASKMainTasks.OrderBy(x => x.decompositiontimes).ThenBy(x => x.sendtime).ThenBy(x => x.priority).FirstOrDefault(x => x.status == (int)EMainTaskStatus.鏈垎瑙�);
+ }
+ }
if (mTask == null)
{
LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "鑾峰彇绗竴涓垎瑙ｄ换鍔�:鏆傛棤寰呭垎瑙ｇ殑浠诲姟");
return;
}
+ if (taskPart != null && mTask.tasktype == (int)EMainTaskType.鍑哄簱浠诲姟)
+ {
+ LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "褰撳墠瀛樺湪鏈畬鎴愮殑鍑哄簱浠诲姟");
+ return;
+ }
mTask.decompositiontimes += 1;
if (mTask.decompositiontimes >= 100)
{
--
Gitblit v1.9.3