From 5c272c606bdf2da3577dbaa5f48d0ee163f1e7d2 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 26 三月 2026 10:35:24 +0800
Subject: [PATCH] 纸张淋膜半成品入库逻辑优化
---
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs | 147 +++---------------------------------------------
1 files changed, 10 insertions(+), 137 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
index a8e082b..7c120bd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
@@ -15,12 +15,7 @@
{
public partial class TaskService
{
- /// <summary>
- /// 鍙戦�丄GV浠诲姟
- /// </summary>
- /// <param name="taskModel"></param>
- /// <returns></returns>
- public WebResponseContent AgvSendTask(AgvTaskDTO taskModel, APIEnum SendTask = APIEnum.Agv_CSJSendTask)
+ public WebResponseContent AgvSendTask(AgvTaskSendDTO taskModel, APIEnum SendTask = APIEnum.AgvSendTask)
{
WebResponseContent content = new WebResponseContent();
try
@@ -46,149 +41,27 @@
return content;
}
/// <summary>
- /// 瀹夊叏淇″彿鐢宠 AGV-WCS
+ /// AGV纭瀹屾垚鎺ュ彛(鍙栨斁)
/// </summary>
- public AgvResponseContent AgvSecureApply(AgvSecureApplyDTO secureApplyModel)
- {
- return new AgvResponseContent();
- }
- /// <summary>
- /// 瀹夊叏淇″彿鍥炲 WCS-AGV //AGV浠诲姟缁х画鎵ц
- /// </summary>
- /// <param name="secureModel"></param>
+ /// <param name="agvFinishDTO"></param>
/// <returns></returns>
- public WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel, APIEnum SecureReply = APIEnum.Agv_CSJSecureReply)
+ public WebResponseContent AGVFinish(AgvFinishDTO agvFinishDTO)
{
WebResponseContent content = new WebResponseContent();
try
{
- string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == SecureReply.ToString())?.ApiAddress;
+ string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.AgvFinish.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 == "0")
+ string response = HttpHelper.Post(apiAddress, agvFinishDTO.Serialize());
+ AgvFinishResponse agvContent = response.DeserializeObject<AgvFinishResponse>();
+ if (agvContent.Success)
{
- content.OK(agvContent.Message);
+ content.OK();
}
else
{
- content.Error(agvContent.Message);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// CTU鍙栨秷浠诲姟
- /// </summary>
- public WebResponseContent AgvBoxApplyPass(AgvCTUCancelDTO applyPassDTO, APIEnum SecureReply = APIEnum.AGV_CTUCancelTask)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == SecureReply.ToString())?.ApiAddress;
- if (string.IsNullOrEmpty(apiAddress))
- return WebResponseContent.Instance.Error($"鏈壘鍒癆GV鍙栨秷浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiAddress, applyPassDTO.Serialize());
- AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "0")
- {
- content.OK(agvContent.Message);
- }
- else
- {
- content.Error(agvContent.Message);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// AGV鎴愬搧鍙栨斁璐ч�氱煡
- /// </summary>
- public WebResponseContent AgvBoxApplyPass(AGVBoxApplyPassDTO applyPassDTO, APIEnum SecureReply = APIEnum.AGV_CPBoxApplyPass)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == SecureReply.ToString())?.ApiAddress;
- if (string.IsNullOrEmpty(apiAddress))
- return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiAddress, applyPassDTO.Serialize());
- AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "0")
- {
- content.OK(agvContent.Message);
- }
- else
- {
- content.Error(agvContent.Message);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- public WebResponseContent AgvPreScheduleTask(AgvScheduleTaskDTO scheduleTaskDTO, APIEnum ScheduleTask = APIEnum.AGV_CTUScheduleTaskTask)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == ScheduleTask.ToString())?.ApiAddress;
- if (string.IsNullOrEmpty(apiAddress))
- return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiAddress, scheduleTaskDTO.Serialize());
- AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "0")
- {
- content.OK(agvContent.Message);
- }
- else
- {
- content.Error(agvContent.Message);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// AGV浠诲姟鐘舵�佸埛鏂�/AGV浠诲姟瀹屾垚
- /// </summary>
- /// <param name="agvUpdateModel"></param>
- /// <returns></returns>
- public AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel)
- {
- return new AgvResponseContent();
- }
- public WebResponseContent AgvPodBerthAndMat(AgvPodBerthAndMatDTO agvPodModel, APIEnum PodBerthAndMat = APIEnum.Agv_CSJPodBerthAndMat)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == PodBerthAndMat.ToString())?.ApiAddress;
- if (string.IsNullOrEmpty(apiAddress))
- return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiAddress, agvPodModel.Serialize());
- AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "1")
- {
- content.OK(agvContent.Message);
- }
- else
- {
- content.Error(agvContent.Message);
+ content.Error(agvContent.Content);
}
}
catch (Exception ex)
--
Gitblit v1.9.3