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 a139216..6b2a1a3 100644 Binary files a/Main/MCRun/Data/SysConfig/MenuConfig.dat and b/Main/MCRun/Data/SysConfig/MenuConfig.dat differ