From 00aaf49a223be04fc58f6f7c09d95ce4b22ef087 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 11 七月 2025 17:06:18 +0800 Subject: [PATCH] 修复盘点计划单、盘点单的状态更改逻辑 --- api/AgvController.cs | 56 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 18 deletions(-) diff --git a/api/AgvController.cs b/api/AgvController.cs index 1dcacb9..8ea7831 100644 --- a/api/AgvController.cs +++ b/api/AgvController.cs @@ -8,32 +8,19 @@ using System.Web.Http; using static HH.WCS.Mobox3.AnGang.dispatch.NDC; using System.Linq; -using HH.WCS.Mobox3.AnGang.config; - +using HH.WCS.Mobox3.AnGang.util; using static HH.WCS.Mobox3.AnGang.api.ApiModel; +using System.Text; +using System.Web; namespace HH.WCS.Mobox3.AnGang.api { /// <summary> /// 璁惧淇℃伅涓婃姤锛坔osttoagv涓婃姤銆佹澀濂ュ爢鍨涙満銆佸浗鑷猘gv锛� /// </summary> - [RoutePrefix("agv")] public class AgvController : ApiController { - ///// <summary> - ///// NDC HostToAGV 浠诲姟鐘舵�鍥炴姤 - ///// </summary> - ///// <param name="model"></param> - ///// <returns></returns> - //[HttpPost] - //[Route("AGVCallbackState")] - //public ReturnResult AGVCallbackState(AgvTaskState model) - //{ - // LogHelper.Info("NDC HostToAGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); - // return AgvService.OperateAgvTaskStatus(model); - //} - /// <summary> /// RCS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤 /// </summary> @@ -42,9 +29,11 @@ [HttpPost] [Route("orderStatusReport")] public GzResult orderStatusReport(orderStatusReportParme model) { + //LogHelper.Info("RCS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); + //LogRequestHeaders(); return GZRobot.orderStatusReport(model); } - + /// <summary> /// AGV 涓庝骇绾胯繘琛屽畨鍏ㄤ氦浜� /// </summary> @@ -52,8 +41,39 @@ /// <returns></returns> [HttpPost] [Route("safetyInteraction")] - public ReturnResult SafetyInteraction(SafetyInteractionInfo model) { + public gzResult SafetyInteraction(SafetyInteractionInfo model) { return WCSCore.SafetyInteraction(model); } + + // 鎼佺疆涓嶄娇鐢紝瀛樺湪bug锛欻ttpContext.Current.Request璧嬪�鍓嶅紩鐢紝搴旇鏄疌urrent涓簄ull瀵艰嚧鐨�+ + private void LogRequestHeaders() { + var request = HttpContext.Current.Request; + var logMessage = new StringBuilder(); + + logMessage.AppendLine("=== 璇锋眰澶翠俊鎭�==="); + logMessage.AppendLine($"璇锋眰URL: {request.Url}"); + logMessage.AppendLine($"HTTP鏂规硶: {request.HttpMethod}"); + + foreach (string headerName in request.Headers) { + logMessage.AppendLine($"{headerName}: {request.Headers[headerName]}"); + } + + LogHelper.Info(logMessage.ToString()); + } + + private void LogResponseHeaders() { + var response = HttpContext.Current.Response; + var logMessage = new StringBuilder(); + + logMessage.AppendLine("=== 鍝嶅簲澶翠俊鎭�==="); + logMessage.AppendLine($"鐘舵�鐮� {response.StatusCode}"); + + foreach (string headerName in response.Headers) { + logMessage.AppendLine($"{headerName}: {response.Headers[headerName]}"); + } + + LogHelper.Info(logMessage.ToString()); + } } } -- Gitblit v1.9.1