From e86f3bddecdc13210a546761ecf5e8550ea20799 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 11 9月 2025 14:51:32 +0800
Subject: [PATCH] 增加日志追踪

---
 wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs |   94 ++++++++++++++--------------------------------
 1 files changed, 29 insertions(+), 65 deletions(-)

diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
index 62de875..d57b3f6 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesStockDataForRealMes.cs
@@ -18,98 +18,62 @@
     public class mesStockDataForRealMes
     {
         public static LogType _logType = LogType.mesStockDataForRealMes;
+        public static LogType _logTypeForInfo = LogType.mesStockDetailsInfo;
         public static async void Handler()
         {
             while (true)
             {
                 try
                 {
-                    Thread.Sleep(5000);
+
                     //Log4NetHelper.WriteErrorLog(_logType, "娴嬭瘯鍟婂晩鍟婂晩 ");
                     //Log4NetHelper.WriteInfoLog(_logType, "娴嬭瘯鍟婂晩鍟婂晩 ");
                     using (dbmodel mod = new dbmodel())
                     {
-                        List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).ToList();
+                        List<v_srmStockdetails> sendMesData = mod.v_srmStockdetails.OrderBy(x => x.positionName).ToList();
 
                         if (sendMesData.Count > 0)
                         {
+                            SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},瑕佹帹閫亄sendMesData.Count()}鏉�!";
+                            mesMsg ret = null;
+                            List<InboundStockInfoToMes> pushData = new List<InboundStockInfoToMes>();
                             foreach (var itemTask in sendMesData)
                             {
-                                try
+                                pushData.Add(new InboundStockInfoToMes()
                                 {
-                                    ApiResponse<object> ret = null;
+                                    identifier = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
+                                    containerCode = itemTask.containerCode,
+                                    createTime = itemTask.createTime?.ToString("yyyy-MM-dd HH:mm:ss"),
+                                    materialCode = itemTask.materialCode,
+                                    materialName = itemTask.productName,
+                                    positionName = itemTask.positionName,
+                                    productName = itemTask.materialName,
+                                    serialNumber = itemTask.serialNumber,
+                                    supplier = itemTask.supplier,
+                                    version = itemTask.version,
+                                    Creator = "wms"
 
-                                    //鑾峰彇淇℃伅鏄庣粏
-                                    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 (Form1.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(), _logType);
-                                                break;
-                                            case (int)OutInFlag.鍑哄簱:
-                                                ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
-                                                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);
-                                    Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
-                                }
                             }
+                            ret = PushMesHandler.Mes_StockSend(_logType, pushData, _logTypeForInfo);
+                            SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},宸叉帹閫佺粨鏉燂紝{sendMesData.Count()}鏉�!杩斿洖:{JsonConvert.SerializeObject(ret)}";
                         }
                         else
                         {
-                            SystemWarningMsg.msg_mesDataTranfficForRealMes = "娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
+                            SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
                         }
                     }
                 }
                 catch (Exception ex)
                 {
-                    SystemWarningMsg.msg_mesDataTranfficForRealMes = "鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
-                    Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
+                    SystemWarningMsg.mesStockDataForRealMes = $"{MyExtend.MsgTimeStr()},鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
+                    Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.mesStockDataForRealMes, ex);
+                }
+                finally
+                {
+                    //Thread.Sleep(5000);//姝e紡闇�瑕�5鍒嗛挓鎺ㄩ�佷竴娆�
+                    Thread.Sleep(5 * 60 * 1000);//姝e紡闇�瑕�5鍒嗛挓鎺ㄩ�佷竴娆�
                 }
             }
         }

--
Gitblit v1.9.3