From 4bdc37291d784008cea7fb9d105077b65a12beb9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 24 三月 2026 09:31:52 +0800
Subject: [PATCH] job优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 107 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 40 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
index 6241caf..53a2629 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
@@ -18,33 +18,35 @@
/// <summary>
/// 涓嬪彂浠诲姟
/// </summary>
- public void SendTask()
+ public void SendNewTask()
{
- try
- {
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
- if (newTasks.Count > 0)
- {
- #region 鏌ユ壘鍑箰澹换鍔�
- var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).ToList();
- if (Tasks.Count > 0) SendGALAXISTask(Tasks);
- #endregion
+ //try
+ //{
+ // var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
+ // if (newTasks.Count > 0)
+ // {
+ // #region 鏌ユ壘鍑箰澹换鍔�
+ // //var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).OrderByDescending(x => x.Grade).ToList();
+ // //if (Tasks.Count > 0) SendGALAXISTask(Tasks);
+ // #endregion
- #region 鏌ユ壘RGV浠诲姟
- Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound || x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
- if (Tasks.Count > 0) SendRGVTask(Tasks);
- #endregion
+ // #region 鏌ユ壘RGV浠诲姟
+ // var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).OrderByDescending(x => x.Grade).ToList();
+ // if (Tasks.Count > 0) SendRGVNewInTask(Tasks);
+ // Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).OrderByDescending(x => x.Grade).ToList();
+ // if (Tasks.Count > 0) IsMoveTask(Tasks);
+ // #endregion
- #region 鏌ユ壘娴峰悍AGV浠诲姟
- Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.Carry || x.TaskType == (int)TaskTypeEnum.CJCarry || x.TaskType == (int)TaskTypeEnum.CJInbound || x.TaskType == (int)TaskTypeEnum.CJOutbound).ToList();
- if (Tasks.Count > 0) SendHIKROBOTTask(Tasks);
- #endregion
- }
- }
- catch (Exception ex)
- {
- WriteError(nameof(TaskJob), ex.Message, ex);
- }
+ // #region 鏌ユ壘娴峰悍AGV浠诲姟
+ // Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.F01 || x.TaskType == (int)TaskTypeEnum.RK3F || x.TaskType == (int)TaskTypeEnum.CK3F || x.TaskType == (int)TaskTypeEnum.Q1TSJ4 || x.TaskType == (int)TaskTypeEnum.STU0003 || x.TaskType == (int)TaskTypeEnum.F02 || x.TaskType == (int)TaskTypeEnum.CHUKU1 || x.TaskType == (int)TaskTypeEnum.Q3RK || x.TaskType == (int)TaskTypeEnum.Q3CK).OrderByDescending(x => x.Grade).ToList();
+ // if (Tasks.Count > 0) HIKROBOTTask(Tasks);
+ // #endregion
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // WriteError(nameof(TaskJob), ex.Message, ex);
+ //}
}
#endregion
@@ -56,26 +58,51 @@
{
try
{
- #region 涓嬪彂澶栧舰妫�娴嬮�氳繃鐨勫洓鍚戣溅浠诲姟
- var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk).ToList();
- if (Tasks.Count > 0) SendCheckShapeingOkTask(Tasks);
- #endregion
+ var ExecutTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState != (int)TaskStatusEnum.New).ToList();
+ if (ExecutTasks.Count > 0)
+ {
+ #region 涓嬪彂寰呭褰㈡娴嬩换鍔�
+ var Tasks = ExecutTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound && x.TaskState == (int)TaskStatusEnum.WaiCheckShape).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) SendRGVCheckShapeTask(Tasks);
+ #endregion
- #region 涓嬪彂澶栧舰妫�娴嬪け璐ョ殑鍥涘悜杞︿换鍔�
- Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingNG).ToList();
- if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
- Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk && x.ExceptionMessage.Contains("鏈壘鍒扮粓鐐瑰簱鍖�")).ToList();
- if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
- #endregion
+ #region 涓嬪彂澶栧舰妫�娴嬮�氳繃鐨勫洓鍚戣溅浠诲姟
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk && string.IsNullOrEmpty(x.ExceptionMessage)).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) SendCheckShapeingOkTask(Tasks);
+ #endregion
- #region 涓嬪彂寰呯Щ搴撳悗鍥涘悜杞﹀嚭搴撲换鍔�
- Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitMoveToExecute).ToList();
- if (Tasks.Count > 0) SendMoveToExecuteTask(Tasks);
- #endregion
+ #region 涓嬪彂澶栧舰妫�娴嬪け璐ョ殑鍥涘悜杞︿换鍔�
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingNG).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk && x.ExceptionMessage.Contains("鏈壘鍒扮粓鐐瑰簱鍖�")).ToList();
+ if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
+ #endregion
- #region 涓嬪彂鎵樼洏纭鐨勬捣搴稟GV浠诲姟
+ #region 涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.RGV_NewMoveTask).ToList();
+ if (Tasks.Count > 0) SendMoveTasks(Tasks);
+ #endregion
- #endregion
+ #region 澶勭悊寰呯Щ搴撳悗鍥涘悜杞﹀嚭搴撲换鍔�
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitMoveToExecute).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) MoveToExecuteTask(Tasks);
+ #endregion
+
+ #region 涓嬪彂鍥涘悜杞﹀嚭搴撲换鍔�
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitSend).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) SendOutTask(Tasks);
+ #endregion
+
+ #region 涓嬪彂澶栬鍏佽杩涘叆鐨勬捣搴稟GV浠诲姟
+ //Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.AGV_WaitToExecute).OrderByDescending(x => x.Grade).ToList();
+ //if (Tasks.Count > 0) SendAGVWaitToExecuteTask(Tasks);
+ #endregion
+
+ #region 涓嬪彂鎵樼洏纭瀹屾垚鐨勬捣搴稟GV浠诲姟
+ //Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish).OrderByDescending(x => x.Grade).ToList();
+ //if (Tasks.Count > 0) SendAGVWaitToExecuteTask(Tasks);
+ #endregion
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.3