yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
wangsr
wangsr 1 year ago
parent f48552a8da
commit c42f69ba1f
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File

5
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
Unescape Escape View File

@ -33,7 +33,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
ControlImport(); ControlImport();
ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
BottomSelect(runtime); BottomSelect(runtime);
} }
@ -156,7 +157,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
Step step1 = new Step() Step step1 = new Step()
{ {
MixSpeed =
}; };
Step step2 = new Step() Step step2 = new Step()
{ {

3
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
Unescape Escape View File

@ -176,9 +176,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath> <HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Office.Interop.Excel">
<HintPath>..\..\Microsoft.Office.Interop.Excel.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

28
Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
Unescape Escape View File

@ -476,9 +476,9 @@
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="TextName" /> <Property name="TextName" />
<Property name="Location">387, 53</Property> <Property name="Location">407, 54</Property>
<Property name="Name">MaterialTolerance2</Property> <Property name="Name">MaterialTolerance2</Property>
<Property name="Size">100, 26</Property> <Property name="Size">80, 26</Property>
<Property name="TabIndex">35</Property> <Property name="TabIndex">35</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel57" children="Controls"> <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel57" children="Controls">
@ -497,7 +497,7 @@
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="Text">公差：</Property> <Property name="Text">公差：</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="Location">340, 59</Property> <Property name="Location">360, 60</Property>
<Property name="Name">MCLabel57</Property> <Property name="Name">MCLabel57</Property>
<Property name="Size">41, 12</Property> <Property name="Size">41, 12</Property>
</Object> </Object>
@ -517,7 +517,7 @@
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="Text">重量：</Property> <Property name="Text">重量：</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="Location">179, 60</Property> <Property name="Location">224, 60</Property>
<Property name="Name">MCLabel56</Property> <Property name="Name">MCLabel56</Property>
<Property name="Size">41, 12</Property> <Property name="Size">41, 12</Property>
</Object> </Object>
@ -539,9 +539,9 @@
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="TextName" /> <Property name="TextName" />
<Property name="Location">226, 53</Property> <Property name="Location">271, 53</Property>
<Property name="Name">MaterialWeight2</Property> <Property name="Name">MaterialWeight2</Property>
<Property name="Size">100, 26</Property> <Property name="Size">80, 26</Property>
<Property name="TabIndex">34</Property> <Property name="TabIndex">34</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel55" children="Controls"> <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel55" children="Controls">
@ -588,7 +588,7 @@
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="Location">77, 55</Property> <Property name="Location">77, 55</Property>
<Property name="Name">ChooseMaterial2</Property> <Property name="Name">ChooseMaterial2</Property>
<Property name="Size">87, 24</Property> <Property name="Size">137, 24</Property>
<Property name="TabIndex">33</Property> <Property name="TabIndex">33</Property>
</Object> </Object>
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox41" children="Controls"> <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox41" children="Controls">
@ -964,9 +964,9 @@
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="TextName" /> <Property name="TextName" />
<Property name="Location">387, 23</Property> <Property name="Location">407, 24</Property>
<Property name="Name">MaterialTolerance1</Property> <Property name="Name">MaterialTolerance1</Property>
<Property name="Size">100, 26</Property> <Property name="Size">80, 26</Property>
<Property name="TabIndex">28</Property> <Property name="TabIndex">28</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel59" children="Controls"> <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel59" children="Controls">
@ -985,7 +985,7 @@
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="Text">公差：</Property> <Property name="Text">公差：</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="Location">340, 29</Property> <Property name="Location">360, 30</Property>
<Property name="Name">MCLabel59</Property> <Property name="Name">MCLabel59</Property>
<Property name="Size">41, 12</Property> <Property name="Size">41, 12</Property>
</Object> </Object>
@ -1005,7 +1005,7 @@
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="Text">重量：</Property> <Property name="Text">重量：</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="Location">179, 30</Property> <Property name="Location">224, 30</Property>
<Property name="Name">MCLabel60</Property> <Property name="Name">MCLabel60</Property>
<Property name="Size">41, 12</Property> <Property name="Size">41, 12</Property>
</Object> </Object>
@ -1027,9 +1027,9 @@
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="TextName" /> <Property name="TextName" />
<Property name="Location">226, 23</Property> <Property name="Location">271, 23</Property>
<Property name="Name">MaterialWeight1</Property> <Property name="Name">MaterialWeight1</Property>
<Property name="Size">100, 26</Property> <Property name="Size">80, 26</Property>
<Property name="TabIndex">25</Property> <Property name="TabIndex">25</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel61" children="Controls"> <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel61" children="Controls">
@ -1076,7 +1076,7 @@
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="Location">77, 25</Property> <Property name="Location">77, 25</Property>
<Property name="Name">ChooseMaterial1</Property> <Property name="Name">ChooseMaterial1</Property>
<Property name="Size">87, 24</Property> <Property name="Size">137, 24</Property>
<Property name="TabIndex">23</Property> <Property name="TabIndex">23</Property>
</Object> </Object>
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox36" children="Controls"> <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox36" children="Controls">

Write Preview
Loading…
Cancel
Save