From 2372d5ecc00c34a3632dd9b7f7be345ac0e8cfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= <nodyang@qq.com>
Date: Mon, 25 Dec 2023 14:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainDetailControl/MainDetailControlAction.cs    | 13 +++++++++++++
 .../Report/DryMixer/SelectRowAction.cs              |  3 ---
 .../Test/TestAction.cs                              |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index cf1db80..184c9a5 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -281,6 +281,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             {
                 no = 0;
                 Timer1_Tick();
+                try
+                {
+                    if (UserJudge.IsNormalUser())
+                    {
+                        ReportReadDb.ReadReport();
+                    }
+                  
+                }
+                catch (Exception)
+                {
+
+                   
+                }
             }
 
             LineKindFlag += 1;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs
index 8a40c3e..7922c62 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs
@@ -104,9 +104,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer
 
                 clientGrid.DataSource = table;
 
-
-
-
                 dbHelper.ClearParameter();
 
                 string sql = $"select t1.mixBatch as 批次,t1.mixStep  as 步号,t2.ActionName as 动作,t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度  from Report_DryMixer_Detail t1\r\nleft join ActionCode t2 on t2.Code=t1.actCode\r\nwhere t2.DeviceUnitId=1 and t1.reportId='{lR_planID}'   order by  actCode";
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
index cfffbe3..1d2e5ec 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
@@ -34,7 +34,7 @@ namespace Mesnac.Action.ChemicalWeighing.Test
         public void theout(object source, EventArgs e)
         {
             LoggingService<TestAction>.InfoFormatted("定时器运行");
-            ReportReadDb.ReadReport();
+           
         }
 
         public void Run(RuntimeParameter runtime)