From b4add98f10dc26f24c6fd0765ebf4806bb6d3dda Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 04 9月 2025 14:36:14 +0800
Subject: [PATCH] 有啊
---
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
index 80cee00..541c4f1 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
@@ -33,45 +33,40 @@
if (sendMesData.Count > 0)
{
- ApiResponse<object> ret = null;
+ SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},瑕佹帹閫亄sendMesData.Count()}鏉�!";
+ 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,
+ materialCode = itemTask.materialCode,
materialName = itemTask.productName,
positionName = itemTask.positionName,
productName = itemTask.materialName,
serialNumber = itemTask.serialNumber,
supplier = itemTask.supplier,
version = itemTask.version,
+ Creator = "wms"
});
}
- 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