From 528b1ae722536aafc6afce10389ce7982ed278df Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 09 9月 2025 16:05:01 +0800
Subject: [PATCH] //按照AGV的要求，必须是6位数字 【Editby shaocx,2025-09-09】
---
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs | 90 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 20 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
index 81d256e..7994766 100644
--- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
+++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
@@ -9,6 +9,7 @@
using yunneiWCS.EnumDefine;
using yunneiWCS.ExtendFunction;
using yunneiWCS.SystemInteraction.mes2.dto;
+using static WZ.Useful.Commons.NativeMethods;
namespace yunneiWCS.mes
{
@@ -25,26 +26,42 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_InStockSend(List<InboundStockInfoToMes> pushData, string _identifier, LogType _logType)
+ 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.identifier = _identifier;
+ 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));
- Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{res}");
+
+ //妯℃嫙
+ 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.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ res.ErrorCode = 4;
+ res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message;
}
return res;
@@ -56,26 +73,41 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_OutStockSend(List<InboundStockInfoToMes> pushData, string _identifier, LogType _logType)
+ public static mesMsg Mes_OutStockSend(List<InboundStockInfoToMes> pushData, LogType _logType)
{
- ApiResponse<object> res = null;
+ mesMsg res = null;
var funName = "Mes_OutStockSend";
try
{
MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
- mesRequest.data = pushData;
- mesRequest.identifier = _identifier;
+ 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();
- res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid));
- Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{res}");
+ //妯℃嫙
+ 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.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ res.ErrorCode = 4;
+ res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message;
}
return res;
@@ -87,24 +119,42 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_StockSend(List<InboundStockInfoToMes> pushData, LogType _logType)
+ public static mesMsg Mes_StockSend(List<InboundStockInfoToMes> pushData, LogType _logType)
{
- ApiResponse<object> res = null;
+ mesMsg res = null;
var funName = "Mes_StockSend";
try
{
MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
- mesRequest.data = pushData;
+ mesRequest.Datas = pushData;
+ mesRequest.TableName = "T_WMS_Realtime_Data";
+ mesRequest.PrimaryKeys = "serialNumber,positionName";
string paprm = JsonConvert.SerializeObject(mesRequest);
Guid guid = System.Guid.NewGuid();
- res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid));
- Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{res}");
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{paprm}");
+ //妯℃嫙
+ 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.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ res.ErrorCode = 4;
+ res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message;
}
return res;
--
Gitblit v1.9.3