From e86f3bddecdc13210a546761ecf5e8550ea20799 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周四, 11 9月 2025 14:51:32 +0800 Subject: [PATCH] 增加日志追踪 --- wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs | 136 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 128 insertions(+), 8 deletions(-) diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs index 40821d8..1e72edb 100644 --- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs +++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs @@ -1,4 +1,5 @@ -锘縰sing Newtonsoft.Json; +锘縰sing iWareCommon.Utils; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +7,9 @@ using System.Text; using System.Threading.Tasks; using yunneiWCS.EnumDefine; +using yunneiWCS.ExtendFunction; using yunneiWCS.SystemInteraction.mes2.dto; +using static WZ.Useful.Commons.NativeMethods; namespace yunneiWCS.mes { @@ -23,23 +26,140 @@ /// </summary> /// <param name="pushData"></param> /// <returns></returns> - public static ApiResponse<object> Mes_InStockSend(List<InboundStockInfoToMes> pushData) + public static mesMsg Mes_InStockSend(List<InboundStockInfoToMes> pushData, LogType _logType) { - ApiResponse<object> res = null; + mesMsg res = null; + var funName = "Mes_InStockSend"; try { MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>(); - mesRequest.data = pushData; + mesRequest.Datas = pushData; + mesRequest.TableName = "T_WMS_Inbound_Record"; + mesRequest.PrimaryKeys = "identifier"; string paprm = JsonConvert.SerializeObject(mesRequest); + Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{paprm}"); Guid guid = System.Guid.NewGuid(); - res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Inbound_Record", paprm, guid)); - WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_InStockSend 杩斿洖鐘舵�佺爜:", res.Code + " 杩斿洖淇℃伅:" + res.Message); + + //妯℃嫙 + if (Form1.isvirtual) + {//妯℃嫙鐜 + res = new mesMsg(); + res.ErrorCode = 0; + res.ErrorMsg = "绯荤粺妯℃嫙瀹屾垚"; + } + else + { + var resStr = mes_api.postContentForString("", paprm, guid); + Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}"); + res = JsonConvert.DeserializeObject<mesMsg>(resStr); + } + + Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}"); } catch (Exception ex) { - WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_InStockSend ", " 鍙戦�佸紓甯�:" + JsonConvert.SerializeObject(ex)); - res.Message = "鍙戦�佸紓甯�:" + ex.Message; + Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex); + res.ErrorCode = 4; + res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message; + } + return res; + + } + + + /// <summary> + /// 缁橫ES鎺ㄩ�佸嚭搴撲俊鎭� + /// </summary> + /// <param name="pushData"></param> + /// <returns></returns> + public static mesMsg Mes_OutStockSend(List<InboundStockInfoToMes> pushData, LogType _logType) + { + mesMsg res = null; + var funName = "Mes_OutStockSend"; + try + { + MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>(); + mesRequest.Datas = pushData; + mesRequest.TableName = "T_WMS_Outbound_Record"; + mesRequest.PrimaryKeys = "identifier"; + + string paprm = JsonConvert.SerializeObject(mesRequest); + Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{paprm}"); + Guid guid = System.Guid.NewGuid(); + //妯℃嫙 + if (Form1.isvirtual) + {//妯℃嫙鐜 + res = new mesMsg(); + res.ErrorCode = 0; + res.ErrorMsg = "绯荤粺妯℃嫙瀹屾垚"; + } + else + { + var resStr = mes_api.postContentForString("", paprm, guid); + Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}"); + res = JsonConvert.DeserializeObject<mesMsg>(resStr); + } + + Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}"); + } + catch (Exception ex) + { + Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex); + res.ErrorCode = 4; + res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message; + } + return res; + + } + + + /// <summary> + /// 缁橫ES鎺ㄩ�佸簱瀛樹俊鎭� + /// </summary> + /// <param name="pushData"></param> + /// <returns></returns> + public static mesMsg Mes_StockSend(LogType _logType, List<InboundStockInfoToMes> pushData, LogType _logTypeForInfo) + { + mesMsg res = null; + var funName = "Mes_StockSend"; + try + { + MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>(); + mesRequest.Datas = pushData; + mesRequest.TableName = "T_WMS_Realtime_Data"; + mesRequest.PrimaryKeys = "serialNumber,positionName"; + + string paprm = JsonConvert.SerializeObject(mesRequest); + Guid guid = System.Guid.NewGuid(); + Log4NetHelper.WriteInfoLog(_logTypeForInfo, $"{funName},鍑嗗鍙傛暟:{paprm}"); + var numCount = $"{pushData.Count()}鏉�"; + Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{numCount}"); + //妯℃嫙 + if (Form1.isvirtual) + {//妯℃嫙鐜 + res = new mesMsg(); + res.ErrorCode = 0; + res.ErrorMsg = "绯荤粺妯℃嫙瀹屾垚"; + } + else + { + var resStr = mes_api.postContentForString("", paprm, guid); + Log4NetHelper.WriteInfoLog(_logTypeForInfo, $"{funName},缁撴灉杩斿洖:{resStr}"); + Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}"); + res = JsonConvert.DeserializeObject<mesMsg>(resStr); + } + + + Log4NetHelper.WriteInfoLog(_logTypeForInfo, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}"); + Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{numCount},杩斿洖:{JsonConvert.SerializeObject(res)}"); + } + catch (Exception ex) + { + Log4NetHelper.WriteErrorLog(_logTypeForInfo, $"{funName},寮傚父:" + ex.Message, ex); + Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex); + res.ErrorCode = 4; + res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message; } return res; -- Gitblit v1.9.3