From 6b5de286683ac86026b2e9109166ced0332cfdad Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 04 9月 2025 10:10:25 +0800
Subject: [PATCH] 处理推送
---
wcs/yunneiWCS/yunneiWCS/App - 本地.config | 2
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs | 3
wcs/yunneiWCS/yunneiWCS/App -生产.config | 2
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs | 65 +++++++-----
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/InboundStockInfoToMes.cs | 7 +
wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj | 1
wcs/yunneiWCS/yunneiWCS/App.config | 2
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs | 11 +-
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler - 复制.cs | 156 +++++++++++++++++++++++++++++++
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs | 23 ++-
10 files changed, 225 insertions(+), 47 deletions(-)
diff --git "a/wcs/yunneiWCS/yunneiWCS/App - \346\234\254\345\234\260.config" "b/wcs/yunneiWCS/yunneiWCS/App - \346\234\254\345\234\260.config"
index 7d3a8f8..808ad1c 100644
--- "a/wcs/yunneiWCS/yunneiWCS/App - \346\234\254\345\234\260.config"
+++ "b/wcs/yunneiWCS/yunneiWCS/App - \346\234\254\345\234\260.config"
@@ -11,7 +11,7 @@
<!--鏄惁鏄櫄鎷熶豢鐪熸ā寮�,true:鏄紝false锛氬惁銆傜敓浜х幆澧冭閰嶇疆涓篺alse 銆怑ditBy shaocx,2022-01-27銆�-->
<add key="IsVirtualMode" value="true"/>
<!--MES鍦板潃 銆怑ditBy shaocx,2025-08-27銆�-->
- <add key="MesUrl" value="http://192.168.6.47:8000/api/Save/"/>
+ <add key="MesUrl" value="http://192.168.6.47:8000/api/Save"/>
</appSettings>
<system.serviceModel>
diff --git "a/wcs/yunneiWCS/yunneiWCS/App -\347\224\237\344\272\247.config" "b/wcs/yunneiWCS/yunneiWCS/App -\347\224\237\344\272\247.config"
index 980e0e1..0b1eab7 100644
--- "a/wcs/yunneiWCS/yunneiWCS/App -\347\224\237\344\272\247.config"
+++ "b/wcs/yunneiWCS/yunneiWCS/App -\347\224\237\344\272\247.config"
@@ -12,7 +12,7 @@
<!--鏄惁鏄櫄鎷熶豢鐪熸ā寮�,true:鏄紝false锛氬惁銆傜敓浜х幆澧冭閰嶇疆涓篺alse 銆怑ditBy shaocx,2022-01-27銆�-->
<add key="IsVirtualMode" value="false"/>
<!--MES鍦板潃 銆怑ditBy shaocx,2025-08-27銆�-->
- <add key="MesUrl" value="http://192.168.6.47:8000/api/Save/"/>
+ <add key="MesUrl" value="http://192.168.6.47:8000/api/Save"/>
</appSettings>
<system.serviceModel>
diff --git a/wcs/yunneiWCS/yunneiWCS/App.config b/wcs/yunneiWCS/yunneiWCS/App.config
index 95ce365..7d6b862 100644
--- a/wcs/yunneiWCS/yunneiWCS/App.config
+++ b/wcs/yunneiWCS/yunneiWCS/App.config
@@ -12,7 +12,7 @@
<!--鏄惁鏄櫄鎷熶豢鐪熸ā寮�,true:鏄紝false锛氬惁銆傜敓浜х幆澧冭閰嶇疆涓篺alse 銆怑ditBy shaocx,2022-01-27銆�-->
<add key="IsVirtualMode" value="true"/>
<!--MES鍦板潃 銆怑ditBy shaocx,2025-08-27銆�-->
- <add key="MesUrl" value="http://192.168.6.47:8000/api/Save/"/>
+ <add key="MesUrl" value="http://192.168.6.47:8000/api/Save"/>
</appSettings>
<system.serviceModel>
diff --git "a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler - \345\244\215\345\210\266.cs" "b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler - \345\244\215\345\210\266.cs"
new file mode 100644
index 0000000..659e6ea
--- /dev/null
+++ "b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler - \345\244\215\345\210\266.cs"
@@ -0,0 +1,156 @@
+锘�//using iWareCommon.Utils;
+//using Newtonsoft.Json;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Net;
+//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
+//{
+// /// <summary>
+// /// MES鎺ㄩ�佹帴鍙�
+// /// </summary>
+// public class PushMesHandler
+// {
+// public static string mes_api_url = ConfigHelper.GetConfigString("MesUrl");//淇敼涓洪厤缃枃浠� 銆怑ditBy shaocx,2022-01-27銆�
+// static HTTPService mes_api = new HTTPService(mes_api_url);//mes鍩哄湴鍧�
+
+// /// <summary>
+// /// 缁橫ES鎺ㄩ�佸叆搴撲俊鎭�
+// /// </summary>
+// /// <param name="pushData"></param>
+// /// <returns></returns>
+// 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>>();
+// mesRequest.data = pushData;
+// mesRequest.identifier = _identifier;
+
+// string paprm = JsonConvert.SerializeObject(mesRequest);
+// Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{paprm}");
+// Guid guid = System.Guid.NewGuid();
+
+// //妯℃嫙
+// 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)
+// {
+// Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
+// res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+// }
+// return res;
+
+// }
+
+
+// /// <summary>
+// /// 缁橫ES鎺ㄩ�佸嚭搴撲俊鎭�
+// /// </summary>
+// /// <param name="pushData"></param>
+// /// <returns></returns>
+// 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>>();
+// mesRequest.data = pushData;
+// mesRequest.identifier = _identifier;
+
+// string paprm = JsonConvert.SerializeObject(mesRequest);
+// Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍑嗗鍙傛暟:{paprm}");
+// Guid guid = System.Guid.NewGuid();
+// //妯℃嫙
+// 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)
+// {
+// Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
+// res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+// }
+// return res;
+
+// }
+
+
+// /// <summary>
+// /// 缁橫ES鎺ㄩ�佸簱瀛樹俊鎭�
+// /// </summary>
+// /// <param name="pushData"></param>
+// /// <returns></returns>
+// 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>>();
+// mesRequest.data = pushData;
+
+// string paprm = JsonConvert.SerializeObject(mesRequest);
+// Guid guid = System.Guid.NewGuid();
+// 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)
+// {
+// Log4NetHelper.WriteErrorLog(_logType, $"{funName},寮傚父:" + ex.Message, ex);
+// res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+// }
+// return res;
+
+// }
+// }
+//}
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;
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/InboundStockInfoToMes.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/InboundStockInfoToMes.cs
index 5bbdcbd..216f26a 100644
--- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/InboundStockInfoToMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/InboundStockInfoToMes.cs
@@ -12,6 +12,11 @@
public class InboundStockInfoToMes
{
/// <summary>
+ /// 鍞竴鏍囪瘑绗�
+ /// </summary>
+ public string identifier { get; set; }
+
+ /// <summary>
/// 浜у搧鍚嶇О
/// </summary>
public string productName { get; set; }
@@ -55,5 +60,7 @@
/// 鏈哄瀷
/// </summary>
public string version { get; set; }
+
+
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs
index 4735a49..a808be3 100644
--- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs
+++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs
@@ -14,21 +14,26 @@
/// <summary>
/// 鏁版嵁
/// </summary>
- public T data { get; set; }
- /// <summary>
- /// 鎺ㄩ�佷汉
- /// </summary>
- public string Creator { get; set; } = "wms"; // 鍒涘缓浜猴紝濡� "wms"
+ public T Datas { get; set; }
/// <summary>
- /// 鎺ㄩ�佹椂闂�
+ /// 绯荤粺绫诲瀷
/// </summary>
- public string Timestamp { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); // 鏃堕棿鎴筹紝濡� "2022-03-15 06:43:15"
+ public string SystemType { get; set; } = "ERP";
+ /// <summary>
+ /// Secret
+ /// </summary>
+ public string Secret { get; set; } = "HJY^*HGYIIY";
/// <summary>
- /// 鍞竴鏍囪瘑绗�
+ /// 琛ㄥ悕
/// </summary>
- public string identifier { get; set; }
+ public string TableName { get; set; }
+
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public string PrimaryKeys { get; set; }
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
index 92f0d68..5e68e73 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
@@ -38,7 +38,7 @@
{
try
{
- ApiResponse<object> ret = null;
+ mesMsg ret = null;
//鑾峰彇淇℃伅鏄庣粏
var details = mod.Wms_outInStockRecord_Details_V2_Mes.Where(x => x.mainId == itemTask.ID).ToList();
@@ -47,6 +47,7 @@
{
pushData.Add(new InboundStockInfoToMes()
{
+ identifier = de.ID.ToString(),
containerCode = itemTask.containerCode,
createTime = itemTask.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss"),
materialCode = de.productCode,
@@ -63,17 +64,17 @@
switch (itemTask.outInFlag)
{
case (int)OutInFlag.鍏ュ簱:
- ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString(), _logType);
+ ret = PushMesHandler.Mes_InStockSend(pushData, _logType);
break;
case (int)OutInFlag.鍑哄簱:
- ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
+ ret = PushMesHandler.Mes_OutStockSend(pushData, _logType);
break;
default:
break;
}
SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},宸叉帹閫佺粨鏉燂紝杩斿洖:{JsonConvert.SerializeObject(ret)}";
- if (ret.Success)
+ if (ret.ErrorCode == 0)
{
itemTask.isSendToMes = 1;
}
@@ -82,7 +83,7 @@
itemTask.isSendToMes = 0;
}
itemTask.SendToMesTime = DateTime.Now;
- itemTask.MesRet = ret.Message;
+ itemTask.MesRet = ret.ErrorMsg;
itemTask.SendToMesCount = (itemTask.SendToMesCount ?? 0) + 1;
mod.SaveChanges();
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
index 98624c3..3b80a05 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
@@ -34,12 +34,13 @@
if (sendMesData.Count > 0)
{
SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},瑕佹帹閫亄sendMesData.Count()}鏉�!";
- ApiResponse<object> ret = null;
+ mesMsg ret = null;
List<InboundStockInfoToMes> pushData = new List<InboundStockInfoToMes>();
foreach (var itemTask in sendMesData)
{
pushData.Add(new InboundStockInfoToMes()
{
+ identifier=Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
containerCode = itemTask.containerCode,
createTime = itemTask.createTime?.ToString("yyyy-MM-dd HH:mm:ss"),
materialCode = itemTask.productCode,
diff --git a/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj b/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj
index a172f2b..3373349 100644
--- a/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj
+++ b/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj
@@ -153,6 +153,7 @@
<Compile Include="SystemInteraction\mes2\dto\ApiResponse.cs" />
<Compile Include="SystemInteraction\mes2\dto\MesRequest.cs" />
<Compile Include="SystemInteraction\mes2\dto\InboundStockInfoToMes.cs" />
+ <Compile Include="SystemInteraction\mes2\PushMesHandler - 澶嶅埗.cs" />
<Compile Include="SystemInteraction\mes2\PushMesHandler.cs" />
<Compile Include="SystemInteraction\tianyong\TianYongSystem.cs" />
<Compile Include="TestForm.cs">
--
Gitblit v1.9.3