From 957b51cfdeb4374d817086a2ca761c75545e206d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 28 十一月 2024 16:59:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 LMES/DingDing_autoGetData.cs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/LMES/DingDing_autoGetData.cs b/LMES/DingDing_autoGetData.cs
index 1c1c941..c965687 100644
--- a/LMES/DingDing_autoGetData.cs
+++ b/LMES/DingDing_autoGetData.cs
@@ -58,11 +58,6 @@
                     return false;
                 }
 
-                if (obj.getData_HuaMingCe(ref msg) == false)
-                {
-                    return false;
-                }
-
                 //璁惧缁翠慨璁板綍鍗�
                 if (obj.getData_EquipRepairWeiXiu(ref msg) == false)
                 {
@@ -70,6 +65,11 @@
                 }
                 //妯″叿缁翠慨璁板綍鍗� 淇濆吇璁板綍鍗�
                 if (obj.getData_MouldFileWeiXiuBaoYang(ref msg) == false)
+                {
+                    return false;
+                }
+
+                if (obj.getData_HuaMingCe(ref msg) == false)
                 {
                     return false;
                 }
@@ -101,6 +101,7 @@
         #region 瀹氭椂鍣ㄤ簩锛氬悓姝ラ拤閽夋暟鎹�
         private void timer2_Tick(object sender, EventArgs e)
         {
+            //this.timer2.Enabled = false;
             int connectTimes = 0;
             int maxConnectTimes = 10;
 

--
Gitblit v1.9.1