diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs index 11d222b..5c49fa0 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs @@ -43,10 +43,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl private void ControlInitFromPLC() { - var dbt = StockMaterrialDbHelp.GetSiloMaterrial(); - - ControlsEntity.ChooseMaterial1.DataSource = dbt; - ControlsEntity.ChooseMaterial2.DataSource = dbt; + ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial(); + ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial(); var selected = FreeSqlUnit.Instance.Select().Where(x => x.DeviceId == SingleSelect()).ToList(); @@ -57,8 +55,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - ControlsEntity.ChooseMaterial1.SelectedIndex = -1; - ControlsEntity.ChooseMaterial2.SelectedIndex = -1; + ControlsEntity.ChooseMaterial1.SelectedIndex = 0; + ControlsEntity.ChooseMaterial2.SelectedIndex = 0; } var getGelatG1 = LjPlanningPlcHelp.GetGelatG1; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs index 43fe650..9541eea 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs @@ -37,11 +37,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl /// private void ControlInitFromPLC() { - - var dbt = StockMaterrialDbHelp.GetSiloMaterrial(); - - ControlsEntity.ChooseMaterial1.DataSource = dbt; - ControlsEntity.ChooseMaterial2.DataSource = dbt; + //switch (SingleSelect()) + //{ + // case 1: + // LjPlanningPlcHelp.GetGelatG1. + //} + ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial(); + ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial(); var selected = FreeSqlUnit.Instance.Select().Where(x => x.DeviceId == SingleSelect()).ToList(); @@ -52,8 +54,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - ControlsEntity.ChooseMaterial1.SelectedIndex = -1; - ControlsEntity.ChooseMaterial2.SelectedIndex = -1; + ControlsEntity.ChooseMaterial1.SelectedIndex = 0; + ControlsEntity.ChooseMaterial2.SelectedIndex = 0; } var getGelatG1 = LjPlanningPlcHelp.GetGelatG1;