From f1d8d7b04a81619cb29457fa88538bbaf37d8c20 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 二月 2026 18:22:04 +0800
Subject: [PATCH] 优化WCS跟四向车接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 69 ++++++----------------------------
1 files changed, 12 insertions(+), 57 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 45158be..6b4a81c 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"
@@ -29,6 +29,16 @@
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 || x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
+ if (Tasks.Count > 0) SendRGVTask(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)
@@ -46,68 +56,13 @@
{
try
{
-
+ var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk).ToList();
+ SendCheckShapeingOkTask(Tasks);
}
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();
- gALAXISTaskInfo.tasks = new List<GALAXISTask>();
- foreach (var task in tasks)
- {
- 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)) ?? 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);
- }
- }
- 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