From 59c8d02d2bc7c7d9651edbd755ad73e4e7843ed8 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
index 18b5cc0..5fa9778 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
@@ -6,6 +6,7 @@
using System.Threading.Tasks;
using WIDESEA_DTO.Agv;
using WIDESEAWCS_Common.APIEnum;
+using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
@@ -18,17 +19,19 @@
/// </summary>
/// <param name="taskModel"></param>
/// <returns></returns>
- public WebResponseContent AgvSendTask(AgvTaskDTO taskModel)
+ public WebResponseContent AgvSendTask(AgvTaskDTO taskModel, APIEnum SendTask = APIEnum.Agv_CSJSendTask)
{
WebResponseContent content = new WebResponseContent();
try
{
- string apiAddress = AppSettings.Get(APIEnum.AgvSendTask.ToString());
+ string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == SendTask.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress))
+ return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiAddress, taskModel.Serialize());
AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "200")
+ if (agvContent.Code == "0")
{
- content.OK(agvContent.Message);
+ content.OK(data: agvContent.Data);
}
else
{
@@ -46,23 +49,24 @@
/// </summary>
public AgvResponseContent AgvSecureApply(AgvSecureApplyDTO secureApplyModel)
{
-
return new AgvResponseContent();
}
/// <summary>
- /// 瀹夊叏淇″彿鍥炲 WCS-AGV
+ /// 瀹夊叏淇″彿鍥炲 WCS-AGV //AGV浠诲姟缁х画鎵ц
/// </summary>
/// <param name="secureModel"></param>
/// <returns></returns>
- public WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel)
+ public WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel, APIEnum SecureReply = APIEnum.Agv_CSJSecureReply)
{
WebResponseContent content = new WebResponseContent();
try
{
- string apiAddress = AppSettings.Get(APIEnum.AgvSecureReply.ToString());
+ string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == SecureReply.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress))
+ return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiAddress, secureReplyModel.Serialize());
AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "200")
+ if (agvContent.Code == "0")
{
content.OK(agvContent.Message);
}
@@ -78,13 +82,12 @@
return content;
}
/// <summary>
- /// AGV浠诲姟鐘舵�佸埛鏂�
+ /// AGV浠诲姟鐘舵�佸埛鏂�/AGV浠诲姟瀹屾垚
/// </summary>
/// <param name="agvUpdateModel"></param>
/// <returns></returns>
public AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel)
{
-
return new AgvResponseContent();
}
}
--
Gitblit v1.9.3