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 | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
index 3541860..7994766 100644
--- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
+++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
@@ -26,15 +26,16 @@
/// </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}");
@@ -43,15 +44,15 @@
//妯℃嫙
if (Form1.isvirtual)
{//妯℃嫙鐜
- res = new ApiResponse<object>();
- res.Success = true;
- res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ res = new mesMsg();
+ res.ErrorCode = 0;
+ res.ErrorMsg = "绯荤粺妯℃嫙瀹屾垚";
}
else
{
- var resStr = mes_api.postContentForString("T_WMS_Inbound_Record", paprm, guid);
+ var resStr = mes_api.postContentForString("", paprm, guid);
Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}");
- res = JsonConvert.DeserializeObject<ApiResponse<object>>(resStr);
+ res = JsonConvert.DeserializeObject<mesMsg>(resStr);
}
Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
@@ -59,7 +60,8 @@
catch (Exception ex)
{
Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
- res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ res.ErrorCode = 4;
+ res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message;
}
return res;
@@ -71,15 +73,16 @@
/// </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}");
@@ -87,15 +90,15 @@
//妯℃嫙
if (Form1.isvirtual)
{//妯℃嫙鐜
- res = new ApiResponse<object>();
- res.Success = true;
- res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ res = new mesMsg();
+ res.ErrorCode = 0;
+ res.ErrorMsg = "绯荤粺妯℃嫙瀹屾垚";
}
else
{
- var resStr = mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid);
+ var resStr = mes_api.postContentForString("", paprm, guid);
Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}");
- res = JsonConvert.DeserializeObject<ApiResponse<object>>(resStr);
+ res = JsonConvert.DeserializeObject<mesMsg>(resStr);
}
Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
@@ -103,7 +106,8 @@
catch (Exception ex)
{
Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
- res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ res.ErrorCode = 4;
+ res.ErrorMsg = "wms鍙戦�佸紓甯�:" + ex.Message;
}
return res;
@@ -115,14 +119,16 @@
/// </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();
@@ -130,15 +136,15 @@
//妯℃嫙
if (Form1.isvirtual)
{//妯℃嫙鐜
- res = new ApiResponse<object>();
- res.Success = true;
- res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ res = new mesMsg();
+ res.ErrorCode = 0;
+ res.ErrorMsg = "绯荤粺妯℃嫙瀹屾垚";
}
else
{
- var resStr = mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid);
+ var resStr = mes_api.postContentForString("", paprm, guid);
Log4NetHelper.WriteInfoLog(_logType, $"{funName},缁撴灉杩斿洖:{resStr}");
- res = JsonConvert.DeserializeObject<ApiResponse<object>>(resStr);
+ res = JsonConvert.DeserializeObject<mesMsg>(resStr);
}
@@ -147,7 +153,8 @@
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