From b27bc774c69089d29863b5633fcdfa44799eb450 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 09 三月 2026 09:22:15 +0800
Subject: [PATCH] 添加与凯乐士接口调试的日志
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 5 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 99 ++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 83 insertions(+), 21 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 184c486..7d10a8f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -117,11 +117,11 @@
}
}
}
- return content.OK();
+ content.OK();
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ content.Error(ex.Message);
}
finally
{
@@ -150,6 +150,7 @@
_trackloginfoService.AddTrackLog(logObject, content, $"涓嬪彂{deviceName}浠诲姟", "", "");
}
}
+ return content;
}
#endregion
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 688a447..bf08104 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using SixLabors.ImageSharp.ColorSpaces;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using WIDESEAWCS_BasicInfoService;
@@ -146,6 +147,9 @@
public WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask)
{
WebResponseContent content = new WebResponseContent();
+ var KLS = new CancelGALAXISTask();
+ CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
+ CancelSXCTake cancelSXCTake = new CancelSXCTake();
try
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
@@ -163,7 +167,7 @@
#region 鍑箰澹�
if (isGALAXISTask)
{
- var KLS = new CancelGALAXISTask
+ KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString()
@@ -176,11 +180,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
}
}
@@ -189,7 +193,7 @@
#region 鍥涘悜杞�
if (isAGV)
{
- CancelSXCTake cancelSXCTake = new CancelSXCTake
+ cancelSXCTake = new CancelSXCTake
{
taskID = dt_Task.RGVTaskId
};
@@ -201,18 +205,18 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
}
}
#endregion
#region 娴峰悍
if (isHK)
{
- CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask
+ cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
cancelType = "CANCEL"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
@@ -225,11 +229,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
}
}
@@ -239,6 +243,33 @@
catch (Exception ex)
{
content.Error(ex.Message);
+ }
+ finally
+ {
+ // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
+ object logObject = null;
+ string deviceName = "";
+
+ if (KLS != null )
+ {
+ logObject = KLS;
+ deviceName = "鍑箰澹獳GV";
+ }
+ else if (cancelHIKROBOTTask != null )
+ {
+ logObject = cancelHIKROBOTTask;
+ deviceName = "娴峰悍鏈哄櫒浜�";
+ }
+ else if (cancelSXCTake != null )
+ {
+ logObject = cancelSXCTake;
+ deviceName = "鍥涘悜杞�";
+ }
+
+ if (logObject != null)
+ {
+ _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟", "", "");
+ }
}
return content;
}
@@ -252,6 +283,9 @@
public WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority)
{
WebResponseContent content = new WebResponseContent();
+ var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade();
+ var request = new UpdateAgvSXCTake();
+ var Hkrequest = new HIKROBOTTaskGrade();
try
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
@@ -271,7 +305,7 @@
#region 鍑箰澹�
if (isGALAXISTask)
{
- var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
+ updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString(),
@@ -286,11 +320,11 @@
{
BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
}
}
#endregion
@@ -298,7 +332,7 @@
#region 鍥涘悜杞�
if (isAGV)
{
- var request = new UpdateAgvSXCTake
+ request = new UpdateAgvSXCTake
{
taskID = dt_Task.RGVTaskId,
priority = updateTaskPriority.taskPriority
@@ -310,11 +344,11 @@
if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
}
}
@@ -322,23 +356,23 @@
#region 娴峰悍
if (isHK)
{
- var request = new HIKROBOTTaskGrade
+ Hkrequest = new HIKROBOTTaskGrade
{
robotTaskCode = dt_Task.WMSTaskNum,//浠诲姟鍙�
initPriority = updateTaskPriority.taskPriority//浼樺厛绾�
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(HIKROBOTTaskGrade));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, Hkrequest.Serialize());
HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
}
}
#endregion
@@ -347,6 +381,33 @@
{
content.Error(ex.Message);
}
+ finally
+ {
+ // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
+ object logObject = null;
+ string deviceName = "";
+
+ if (updateGALAXISTaskGrade != null )
+ {
+ logObject = updateGALAXISTaskGrade;
+ deviceName = "鍑箰澹獳GV";
+ }
+ else if (Hkrequest != null)
+ {
+ logObject = Hkrequest;
+ deviceName = "娴峰悍鏈哄櫒浜�";
+ }
+ else if (request != null )
+ {
+ logObject = request;
+ deviceName = "鍥涘悜杞�";
+ }
+
+ if (logObject != null)
+ {
+ _trackloginfoService.AddTrackLog(logObject, content, $"淇敼{deviceName}浠诲姟浼樺厛绾�", "", "");
+ }
+ }
return content;
}
--
Gitblit v1.9.3