From 0371df185e759eaa38dcfa9b0920a1d2cab720f4 Mon Sep 17 00:00:00 2001 From: wangsr Date: Wed, 10 Jan 2024 10:13:58 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=98=E5=8C=96MCRun=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControlAction.cs | 22 +++++++++--------- Main/MCRun/Data/SysConfig/MenuConfig.dat | Bin 21651 -> 15962 bytes 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 5790bd0..d2281e7 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -55,7 +55,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl Dictionary WetStatus = new Dictionary(); - + //DataTable ParametersWithPCTable = new DataTable(); @@ -89,7 +89,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl //控件实体类 HslLanternAlarmEntity HslAlarmE = new HslLanternAlarmEntity(); - // HslAgvCarEntity hslAgvCarEntity = new HslAgvCarEntity(); + // HslAgvCarEntity hslAgvCarEntity = new HslAgvCarEntity(); HslLanternSimpleEntity HslLanternSimpleE = new HslLanternSimpleEntity(); MCLabelEntity LabelE = new MCLabelEntity(); @@ -180,8 +180,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl private void SetAllControls() { ControlsHelper.ControlImport(HslAlarmE, Controls); - // ControlsHelper.ControlImport(hslAgvCarEntity, Controls); - + // ControlsHelper.ControlImport(hslAgvCarEntity, Controls); + ControlsHelper.ControlImport(HslLanternSimpleE, Controls); ControlsHelper.ControlImport(LabelE, Controls); ControlsHelper.ControlImport(LightE, Controls); @@ -257,7 +257,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl conCurrentCache.Clear(); - + } } @@ -285,22 +285,22 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl Timer1_Tick(); try { - + if (UserJudge.IsNormalUser()) { ReportReadDb.ReadReport(); ReportReadDb.ReadFeededDry(); - + } - + } catch (Exception) { - + } } @@ -318,7 +318,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetMCLabel(LabelE.LineKind7, dict[7]); ControlsHelper.SetMCLabel(LabelE.LineKind8, dict[8]); } - + var reachSingle = RgvPlcUtil.GetRGVAllError(); var mixSingle = Db3000Helper.ReadDb(); @@ -411,7 +411,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG7, ch.G7); ControlsHelper.SetHsl(HslLanternSimpleE.FeededPDG8, ch.G8); - var db2105=new DB2105Helper(); + var db2105 = new DB2105Helper(); ControlsHelper.SetHslFeededCW1(HslLanternSimpleE.FeededCW1, db2105.FeededCW1); ControlsHelper.SetHslFeededCW1(HslLanternSimpleE.FeededCW2, db2105.FeededCW2); ControlsHelper.SetHslFeededCW1(HslLanternSimpleE.FeededCW3, db2105.FeededCW3); diff --git a/Main/MCRun/Data/SysConfig/MenuConfig.dat b/Main/MCRun/Data/SysConfig/MenuConfig.dat index a13921632ea2c14ad426861348a86b1d3204040b..6b2a1a3224cd84e505b01d1420e725bbf1f52ccc 100644 GIT binary patch literal 15962 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 literal 21651 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