From 4d2b6fea8d08c95bd6bb2b8c2b1228383110457e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 12:48:46 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 134 +++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 59 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 eb767fa..4729c55 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,4 +1,5 @@
-锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -18,7 +19,7 @@
/// <summary>
/// 涓嬪彂浠诲姟
/// </summary>
- public void SendTask()
+ public void SendNewTask()
{
try
{
@@ -26,8 +27,27 @@
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);
+ //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浠诲姟
+ 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.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
+
+ #region 涓嬪彂娴峰悍1鍒�6妤肩殑AGV浠诲姟/涓嬪彂娴峰悍6鍒�1妤肩殑AGV浠诲姟
+ Tasks = newTasks.Where(x => (x.TaskType == (int)TaskTypeEnum.Q3CK) || x.TaskType == (int)TaskTypeEnum.Q3RK||x.TaskType==(int)TaskTypeEnum.F01).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) SendAGVTask(Tasks);
+
+
#endregion
}
}
@@ -46,68 +66,64 @@
{
try
{
-
- }
- catch (Exception ex)
- {
- WriteError(nameof(TaskJob), ex.Message, ex);
- }
- }
- #endregion
-
- #region 涓嬪彂鍑箰澹獳GV浠诲姟
- public void SendGALAXISTask(List<Dt_Task> tasks)
- {
- GALAXISTaskInfo gALAXISTaskInfo = new GALAXISTaskInfo();
- try
- {
- gALAXISTaskInfo.groupId = DateTime.Now.ToString("yyMMddHHmmss");
- gALAXISTaskInfo.msgTime = DateTime.Now.ToString();
- foreach (var task in tasks)
+ var ExecutTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState != (int)TaskStatusEnum.New).ToList();
+ if (ExecutTasks.Count > 0)
{
- GALAXISTask gALAXISTask = new GALAXISTask()
- {
- taskId = task.WMSTaskNum,
- taskType = task.TaskType == (int)TaskTypeEnum.MLInbound ? 0 : 1,
- barCode = task.PalletCode,
- endNode = task.TargetAddress,
- startNode = task.SourceAddress,
- priorityCode = task.Grade
- };
- gALAXISTaskInfo.tasks.Add(gALAXISTask);
- }
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GALAXISTaskInfo));
- if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, gALAXISTaskInfo.Serialize());
- GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
- if (agvContent.success)
- {
- if (agvContent.data.returnStatus != 0) throw new Exception(agvContent.data.returnInfo);
- tasks.ForEach(task =>
- {
- task.TaskState = (int)TaskStatusEnum.Execut;
- });
- _taskService.UpdateData(tasks);
+ #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 = 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 = 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 涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.RGV_NewMoveTask).ToList();
+ if (Tasks.Count > 0) SendMoveTasks(Tasks);
+ #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
+
+
+ #region 澶勭悊agv寰呯┖杞︽惉杩愪换鍔�
+ Tasks = ExecutTasks.Where(x => x.TaskState == (int)TaskStatusEnum.WaitingHkAGVMovePosition).OrderByDescending(x => x.Grade).ToList();
+ if (Tasks.Count > 0) SendHKWaitTask();
+ #endregion
+
+
}
}
catch (Exception ex)
{
WriteError(nameof(TaskJob), ex.Message, ex);
}
- }
- #endregion
-
- #region 涓嬪彂鍥涘悜杞︿换鍔�
- public void SendRGVTask(List<Dt_Task> tasks)
- {
-
- }
- #endregion
-
- #region 涓嬪彂娴峰悍AGV浠诲姟
- public void SendHIKROBOTTask(List<Dt_Task> tasks)
- {
-
}
#endregion
}
--
Gitblit v1.9.3