From 8c20b276c784beff4eb4e9b643c2310efbbf6a12 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 15 五月 2025 17:39:45 +0800
Subject: [PATCH] 1
---
HH.WCS.ZCQTJ/core/OverTimeAgvTask.cs | 14 +++++++-------
HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs b/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs
index dd2943a..3693c00 100644
--- a/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs
+++ b/HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs
@@ -1231,8 +1231,8 @@
LogHelper.TaskDetail(logPara, "鏇存柊浠诲姟浼樺厛绾�浠诲姟鍙凤細" + executeStatePara.transportTask.S_TASK_NO + "鍖归厤鍒扮殑璐т綅 鏄惁瀛樺湪 鏄痑gv浠诲姟 骞朵笖浠诲姟涓婂凡鎺ㄩ�" + JsonConvert.SerializeObject(SfgLo));
if (SfgLo != null)//鏈夎繖涓换鍔� {
- var Agvstr = NDCHelper.ChangeParamPri(SfgLo.S_TASK_NO, 40);
- LogHelper.TaskDetail(logPara, "鏇存柊浠诲姟浼樺厛绾�浠诲姟鍙凤細" + SfgLo.S_TASK_NO + "浼樺厛绾т负锛� + 40 + " 鏄惁鎴愬姛 :" + Agvstr);
+ var Agvstr = NDCHelper.ChangeParamPri(SfgLo.S_TASK_NO, 60);
+ LogHelper.TaskDetail(logPara, "鏇存柊浠诲姟浼樺厛绾�浠诲姟鍙凤細" + SfgLo.S_TASK_NO + "浼樺厛绾т负锛� + 60 + " 鏄惁鎴愬姛 :" + Agvstr);
PritTask = SfgLo;
}
}
diff --git a/HH.WCS.ZCQTJ/core/OverTimeAgvTask.cs b/HH.WCS.ZCQTJ/core/OverTimeAgvTask.cs
index eae9ac1..565c269 100644
--- a/HH.WCS.ZCQTJ/core/OverTimeAgvTask.cs
+++ b/HH.WCS.ZCQTJ/core/OverTimeAgvTask.cs
@@ -30,7 +30,7 @@
var StateFa = new List<string> { "瀹屾垚", "鍙栨秷" };
- var TaskList2 = newDb2.Queryable<WMSTask>().Where(e => Area.Contains(e.S_START_LAREA) && e.S_TYPE == "鍑哄簱" && !StateFa.Contains(e.S_B_STATE))
+ var TaskList2 = newDb2.Queryable<WMSTask>().Where(e => ShyArea.Contains(e.S_START_LAREA) && e.S_TYPE == "鍑哄簱" && !StateFa.Contains(e.S_B_STATE))
.ToList();
var ZTaskList = TaskList2.FindAll(e => e.S_Main_task == "涓讳换鍔�).ToList();
if (ZTaskList.Any())
@@ -38,11 +38,11 @@
var tTaskNum = newDb2.Queryable<OutAreaTaskAnyEntitys>().Where(e => ShyArea.Contains(e.S_AreaCode))?.First();
if (tTaskNum != null && tTaskNum.N_TaskQuantity <= ZTaskList.Count())
{
- var agvTask = TaskList2.FindAll(e => e.S_NOTE == "agv浠诲姟" && State.Contains(e.S_B_STATE) && e.T_MODIFY < datt.AddMinutes(-1));
- if (TaskList2.Any())
+ var agvTask = newDb2.Queryable<WMSTask>().Where(e => Area.Contains(e.S_START_LAREA) && e.S_NOTE == "agv浠诲姟" && e.S_TYPE == "鍑哄簱" && State.Contains(e.S_B_STATE) && e.T_MODIFY < datt.AddMinutes(-1)).ToList();
+ if (agvTask.Any())
{
//璋冩暣浼樺厛绾�- foreach (var task in TaskList2)
+ foreach (var task in agvTask)
{
//鏌ヨ杩欎釜浠诲姟鐨勭珛搴撲换鍔℃槸鍚﹀畬鎴愪簡
LogHelper.Info("璋冩暣浼樺厛绾�, $" Agv姣忚秴杩�鍒嗛挓浼樺厛绾�1 浠诲姟鎻愰珮浼樺厛绾�{task.S_TASK_NO}");
@@ -68,11 +68,11 @@
}
else
{
- var agvTask = TaskList2.FindAll(e => e.S_NOTE == "agv浠诲姟" && State.Contains(e.S_B_STATE) && e.T_MODIFY < datt.AddMinutes(-2));
- if (TaskList2.Any())
+ var agvTask = newDb2.Queryable<WMSTask>().Where(e => Area.Contains(e.S_START_LAREA) && e.S_NOTE == "agv浠诲姟" && e.S_TYPE == "鍑哄簱" && State.Contains(e.S_B_STATE) && e.T_MODIFY < datt.AddMinutes(-2)).ToList();
+ if (agvTask.Any())
{
//璋冩暣浼樺厛绾�- foreach (var task in TaskList2)
+ foreach (var task in agvTask)
{
//鏌ヨ杩欎釜浠诲姟鐨勭珛搴撲换鍔℃槸鍚﹀畬鎴愪簡
LogHelper.Info("璋冩暣浼樺厛绾�, $" Agv姣忚秴杩�鍒嗛挓浼樺厛绾�1 浠诲姟鎻愰珮浼樺厛绾�{task.S_TASK_NO}");
--
Gitblit v1.9.1