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 |   81 +++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/wcs/yunneiWCS/yunneiWCS/Form1.cs b/wcs/yunneiWCS/yunneiWCS/Form1.cs
index a77219f..55529f2 100644
--- a/wcs/yunneiWCS/yunneiWCS/Form1.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Form1.cs
@@ -139,6 +139,8 @@
             Thread mesSendData = new Thread(mesDataTranffic);
             StartThread(mesSendData);
 
+            new Thread(mesDataTranfficForRealMes).Start();
+
             new Thread(RefershData).Start();
 
 
@@ -2240,7 +2242,7 @@
         {
             while (true)
             {
-                SystemWarningMsg.msg_mesDataTranffic = "";
+                //SystemWarningMsg.msg_mesDataTranffic = "";
                 try
                 {
                     Thread.Sleep(3000);
@@ -2342,7 +2344,6 @@
         {
             while (true)
             {
-                SystemWarningMsg.msg_mesDataTranfficForRealMes = "";
                 try
                 {
                     Thread.Sleep(5000);
@@ -2356,34 +2357,35 @@
                             {
                                 try
                                 {
-                                    mesMsg res = null;
+                                    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)
                                     {//妯℃嫙鐜
-                                        res = new mesMsg();
-                                        res.ErrorCode = 0;
-                                        res.ErrorMsg = "妯℃嫙鐜涓嬶紝妯℃嫙鍙戦��";
+                                        ret = new ApiResponse<object>();
+                                        ret.Success = true;
+                                        ret.Message = "绯荤粺妯℃嫙瀹屾垚";
                                     }
                                     else
-                                    {//姝e紡鐜
-                                        //鑾峰彇淇℃伅鏄庣粏
-                                        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.鍏ュ簱:
@@ -2395,20 +2397,21 @@
                                             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();
                                     }
+
+                                    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)
                                 {

--
Gitblit v1.9.3