From 3cafff8fcbd7076486172900833e3c079c42ddd7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 12 三月 2026 11:05:08 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 78e48f6..fe25bfa 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"
@@ -22,24 +22,26 @@
{
try
{
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound && x.TaskState == (int)TaskStatusEnum.WaiCheckShape).OrderByDescending(x => x.Grade).ToList();
+ if (newTasks.Count > 0) SendRGVCheckShapeTask(newTasks);
+ 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();
+ 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).ToList();
- if (Tasks.Count > 0) SendRGVInTask(Tasks);
- Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
+ 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);
+ Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.Carry || x.TaskType == (int)TaskTypeEnum.CJCarry || x.TaskType == (int)TaskTypeEnum.CJInbound || x.TaskType == (int)TaskTypeEnum.CJOutbound).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) HIKROBOTTask(Tasks);
#endregion
}
}
@@ -85,8 +87,14 @@
if (Tasks.Count > 0) SendOutTask(Tasks);
#endregion
- #region 涓嬪彂鎵樼洏纭鐨勬捣搴稟GV浠诲姟
+ #region 涓嬪彂澶栬鍏佽杩涘叆鐨勬捣搴稟GV浠诲姟
+ Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.AGV_WaitToExecute).ToList();
+ if (Tasks.Count > 0) SendAGVWaitToExecuteTask(Tasks);
+ #endregion
+ #region 涓嬪彂鎵樼洏纭瀹屾垚鐨勬捣搴稟GV浠诲姟
+ Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish).ToList();
+ if (Tasks.Count > 0) SendAGVWaitToExecuteTask(Tasks);
#endregion
}
catch (Exception ex)
--
Gitblit v1.9.3