From 77893a9594023e0c007b73d128fe94d1b56ff547 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 02 9月 2025 14:27:16 +0800
Subject: [PATCH] 县城推送
---
wcs/yunneiWCS/yunneiWCS/Form1.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/Form1.cs b/wcs/yunneiWCS/yunneiWCS/Form1.cs
index 73765eb..55529f2 100644
--- a/wcs/yunneiWCS/yunneiWCS/Form1.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Form1.cs
@@ -27,6 +27,7 @@
using yunneiWCS.Common;
using yunneiWCS.SystemInteraction.tianyong;
using yunneiWCS.PLC.Srm;
+using yunneiWCS.SystemInteraction.mes2.dto;
namespace yunneiWCS
{
@@ -137,6 +138,8 @@
StartThread(inStockTask);
Thread mesSendData = new Thread(mesDataTranffic);
StartThread(mesSendData);
+
+ new Thread(mesDataTranfficForRealMes).Start();
new Thread(RefershData).Start();
@@ -2239,7 +2242,7 @@
{
while (true)
{
- SystemWarningMsg.msg_mesDataTranffic = "";
+ //SystemWarningMsg.msg_mesDataTranffic = "";
try
{
Thread.Sleep(3000);
@@ -2329,6 +2332,104 @@
{
SystemWarningMsg.msg_mesDataTranffic = "鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
WZ.Useful.Commons.LogTextHelper.WriteLine("Form1", "mesDataTranffic鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:", SystemWarningMsg.msg_mesDataTranffic + "," + JsonConvert.SerializeObject(ex));
+ }
+ }
+
+ }
+
+ /// <summary>
+ /// MES鏁版嵁鎺ㄩ�� [Editby shaocx,2025-09-02]
+ /// </summary>
+ public void mesDataTranfficForRealMes()
+ {
+ while (true)
+ {
+ try
+ {
+ Thread.Sleep(5000);
+ using (dbmodel mod = new dbmodel())
+ {
+ List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).ToList();
+
+ if (sendMesData.Count > 0)
+ {
+ foreach (var itemTask in sendMesData)
+ {
+ try
+ {
+ ApiResponse<object> ret = null;
+
+ //鑾峰彇淇℃伅鏄庣粏
+ var details = mod.Wms_outInStockRecord_Details_V2_Mes.Where(x => x.mainId == itemTask.ID).ToList();
+ List<InboundStockInfoToMes> pushData = new List<InboundStockInfoToMes>();
+ foreach (var de in details)
+ {
+ pushData.Add(new InboundStockInfoToMes()
+ {
+ containerCode = itemTask.containerCode,
+ createTime = itemTask.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss"),
+ materialCode = de.productCode,
+ materialName = de.productName,
+ positionName = itemTask.sourcePlace,
+ productName = itemTask.materialName,
+ serialNumber = de.serialNumber,
+ supplier = itemTask.supplier,
+ version = itemTask.version,
+ });
+ }
+
+ if (isvirtual)
+ {//妯℃嫙鐜
+ ret = new ApiResponse<object>();
+ ret.Success = true;
+ ret.Message = "绯荤粺妯℃嫙瀹屾垚";
+ }
+ else
+ {
+ switch (itemTask.outInFlag)
+ {
+ case (int)OutInFlag.鍏ュ簱:
+ ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString());
+ break;
+ case (int)OutInFlag.鍑哄簱:
+ ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString());
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (ret.Success)
+ {
+ itemTask.isSendToMes = 1;
+ }
+ else
+ {
+ itemTask.isSendToMes = 0;
+ }
+ itemTask.SendToMesTime = DateTime.Now;
+ itemTask.MesRet = ret.Message;
+ itemTask.SendToMesCount = (itemTask.SendToMesCount ?? 0) + 1;
+ mod.SaveChanges();
+
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "鎺ㄩ�佺粰MES鏁版嵁寮傚父:" + JsonConvert.SerializeObject(ex);
+ WZ.Useful.Commons.LogTextHelper.WriteLine("Form1", "mesDataTranffic", SystemWarningMsg.msg_mesDataTranffic);
+ }
+ }
+ }
+ else
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
+ WZ.Useful.Commons.LogTextHelper.WriteLine("Form1", "mesDataTranffic鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:", SystemWarningMsg.msg_mesDataTranfficForRealMes + "," + JsonConvert.SerializeObject(ex));
}
}
@@ -2824,6 +2925,7 @@
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Text = showNowTime + SystemWarningMsg.Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg;
this.lbl_msg_mesDataTranffic.Text = showNowTime + SystemWarningMsg.msg_mesDataTranffic;
+ this.lbl_msg_mesDataTranffic_V2.Text = showNowTime + SystemWarningMsg.msg_mesDataTranfficForRealMes;
this.lbl_sendTaskForPick_ErrMsg.Text = showNowTime + SystemWarningMsg.Thread_sendTaskForPick_ErrMsg;
this.lbl_ClearDataMsg.Text = showNowTime + SystemWarningMsg.Thread_lbl_ClearDataMsg;
--
Gitblit v1.9.3