From 16749e23b489ee24f993fe9e87346680b7bcf63a Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 10 十月 2025 21:14:49 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/AGVTaskService.cs | 69 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/AGVTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/AGVTaskService.cs"
index 957a964..eff629f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/AGVTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/AGVTaskService.cs"
@@ -1,5 +1,6 @@
锘縰sing AngleSharp.Io;
using HslCommunication;
+using LogLibrary.Log;
using Mapster;
using Newtonsoft.Json;
using SkiaSharp;
@@ -18,7 +19,7 @@
{
public partial class TaskService
{
- #region AGV鎺ュ彛
+ #region 璋冪敤AGV鎺ュ彛
private string GetAGVIPAddress(string baseIp, string name)
{
var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -31,24 +32,66 @@
return wcsBasez + address;
}
- public async Task<WebResponseContent> SendAgvTask(string modelProcessCode,Dt_Task task)
+ /// <summary>
+ /// 鍙戦�佷换鍔�
+ /// </summary>
+ /// <param name="modelProcessCode"></param>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> SendAgvTask(string modelProcessCode, int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ List<taskOrderDetail> orderDetails = new List<taskOrderDetail>()
+ {
+ new taskOrderDetail()
+ {
+ taskPath = $"{task.CurrentAddress},{task.NextAddress}",
+ shelfNumber = "",
+ }
+ };
+ SendTask sendTask = new SendTask()
+ {
+ modelProcessCode = modelProcessCode,
+ priority = 1,
+ fromSystem = "WMS",
+ orderId = task.AGVTaskNum,
+ taskOrderDetail = orderDetails
+
+ };
+ var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigKeyConst.AGVIP_BASE, SysConfigKeyConst.SendAGVTask);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpHelper.PostAsync(AgvSendTaskAddrss, sendTask.ToJsonString());
+
+ LogFactory.WriteInfo("涓嬪彂AGV浠诲姟鍥炶皟", $"{JsonConvert.SerializeObject(result)}");
+
+ var respone = JsonConvert.DeserializeObject<AgvRespone>(result.ToString());
+
+ if (respone.code != 1000)
+ {
+ content.Error(respone.desc);
+ }
+ content.OK(respone.desc);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public async Task<WebResponseContent> ContinueAgvTask(string AGVTaskNum)
{
WebResponseContent content = new WebResponseContent();
try
{
SendTask sendTask = new SendTask()
{
- modelProcessCode = modelProcessCode,
- priority = 1,
- fromSystem = "WMS",
- orderId = task.TaskNum.ToString(),
- orderDetail = new taskOrderDetail()
- {
- taskPath = $"{task.CurrentAddress},{task.NextAddress}",
- shelfNumber = "",
- }
+ orderId = AGVTaskNum.ToString(),
};
- var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigKeyConst.AGVIP_BASE, SysConfigKeyConst.SendAGVTask);
+ var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigKeyConst.AGVIP_BASE, SysConfigKeyConst.ContinueAGVTask);
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpHelper.PostAsync(AgvSendTaskAddrss, sendTask.ToJsonString());
@@ -66,7 +109,7 @@
}
return content;
}
-
#endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3