From 8b3046790fd09138da072edd4ef48fdeb16e1879 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 02 9月 2025 16:09:13 +0800
Subject: [PATCH] 2222
---
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs | 17 ++------
wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs | 6 +-
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs | 49 +++++++++++++++++++++---
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs | 36 +++++++----------
wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs | 10 +++++
5 files changed, 76 insertions(+), 42 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
index 3c25fe8..ba65b8a 100644
--- a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
@@ -19,6 +19,16 @@
/// </summary>
public class MyExtend
{
+
+ /// <summary>
+ /// 娑堟伅鏃堕棿瀛楃涓�
+ /// </summary>
+ /// <returns></returns>
+ public static string MsgTimeStr()
+ {
+ return "[娑堟伅鏃堕棿:" + DateTimeHelper.ConvertToStringForOnlyShowTime(DateTime.Now) + "]";
+ }
+
/// <summary>
/// 鏄惁鏄� 鐗╂枡搴撳瓨鐨勮浆绉�
/// </summary>
diff --git a/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs b/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs
index c49a926..1e210fe 100644
--- a/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs
@@ -95,7 +95,7 @@
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(782, 149);
+ this.pictureBox1.Size = new System.Drawing.Size(1234, 149);
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
//
@@ -135,7 +135,7 @@
this.panel1.Location = new System.Drawing.Point(0, 222);
this.panel1.Margin = new System.Windows.Forms.Padding(2);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(782, 425);
+ this.panel1.Size = new System.Drawing.Size(1234, 425);
this.panel1.TabIndex = 3;
//
// lbl_msg_mesDataTranffic_V2
@@ -458,7 +458,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(782, 647);
+ this.ClientSize = new System.Drawing.Size(1234, 647);
this.Controls.Add(this.panel1);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label_PLC);
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
index 81d256e..6405f06 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
{
@@ -38,8 +39,20 @@
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 ApiResponse<object>();
+ res.Success = true;
+ res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Inbound_Record", paprm, guid));
+ }
+
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
}
catch (Exception ex)
{
@@ -69,8 +82,19 @@
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 ApiResponse<object>();
+ res.Success = true;
+ res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid));
+ }
+
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
}
catch (Exception ex)
{
@@ -98,8 +122,21 @@
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}");
+
+ //妯℃嫙
+ if (Form1.isvirtual)
+ {//妯℃嫙鐜
+ res = new ApiResponse<object>();
+ res.Success = true;
+ res.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid));
+ }
+
+
+ Log4NetHelper.WriteInfoLog(_logType, $"{funName},鍙傛暟:{paprm},杩斿洖:{JsonConvert.SerializeObject(res)}");
}
catch (Exception ex)
{
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
index 00b7382..92f0d68 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
@@ -33,6 +33,7 @@
if (sendMesData.Count > 0)
{
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},瑕佹帹閫亄sendMesData.Count()}鏉�!";
foreach (var itemTask in sendMesData)
{
try
@@ -58,27 +59,20 @@
});
}
- if (Form1.isvirtual)
- {//妯℃嫙鐜
- ret = new ApiResponse<object>();
- ret.Success = true;
- ret.Message = "绯荤粺妯℃嫙瀹屾垚";
- }
- else
+
+ switch (itemTask.outInFlag)
{
- switch (itemTask.outInFlag)
- {
- case (int)OutInFlag.鍏ュ簱:
- ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString(), _logType);
- break;
- case (int)OutInFlag.鍑哄簱:
- ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
- break;
- default:
- break;
- }
+ case (int)OutInFlag.鍏ュ簱:
+ ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString(), _logType);
+ break;
+ case (int)OutInFlag.鍑哄簱:
+ ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
+ break;
+ default:
+ break;
}
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},宸叉帹閫佺粨鏉燂紝杩斿洖:{JsonConvert.SerializeObject(ret)}";
if (ret.Success)
{
itemTask.isSendToMes = 1;
@@ -95,20 +89,20 @@
}
catch (Exception ex)
{
- SystemWarningMsg.msg_mesDataTranfficForRealMes = "鎺ㄩ�佺粰MES鏁版嵁寮傚父:" + JsonConvert.SerializeObject(ex);
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},鎺ㄩ�佺粰MES鏁版嵁寮傚父:" + JsonConvert.SerializeObject(ex);
Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
}
}
}
else
{
- SystemWarningMsg.msg_mesDataTranfficForRealMes = "娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
}
}
}
catch (Exception ex)
{
- SystemWarningMsg.msg_mesDataTranfficForRealMes = "鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
index 80cee00..98624c3 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
@@ -33,6 +33,7 @@
if (sendMesData.Count > 0)
{
+ SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},瑕佹帹閫亄sendMesData.Count()}鏉�!";
ApiResponse<object> ret = null;
List<InboundStockInfoToMes> pushData = new List<InboundStockInfoToMes>();
foreach (var itemTask in sendMesData)
@@ -52,26 +53,18 @@
});
}
- if (Form1.isvirtual)
- {//妯℃嫙鐜
- ret = new ApiResponse<object>();
- ret.Success = true;
- ret.Message = "绯荤粺妯℃嫙瀹屾垚";
- }
- else
- {
- ret = PushMesHandler.Mes_StockSend(pushData, _logType);
- }
+ ret = PushMesHandler.Mes_StockSend(pushData, _logType);
+ SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},宸叉帹閫佺粨鏉燂紝{sendMesData.Count()}鏉�!杩斿洖:{JsonConvert.SerializeObject(ret)}";
}
else
{
- SystemWarningMsg.mesStockDataForRealMes = "娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
+ SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
}
}
}
catch (Exception ex)
{
- SystemWarningMsg.mesStockDataForRealMes = "鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
+ SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.mesStockDataForRealMes, ex);
}
finally
--
Gitblit v1.9.3