diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs index f390b25..0634150 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs @@ -33,7 +33,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl ControlImport(); - + ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial(); + ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial(); BottomSelect(runtime); } @@ -156,7 +157,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl Step step1 = new Step() { - MixSpeed = + }; Step step2 = new Step() { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index a3c3fa4..cf45874 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -176,9 +176,6 @@ False ..\..\..\PlugInPlatform\Mesnac.PlugIn.dll - - ..\..\Microsoft.Office.Interop.Excel.dll - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml index 43eaecd..de43051 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml @@ -476,9 +476,9 @@ True True - 387, 53 + 407, 54 MaterialTolerance2 - 100, 26 + 80, 26 35 @@ -497,7 +497,7 @@ True 公差: 宋体, 9pt - 340, 59 + 360, 60 MCLabel57 41, 12 @@ -517,7 +517,7 @@ True 重量: 宋体, 9pt - 179, 60 + 224, 60 MCLabel56 41, 12 @@ -539,9 +539,9 @@ True True - 226, 53 + 271, 53 MaterialWeight2 - 100, 26 + 80, 26 34 @@ -588,7 +588,7 @@ True 77, 55 ChooseMaterial2 - 87, 24 + 137, 24 33 @@ -964,9 +964,9 @@ True True - 387, 23 + 407, 24 MaterialTolerance1 - 100, 26 + 80, 26 28 @@ -985,7 +985,7 @@ True 公差: 宋体, 9pt - 340, 29 + 360, 30 MCLabel59 41, 12 @@ -1005,7 +1005,7 @@ True 重量: 宋体, 9pt - 179, 30 + 224, 30 MCLabel60 41, 12 @@ -1027,9 +1027,9 @@ True True - 226, 23 + 271, 23 MaterialWeight1 - 100, 26 + 80, 26 25 @@ -1076,7 +1076,7 @@ True 77, 25 ChooseMaterial1 - 87, 24 + 137, 24 23