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/Form1.cs | 104 ++++------------------------------------------------
1 files changed, 8 insertions(+), 96 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/Form1.cs b/wcs/yunneiWCS/yunneiWCS/Form1.cs
index a77219f..ae6593d 100644
--- a/wcs/yunneiWCS/yunneiWCS/Form1.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Form1.cs
@@ -28,6 +28,7 @@
using yunneiWCS.SystemInteraction.tianyong;
using yunneiWCS.PLC.Srm;
using yunneiWCS.SystemInteraction.mes2.dto;
+using yunneiWCS.ThreadTask;
namespace yunneiWCS
{
@@ -138,6 +139,10 @@
StartThread(inStockTask);
Thread mesSendData = new Thread(mesDataTranffic);
StartThread(mesSendData);
+
+ new Thread(mesDataTranfficForRealMes.Handler).Start();
+
+ new Thread(mesStockDataForRealMes.Handler).Start();
new Thread(RefershData).Start();
@@ -2240,7 +2245,7 @@
{
while (true)
{
- SystemWarningMsg.msg_mesDataTranffic = "";
+ //SystemWarningMsg.msg_mesDataTranffic = "";
try
{
Thread.Sleep(3000);
@@ -2335,102 +2340,7 @@
}
- /// <summary>
- /// MES鏁版嵁鎺ㄩ�� [Editby shaocx,2025-09-02]
- /// </summary>
- public void mesDataTranfficForRealMes()
- {
- while (true)
- {
- SystemWarningMsg.msg_mesDataTranfficForRealMes = "";
- 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
- {
- mesMsg res = null;
- if (isvirtual)
- {//妯℃嫙鐜
- res = new mesMsg();
- res.ErrorCode = 0;
- res.ErrorMsg = "妯℃嫙鐜涓嬶紝妯℃嫙鍙戦��";
- }
- else
- {//姝ｅ紡鐜
- //鑾峰彇淇℃伅鏄庣粏
- 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,
- });
- }
- ApiResponse<object> ret = null;
- 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));
- }
- }
-
- }
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{
Environment.Exit(0);//閫�鍑烘湰杩涚▼鎵�鏈夌嚎绋�
@@ -2877,6 +2787,7 @@
{
LogTextHelper.BatchDeleteLog();
LogTextHelper.BatchDeleteLog(@"H:\\api\\YUN\\Log");
+ LogTextHelper.BatchDeleteLog(@"d:\\Log\\YuNei\\WCS");//绉婚櫎log4鏃ュ織
ClearDataHandler.Delete_System_TianYongLog(7);
ClearDataHandler.Delete_StockClearLog(30);
ClearDataHandler.Delete_taskRecord(30);
@@ -2923,6 +2834,7 @@
this.lbl_msg_mesDataTranffic.Text = showNowTime + SystemWarningMsg.msg_mesDataTranffic;
this.lbl_msg_mesDataTranffic_V2.Text = showNowTime + SystemWarningMsg.msg_mesDataTranfficForRealMes;
+ this.lbl_msg_mesStockDataForRealMes.Text = showNowTime + SystemWarningMsg.mesStockDataForRealMes;
this.lbl_sendTaskForPick_ErrMsg.Text = showNowTime + SystemWarningMsg.Thread_sendTaskForPick_ErrMsg;
this.lbl_ClearDataMsg.Text = showNowTime + SystemWarningMsg.Thread_lbl_ClearDataMsg;
--
Gitblit v1.9.3