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/ThreadTask/mesDataTranfficForRealMes.cs | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
index 7bd60ac..5e68e73 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
@@ -13,7 +13,7 @@
namespace yunneiWCS.ThreadTask
{
/// <summary>
- /// MES鏁版嵁浼犺緭(鐪熸鐨凪ES)
+ /// MES鍑哄叆搴撴暟鎹紶杈�(鐪熸鐨凪ES)
/// </summary>
public class mesDataTranfficForRealMes
{
@@ -33,11 +33,12 @@
if (sendMesData.Count > 0)
{
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},瑕佹帹閫亄sendMesData.Count()}鏉�!";
foreach (var itemTask in sendMesData)
{
try
{
- ApiResponse<object> ret = null;
+ mesMsg ret = null;
//鑾峰彇淇℃伅鏄庣粏
var details = mod.Wms_outInStockRecord_Details_V2_Mes.Where(x => x.mainId == itemTask.ID).ToList();
@@ -46,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,
@@ -58,28 +60,21 @@
});
}
- 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, _logType);
+ break;
+ case (int)OutInFlag.鍑哄簱:
+ ret = PushMesHandler.Mes_OutStockSend(pushData, _logType);
+ break;
+ default:
+ break;
}
- if (ret.Success)
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},宸叉帹閫佺粨鏉燂紝杩斿洖:{JsonConvert.SerializeObject(ret)}";
+ if (ret.ErrorCode == 0)
{
itemTask.isSendToMes = 1;
}
@@ -88,27 +83,27 @@
itemTask.isSendToMes = 0;
}
itemTask.SendToMesTime = DateTime.Now;
- itemTask.MesRet = ret.Message;
+ itemTask.MesRet = ret.ErrorMsg;
itemTask.SendToMesCount = (itemTask.SendToMesCount ?? 0) + 1;
mod.SaveChanges();
}
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);
}
}
--
Gitblit v1.9.3