From 28a788d3fca51fb4fd2f668b90fa95e87c2633a1 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 16 四月 2026 19:07:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs"
index 3edca3b..fc66763 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs"
@@ -1,11 +1,14 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
+using WIDESEAWCS_DTO.RGV.FOURBOT;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_Tasks
@@ -16,7 +19,9 @@
#region 涓嬪彂鍑箰澹獳GV浠诲姟
public void SendGALAXISTask(List<Dt_Task> tasks)
{
+ WebResponseContent content = new WebResponseContent(); // 鍒涘缓鍝嶅簲瀵硅薄
GALAXISTaskInfo gALAXISTaskInfo = new();
+ GALAXISReturn agvContent = new();
try
{
gALAXISTaskInfo.groupId = DateTime.Now.ToString("yyMMddHHmmss");
@@ -37,7 +42,8 @@
}
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>();
+ agvContent = response.DeserializeObject<GALAXISReturn>();
+ content.OK(data: agvContent);
if (agvContent.success)
{
if (agvContent.data.returnStatus != 0) throw new Exception(agvContent.data.returnInfo);
@@ -45,12 +51,19 @@
{
task.TaskState = (int)TaskStatusEnum.Execut;
});
+ content.OK();
_taskService.UpdateData(tasks);
}
}
catch (Exception ex)
{
- WriteError(nameof(TaskJob), ex.Message, ex);
+ content.Error(ex.Message);
+ //WriteError(nameof(TaskJob), ex.Message, ex);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(gALAXISTaskInfo, content, "涓嬪彂鍑箰澹獳GV浠诲姟", "", agvContent.data.returnInfo);
+ //dt_trackloginfoService.Instance.AddTrackLog(outTaskInfo, content, "鎺ユ敹瀹囪埅WMS鍑哄簱浠诲姟涓嬪彂", "", $"{msg},鍙樻洿缁撴灉:{content.Status}");
}
}
#endregion
--
Gitblit v1.9.3