From b3638888ea5c170fae017f24cf0cad639c2fbb1e Mon Sep 17 00:00:00 2001 From: wangsr Date: Thu, 26 Oct 2023 17:14:37 +0800 Subject: [PATCH] =?UTF-8?q?finish=20-=20=E8=87=AA=E5=8A=A8=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E4=BB=A3=E7=A0=81=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/InitAction.cs | 10 ++++------ .../AutoControl/RefreshAction.cs | 16 +++++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) 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;