From 4e839ad077304eaecb6dfb35fdc9b0d30a209a76 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 28 二月 2026 13:21:55 +0800
Subject: [PATCH] 优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 76 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 25 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 9ce6cb4..7036521 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"
@@ -1,10 +1,13 @@
-锘縰sing System;
+锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_Tasks
@@ -15,14 +18,29 @@
/// <summary>
/// 涓嬪彂浠诲姟
/// </summary>
- public void SendTask()
+ public void SendNewTask()
{
try
{
- var newTask = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt()).ToList();
- if (newTask.Count > 0)
+ 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
+ #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();
+ 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)
@@ -40,33 +58,41 @@
{
try
{
+ #region 涓嬪彂澶栧舰妫�娴嬮�氳繃鐨勫洓鍚戣溅浠诲姟
+ var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk && x.ExceptionMessage.IsNullOrEmpty()).ToList();
+ if (Tasks.Count > 0) SendCheckShapeingOkTask(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 = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_NewMoveTask).ToList();
+ if (Tasks.Count > 0) SendMoveTasks(Tasks);
+ #endregion
+
+ #region 澶勭悊寰呯Щ搴撳悗鍥涘悜杞﹀嚭搴撲换鍔�
+ Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitMoveToExecute).ToList();
+ if (Tasks.Count > 0) MoveToExecuteTask(Tasks);
+ #endregion
+
+ #region 涓嬪彂鍥涘悜杞﹀嚭搴撲换鍔�
+ Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitSend).ToList();
+ if (Tasks.Count > 0) SendOutTask(Tasks);
+ #endregion
+
+ #region 涓嬪彂鎵樼洏纭鐨勬捣搴稟GV浠诲姟
+
+ #endregion
}
catch (Exception ex)
{
WriteError(nameof(TaskJob), ex.Message, ex);
}
- }
- #endregion
-
- #region 涓嬪彂鍑箰澹獳GV浠诲姟
- public void SendGALAXISTask(List<Dt_Task> tasks)
- {
-
- }
- #endregion
-
- #region 涓嬪彂鍥涘悜杞︿换鍔�
- public void SendRGVTask(List<Dt_Task> tasks)
- {
-
- }
- #endregion
-
- #region 涓嬪彂娴峰悍AGV浠诲姟
- public void SendHIKROBOTTask(List<Dt_Task> tasks)
- {
-
}
#endregion
}
--
Gitblit v1.9.3