From 029f23966a8d98b731f9bfad89fe607ae306a702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= Date: Tue, 9 Jan 2024 14:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControl/MainDetailControlAction.cs | 7 ++++--- .../Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 09ba8ce..524444d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -285,11 +285,12 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl Timer1_Tick(); try { - + ReportReadDb.ReadFeededDry(); + ReportReadDb.ReadReport(); + if (UserJudge.IsNormalUser()) { - ReportReadDb.ReadFeededDry(); - ReportReadDb.ReadReport(); + } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs index 79cb3d2..2084e3b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs @@ -43,25 +43,25 @@ namespace Mesnac.Action.ChemicalWeighing.Report if (nornalStatus.spare1) { FeededDry(1, dB2111Helper.DryDosing_A); - DB2107WriteHelper.CleanSpare(2); + DB2107WriteHelper.CleanSpare(1); } if (nornalStatus.spare2) { FeededDry(2, dB2111Helper.DryDosing_B); - DB2107WriteHelper.CleanSpare(3); + DB2107WriteHelper.CleanSpare(2); } if (nornalStatus.spare3) { FeededDry(3, dB2111Helper.DryDosing_C); - DB2107WriteHelper.CleanSpare(4); + DB2107WriteHelper.CleanSpare(3); } if (nornalStatus.spare4) { FeededDry(4, dB2111Helper.DryDosing_D); - DB2107WriteHelper.CleanSpare(5); + DB2107WriteHelper.CleanSpare(4); }