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

测试提交

Browse Source
dep_nodyang
wangsr 1 year ago
parent c5c60daf59
commit 4bfc54b494
9 changed files with 27 additions and 56 deletions
Show Stats Download Patch File Download Diff File

42
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs generated
Unescape Escape View File

@ -156,7 +156,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// txtCpVersion
//
this.txtCpVersion.Location = new System.Drawing.Point(488, 15);
this.txtCpVersion.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txtCpVersion.Margin = new System.Windows.Forms.Padding(5);
this.txtCpVersion.MaxLength = 100;
this.txtCpVersion.Name = "txtCpVersion";
this.txtCpVersion.Size = new System.Drawing.Size(129, 21);
@ -193,7 +193,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// txtName
//
this.txtName.Location = new System.Drawing.Point(76, 15);
this.txtName.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txtName.Margin = new System.Windows.Forms.Padding(5);
this.txtName.MaxLength = 100;
this.txtName.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(129, 21);
@ -215,7 +215,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox2.Controls.Add(this.groupBox3);
this.groupBox2.Location = new System.Drawing.Point(12, 76);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(445, 637);
this.groupBox2.Size = new System.Drawing.Size(445, 638);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "称量配方";
@ -237,7 +237,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage3.Controls.Add(this.dataGridSilo1);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(425, 393);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "糊化机(#A)";
@ -246,7 +246,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox6
//
this.groupBox6.Controls.Add(this.dataGridWater1);
this.groupBox6.Location = new System.Drawing.Point(6, 225);
this.groupBox6.Location = new System.Drawing.Point(6, 190);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(413, 161);
this.groupBox6.TabIndex = 71;
@ -264,7 +264,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridWater1.Name = "dataGridWater1";
this.dataGridWater1.RowHeadersWidth = 62;
this.dataGridWater1.RowTemplate.Height = 23;
this.dataGridWater1.Size = new System.Drawing.Size(401, 136);
this.dataGridWater1.Size = new System.Drawing.Size(401, 135);
this.dataGridWater1.TabIndex = 69;
this.dataGridWater1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater1_DefaultValuesNeeded);
//
@ -314,7 +314,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridSilo1.Name = "dataGridSilo1";
this.dataGridSilo1.RowHeadersWidth = 62;
this.dataGridSilo1.RowTemplate.Height = 23;
this.dataGridSilo1.Size = new System.Drawing.Size(414, 191);
this.dataGridSilo1.Size = new System.Drawing.Size(414, 156);
this.dataGridSilo1.TabIndex = 63;
this.dataGridSilo1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo_DefaultValuesNeeded);
//
@ -348,7 +348,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage4.Controls.Add(this.dataGridSilo2);
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(425, 393);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "糊化机(#B)";
@ -506,7 +506,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// BtnSave
//
this.BtnSave.Location = new System.Drawing.Point(88, 719);
this.BtnSave.Location = new System.Drawing.Point(76, 970);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(119, 47);
this.BtnSave.TabIndex = 2;
@ -521,7 +521,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox5.Controls.Add(this.groupBox7);
this.groupBox5.Location = new System.Drawing.Point(463, 76);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(721, 692);
this.groupBox5.Size = new System.Drawing.Size(947, 692);
this.groupBox5.TabIndex = 3;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "混合配方";
@ -533,7 +533,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabControl3.Location = new System.Drawing.Point(6, 431);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
this.tabControl3.Size = new System.Drawing.Size(709, 256);
this.tabControl3.Size = new System.Drawing.Size(905, 256);
this.tabControl3.TabIndex = 5;
//
// tabPage5
@ -543,8 +543,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage5.Controls.Add(this.dataGridWeter1);
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage5.Size = new System.Drawing.Size(701, 230);
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(897, 230);
this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "湿混机(#A)";
this.tabPage5.UseVisualStyleBackColor = true;
@ -583,7 +583,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridWeter1.Name = "dataGridWeter1";
this.dataGridWeter1.RowHeadersWidth = 62;
this.dataGridWeter1.RowTemplate.Height = 23;
this.dataGridWeter1.Size = new System.Drawing.Size(689, 196);
this.dataGridWeter1.Size = new System.Drawing.Size(862, 196);
this.dataGridWeter1.TabIndex = 64;
this.dataGridWeter1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter1_DefaultValuesNeeded_1);
//
@ -640,8 +640,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage6.Controls.Add(this.dataGridWeter2);
this.tabPage6.Location = new System.Drawing.Point(4, 22);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage6.Size = new System.Drawing.Size(701, 230);
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(897, 230);
this.tabPage6.TabIndex = 1;
this.tabPage6.Text = "湿混机(#B)";
this.tabPage6.UseVisualStyleBackColor = true;
@ -661,7 +661,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridWeter2.Name = "dataGridWeter2";
this.dataGridWeter2.RowHeadersWidth = 62;
this.dataGridWeter2.RowTemplate.Height = 23;
this.dataGridWeter2.Size = new System.Drawing.Size(695, 224);
this.dataGridWeter2.Size = new System.Drawing.Size(891, 224);
this.dataGridWeter2.TabIndex = 65;
this.dataGridWeter2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter2_DefaultValuesNeeded);
//
@ -728,7 +728,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage1.Controls.Add(this.dataGridSiloH1);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(701, 171);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "糊化机(#A)";
@ -787,7 +787,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage2.Controls.Add(this.dataGridSiloH2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(701, 171);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "糊化机(#B)";
@ -904,7 +904,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// BtnCanel
//
this.BtnCanel.Location = new System.Drawing.Point(258, 719);
this.BtnCanel.Location = new System.Drawing.Point(264, 970);
this.BtnCanel.Name = "BtnCanel";
this.BtnCanel.Size = new System.Drawing.Size(119, 47);
this.BtnCanel.TabIndex = 2;
@ -916,7 +916,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1199, 707);
this.ClientSize = new System.Drawing.Size(1463, 1029);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.BtnCanel);
this.Controls.Add(this.BtnSave);

10
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
Unescape Escape View File

@ -473,15 +473,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//干混机
List<ClEntity> clDry = GetClEnity(dataGridDryer);
if (clDry.Count == 0)
{
MessageBox.Show("");
return;
}
else
{
//
}
//湿混机1
List<ClEntity> clSoil1 = GetClEnity(dataGridSilo1);

18
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
Unescape Escape View File

@ -126,24 +126,6 @@
<metadata name="TxtSilo1ToleranceWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1BinWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1WeightWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1ToleranceWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Bin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1Tolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Bin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

4
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs
Unescape Escape View File

@ -36,13 +36,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this._materialGridControl = materialGridControl;
List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
PlanStatus = mcControllist.FirstOrDefault(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == "PlanStatus").BaseControl as MCCombobox;
// PlanStatus = mcControllist.FirstOrDefault(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == "PlanStatus").BaseControl as MCCombobox;
String sql = @"select statusid as CmbValue ,statusname as CmbDisplay from lj_planning_status";
DataTable dataTable = DBHelp.GetTable(sql);
PlanStatus.DataSource = dataTable;
// PlanStatus.DataSource = dataTable;
FileControl();
}

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

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

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/Class1.cs
Unescape Escape View File

@ -28,7 +28,7 @@ namespace Mesnac.Action.ChemicalWeighing.Pl
{
SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
s7.IpAddress ="192.168.1.50";
s7.IpAddress ="172.18.4.100";
s7.Port =102;
s7.ConnectServer();
return s7;

2
DataBlockHelper/PlcConnect.cs
Unescape Escape View File

@ -31,7 +31,7 @@ namespace DataBlockHelper
{
SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
s7.IpAddress = "192.168.1.50";
s7.IpAddress = "172.18.4.100";
s7.Port = 102;
s7.ConnectServer();
return s7;

2
Main/MCEdit/Data/MCProject/nodeDevice.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<ReadHz value="2000" />
<UnitLen value="8" />
<Connection mode="Net">
<IP value="192.168.1.50" />
<IP value="172.18.4.100" />
<Rack value="0" />
<Slot value="0" />
</Connection>

BIN
PlugInPlatform/HslCommunication.dll
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save