From 667c3bc186be6c460cae63c20a60a48a2323dcc2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 9月 2025 09:58:46 +0800
Subject: [PATCH] 222
---
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
index 6e2dc09..3541860 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,9 +26,10 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_InStockSend(List<InboundStockInfoToMes> pushData, string _identifier)
+ public static ApiResponse<object> Mes_InStockSend(List<InboundStockInfoToMes> pushData, string _identifier, LogType _logType)
{
ApiResponse<object> res = null;
+ var funName = "Mes_InStockSend";
try
{
MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
@@ -33,13 +37,28 @@
mesRequest.identifier = _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 ApiResponse<object>();
+ res.Success = true;
+ res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ var resStr = mes_api.postContentForString("T_WMS_Inbound_Record", paprm, guid);
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}");
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(resStr);
+ }
+
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
}
catch (Exception ex)
{
- WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_InStockSend ", " 鍙戦�佸紓甯�:" + JsonConvert.SerializeObject(ex));
+ Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
res.Message = "鍙戦�佸紓甯�:" + ex.Message;
}
return res;
@@ -52,9 +71,10 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_OutStockSend(List<InboundStockInfoToMes> pushData, string _identifier)
+ public static ApiResponse<object> Mes_OutStockSend(List<InboundStockInfoToMes> pushData, string _identifier, LogType _logType)
{
ApiResponse<object> res = null;
+ var funName = "Mes_OutStockSend";
try
{
MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
@@ -62,13 +82,27 @@
mesRequest.identifier = _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_Outbound_Record", paprm, guid));
- WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend 杩斿洖鐘舵�佺爜:", res.Code + " 杩斿洖淇℃伅:" + res.Message);
+ //妯℃嫙
+ if (Form1.isvirtual)
+ {//妯℃嫙鐜
+ res = new ApiResponse<object>();
+ res.Success = true;
+ res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ var resStr = mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid);
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}");
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(resStr);
+ }
+
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
}
catch (Exception ex)
{
- WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend ", " 鍙戦�佸紓甯�:" + JsonConvert.SerializeObject(ex));
+ Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
res.Message = "鍙戦�佸紓甯�:" + ex.Message;
}
return res;
@@ -81,9 +115,10 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_StockSend(List<InboundStockInfoToMes> pushData)
+ public static ApiResponse<object> Mes_StockSend(List<InboundStockInfoToMes> pushData, LogType _logType)
{
ApiResponse<object> res = null;
+ var funName = "Mes_StockSend";
try
{
MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
@@ -91,12 +126,27 @@
string paprm = JsonConvert.SerializeObject(mesRequest);
Guid guid = System.Guid.NewGuid();
- res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid));
- WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend 杩斿洖鐘舵�佺爜:", res.Code + " 杩斿洖淇℃伅:" + res.Message);
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{paprm}");
+ //妯℃嫙
+ if (Form1.isvirtual)
+ {//妯℃嫙鐜
+ res = new ApiResponse<object>();
+ res.Success = true;
+ res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ var resStr = mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid);
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}");
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(resStr);
+ }
+
+
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
}
catch (Exception ex)
{
- WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend ", " 鍙戦�佸紓甯�:" + JsonConvert.SerializeObject(ex));
+ Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
res.Message = "鍙戦�佸紓甯�:" + ex.Message;
}
return res;
--
Gitblit v1.9.3