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

change - 按钮逻辑修改

Browse Source
master
wangsr 1 year ago
parent 53c2b54934
commit b27477df99
9 changed files with 1972 additions and 651 deletions
Show Stats Download Patch File Download Diff File

1225
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
View File

File diff suppressed because it is too large Load Diff

54
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveInitStateMonitor/ValveInitStateMonitor.Designer.cs generated
Unescape Escape View File

@ -148,29 +148,29 @@
"螺旋输送机1M出料蝶阀",
"螺旋输送机1N出料蝶阀",
"螺旋输送机1O出料蝶阀",
"压送秤A进料蝶阀",
"压送秤A进料蝶阀",
"压送秤A进料蝶阀",
"压送秤A进料蝶阀",
"压送秤A进料蝶阀1",
"压送秤A进料蝶阀2",
"压送秤A进料蝶阀3",
"压送秤A进料蝶阀4",
"压送秤A返气蝶阀",
"压送秤A出料蝶阀",
"压送秤A除尘出料蝶阀",
"压送秤B进料蝶阀",
"压送秤B进料蝶阀",
"压送秤B进料蝶阀1",
"压送秤B进料蝶阀2",
"压送秤B返气蝶阀",
"压送秤B出料蝶阀",
"压送秤B除尘出料蝶阀",
"压送秤C进料蝶阀",
"压送秤C进料蝶阀",
"压送秤C进料蝶阀",
"压送秤C进料蝶阀",
"压送秤C进料蝶阀1",
"压送秤C进料蝶阀2",
"压送秤C进料蝶阀3",
"压送秤C进料蝶阀4",
"压送秤C返气蝶阀",
"压送秤C出料蝶阀",
"压送秤C除尘出料蝶阀",
"压送秤D进料蝶阀",
"压送秤D进料蝶阀",
"压送秤D进料蝶阀",
"压送秤D进料蝶阀",
"压送秤D进料蝶阀1",
"压送秤D进料蝶阀2",
"压送秤D进料蝶阀3",
"压送秤D进料蝶阀4",
"压送秤D返气蝶阀",
"压送秤D出料蝶阀",
"压送秤D除尘出料蝶阀",
@ -198,18 +198,18 @@
"缓存仓1J出料蝶阀",
"缓存仓1K出料蝶阀",
"缓存仓1L出料蝶阀",
"干混机卸料阀",
"干混机卸料阀",
"干混机卸料阀",
"干混机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀",
"糊化机卸料阀"});
"干混机卸料阀1",
"干混机卸料阀2",
"干混机卸料阀3",
"干混机卸料阀4",
"糊化机卸料阀1",
"糊化机卸料阀2",
"糊化机卸料阀3",
"糊化机卸料阀4",
"糊化机卸料阀5",
"糊化机卸料阀6",
"糊化机卸料阀7",
"糊化机卸料阀8"});
this.DmChange_S.Location = new System.Drawing.Point(12, 197);
this.DmChange_S.Name = "DmChange_S";
this.DmChange_S.Size = new System.Drawing.Size(208, 172);
@ -798,7 +798,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(444, 420);
this.ClientSize = new System.Drawing.Size(445, 420);
this.Controls.Add(this.Refresh);
this.Controls.Add(this.DmChange_D);
this.Controls.Add(this.DmChange_S);

68
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveInitStateMonitor/ValveInitStateMonitor.cs
Unescape Escape View File

@ -98,29 +98,29 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.NewFolder1
["螺旋输送机1M出料蝶阀"] = "BU1MSF01",
["螺旋输送机1N出料蝶阀"] = "BU1NSF01",
["螺旋输送机1O出料蝶阀"] = "BU1OSF01",
["压送秤A进料蝶阀"] = "BU1BLT01",
["压送秤A进料蝶阀"] = "BU1BLT02",
["压送秤A进料蝶阀"] = "BU1BLT03",
["压送秤A进料蝶阀"] = "BU1BLT04",
["压送秤A进料蝶阀1"] = "BU1BLT01",
["压送秤A进料蝶阀2"] = "BU1BLT02",
["压送秤A进料蝶阀3"] = "BU1BLT03",
["压送秤A进料蝶阀4"] = "BU1BLT04",
["压送秤A返气蝶阀"] = "BU1BLT05",
["压送秤A出料蝶阀"] = "BU1BLT06",
["压送秤A除尘出料蝶阀"] = "BU1BLT07",
["压送秤B进料蝶阀"] = "BU2BLT01",
["压送秤B进料蝶阀"] = "BU2BLT02",
["压送秤B进料蝶阀1"] = "BU2BLT01",
["压送秤B进料蝶阀2"] = "BU2BLT02",
["压送秤B返气蝶阀"] = "BU2BLT03",
["压送秤B出料蝶阀"] = "BU2BLT04",
["压送秤B除尘出料蝶阀"] = "BU2BLT05",
["压送秤C进料蝶阀"] = "BU3BLT01",
["压送秤C进料蝶阀"] = "BU3BLT02",
["压送秤C进料蝶阀"] = "BU3BLT03",
["压送秤C进料蝶阀"] = "BU3BLT04",
["压送秤C进料蝶阀1"] = "BU3BLT01",
["压送秤C进料蝶阀2"] = "BU3BLT02",
["压送秤C进料蝶阀3"] = "BU3BLT03",
["压送秤C进料蝶阀4"] = "BU3BLT04",
["压送秤C返气蝶阀"] = "BU3BLT05",
["压送秤C出料蝶阀"] = "BU3BLT06",
["压送秤C除尘出料蝶阀"] = "BU3BLT07",
["压送秤D进料蝶阀"] = "BU4BLT01",
["压送秤D进料蝶阀"] = "BU4BLT02",
["压送秤D进料蝶阀"] = "BU4BLT03",
["压送秤D进料蝶阀"] = "BU4BLT04",
["压送秤D进料蝶阀1"] = "BU4BLT01",
["压送秤D进料蝶阀2"] = "BU4BLT02",
["压送秤D进料蝶阀3"] = "BU4BLT03",
["压送秤D进料蝶阀4"] = "BU4BLT04",
["压送秤D返气蝶阀"] = "BU4BLT05",
["压送秤D出料蝶阀"] = "BU4BLT06",
["压送秤D除尘出料蝶阀"] = "BU4BLT07",
@ -128,14 +128,14 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.NewFolder1
["压送秤E返气蝶阀"] = "BU5BLT02",
["压送秤E出料蝶阀"] = "BU5BLT03",
["压送秤E除尘出料蝶阀"] = "BU5BLT04",
["双向螺旋输送机2A出料蝶阀"] = "BU2ASF01",
["双向螺旋输送机2A出料蝶阀"] = "BU2ASF02",
["双向螺旋输送机2B出料蝶阀"] = "BU2BSF01",
["双向螺旋输送机2B出料蝶阀"] = "BU2BSF02",
["双向螺旋输送机2C出料蝶阀"] = "BU2CSF01",
["双向螺旋输送机2C出料蝶阀"] = "BU2CSF02",
["双向螺旋输送机2D出料蝶阀"] = "BU2DSF01",
["双向螺旋输送机2D出料蝶阀"] = "BU2DSF02",
["双向螺旋输送机2A出料蝶阀1"] = "BU2ASF01",
["双向螺旋输送机2A出料蝶阀2"] = "BU2ASF02",
["双向螺旋输送机2B出料蝶阀1"] = "BU2BSF01",
["双向螺旋输送机2B出料蝶阀2"] = "BU2BSF02",
["双向螺旋输送机2C出料蝶阀1"] = "BU2CSF01",
["双向螺旋输送机2C出料蝶阀2"] = "BU2CSF02",
["双向螺旋输送机2D出料蝶阀1"] = "BU2DSF01",
["双向螺旋输送机2D出料蝶阀2"] = "BU2DSF02",
["缓存仓1A出料蝶阀"] = "BU1ADB01",
["缓存仓1B出料蝶阀"] = "BU1BDB01",
["缓存仓1C出料蝶阀"] = "BU1CDB01",
@ -162,18 +162,18 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.NewFolder1
["二级气力输送管道分配阀12"] = "DV2PCP12",
["二级气力动送管道分配阀13"] = "DV2PCP13",
["二级气力输送管道分配阀14"] = "DV2PCP14",
["干混机卸料阀"] = "BU1DRB01",
["干混机卸料阀"] = "BU2DRB01",
["干混机卸料阀"] = "BU3DRB01",
["干混机卸料阀"] = "BU4DRB01",
["糊化机卸料阀"] = "BU1GEB01",
["糊化机卸料阀"] = "BU2GEB01",
["糊化机卸料阀"] = "BU3GEB01",
["糊化机卸料阀"] = "BU4GEB01",
["糊化机卸料阀"] = "BU5GEB01",
["糊化机卸料阀"] = "BU6GEB01",
["糊化机卸料阀"] = "BU7GEB01",
["糊化机卸料阀"] = "BU8GEB01"
["干混机卸料阀1"] = "BU1DRB01",
["干混机卸料阀2"] = "BU2DRB01",
["干混机卸料阀3"] = "BU3DRB01",
["干混机卸料阀4"] = "BU4DRB01",
["糊化机卸料阀1"] = "BU1GEB01",
["糊化机卸料阀2"] = "BU2GEB01",
["糊化机卸料阀3"] = "BU3GEB01",
["糊化机卸料阀4"] = "BU4GEB01",
["糊化机卸料阀5"] = "BU5GEB01",
["糊化机卸料阀6"] = "BU6GEB01",
["糊化机卸料阀7"] = "BU7GEB01",
["糊化机卸料阀8"] = "BU8GEB01"
};
}

8
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
Unescape Escape View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Windows.Forms;
@ -33,7 +34,8 @@ namespace Mesnac.Action.ChemicalWeighing.Test
{
base.RunIni(runtime); //必须调用
//int adsa = BasePlcHelper.Instance.BU1BLT01_Alarm.NowValue.ToInt();
int value = BasePlcHelper.Instance.BU1BLT01_Set.NowValue.ToInt();
string sql = "insert into ActionCode values (13,'test','',1) select @@IDENTITY";
@ -45,6 +47,9 @@ namespace Mesnac.Action.ChemicalWeighing.Test
// dbHelper.ClearParameter();
// dbHelper.CommandType = CommandType.Text;
// dbHelper.CommandText = sql;
var s1 = BasePlcHelper.Instance.dryerA_dos0_eqNo.LastValue.ToInt();
int[] ssss = new int [] { };
var ss2s = BasePlcHelper.Instance.PlcReadByRunName("BU1BLT01_Set", out ssss);
ValveInitStateMonitor Form = new ValveInitStateMonitor();
@ -184,5 +189,6 @@ namespace Mesnac.Action.ChemicalWeighing.Test
}
}
}

31
Controls/Mesnac.Controls.ChemicalWeighing/LjSwith.cs
Unescape Escape View File

@ -16,6 +16,8 @@ namespace Mesnac.Controls.ChemicalWeighing
/// </summary>
public partial class LjSwith : ChemicalWeighingControl
{
private object lockobj = new object();
private string[] sImages = new String[3];
private bool _alarm;
private bool _set;
@ -32,28 +34,31 @@ namespace Mesnac.Controls.ChemicalWeighing
sImages[2] = "Mesnac.Controls.ChemicalWeighing.Resources.switch_failure.png";
sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.switch_ok.png";
sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.swith_default.png";
}
private void R()
{
ReloadStream();
Reload();
lock (lockobj)
{
ReloadStream();
Reload();
}
}
private void ReloadStream()
{
int defaultIndex = 0;
int defaultIndex;
//如果报警就现实红色
if (Alarm)
if (_alarm)
{
defaultIndex = 2;
}
else
{
defaultIndex = Set ? 1 : 0;
defaultIndex = _set ? 1 : 0;
}
_imageStream = _assembly.GetManifestResourceStream(sImages[defaultIndex]);
@ -71,6 +76,7 @@ namespace Mesnac.Controls.ChemicalWeighing
}
/// <summary>
/// 故障名称
/// </summary>
@ -87,8 +93,11 @@ namespace Mesnac.Controls.ChemicalWeighing
get => _alarm;
set
{
_alarm = value;
R();
_alarm = value;
R();
}
}
@ -98,8 +107,10 @@ namespace Mesnac.Controls.ChemicalWeighing
get => _set;
set
{
_set = value;
R();
_set = value;
R();
}
}
}

6
Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
Unescape Escape View File

@ -633,9 +633,9 @@
<EmbeddedResource Include="Resources\WayValveDefault.png" />
<EmbeddedResource Include="Resources\WayValveError.png" />
<EmbeddedResource Include="Resources\WayValveOpen.png" />
<Content Include="Resources\switch_failure.png" />
<Content Include="Resources\switch_ok.png" />
<Content Include="Resources\swith_default.png" />
<EmbeddedResource Include="Resources\switch_failure.png" />
<EmbeddedResource Include="Resources\switch_ok.png" />
<EmbeddedResource Include="Resources\swith_default.png" />
<EmbeddedResource Include="Resources\p0.png" />
<EmbeddedResource Include="Resources\p1.png" />
<EmbeddedResource Include="Resources\ThreeWayValveHVError.png" />

4
Controls/Mesnac.Controls.Feeding/Jzf.cs
Unescape Escape View File

@ -131,8 +131,8 @@ namespace Mesnac.Controls.Feeding
{
Image img = Image.FromStream(_imageStream);
Size size = new Size();
size.Width = 29;
size.Height = 24;
size.Width = 18;
size.Height = 15;
this.Size = size;
if (bNewPic == true)
{

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

@ -272,7 +272,6 @@
<Data name="conveyV5_SV" runname="conveyV5_SV" start="341" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
<Data name="purgeV5_PV" runname="purgeV5_PV" start="343" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
<Data name="purgeV5_SV" runname="purgeV5_SV" start="345" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
<Data name="Silo0_HighSpeed" runname="Silo0_HighSpeed" start="347" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="高速频率" />
<Data name="Silo0_LowSpeed" runname="Silo0_LowSpeed" start="349" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="低速频率" />
<Data name="Silo0_WeightSlow" runname="Silo0_WeightSlow" start="351" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="快慢值值值" />
@ -3943,6 +3942,7 @@
<Data name="BU1NSF01_AlarmPosition" runname="BU1NSF01_AlarmPosition" start="13" len="1" method="Default_Bit(10,1)" max="" issave="True" subtractor="" remark="反馈位置故障" />
<Data name="BU1NSF01_Alarm" runname="BU1NSF01_Alarm" start="13" len="1" method="Default_Bit(11,1)" max="" issave="True" subtractor="" remark="故障指示" />
<Data name="BU1NSF01_P" runname="BU1NSF01_P" start="13" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
<Data name="BU1OSF01_ManualMode" runname="BU1OSF01_ManualMode" start="14" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
<Data name="BU1OSF01_AutoMode" runname="BU1OSF01_AutoMode" start="14" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
<Data name="BU1OSF01_AlarmReset" runname="BU1OSF01_AlarmReset" start="14" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="报警复位" />
@ -3956,12 +3956,14 @@
<Data name="BU1OSF01_AlarmPosition" runname="BU1OSF01_AlarmPosition" start="14" len="1" method="Default_Bit(10,1)" max="" issave="True" subtractor="" remark="反馈位置故障" />
<Data name="BU1OSF01_Alarm" runname="BU1OSF01_Alarm" start="14" len="1" method="Default_Bit(11,1)" max="" issave="True" subtractor="" remark="故障指示" />
<Data name="BU1OSF01_P" runname="BU1OSF01_P" start="14" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
<Data name="BU1BLT01_ManualMode" runname="BU1BLT01_ManualMode" start="15" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
<Data name="BU1BLT01_AutoMode" runname="BU1BLT01_AutoMode" start="15" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
<Data name="BU1BLT01_AlarmReset" runname="BU1BLT01_AlarmReset" start="15" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="报警复位" />
<Data name="BU1BLT01_SetManual" runname="BU1BLT01_SetManual" start="15" len="1" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="手动启动指令" />
<Data name="BU1BLT01_SetAuto" runname="BU1BLT01_SetAuto" start="15" len="1" method="Default_Bit(4,1)" max="" issave="True" subtractor="" remark="自动启动指令" />
<Data name="BU1BLT01_SetPosition" runname="BU1BLT01_SetPosition" start="15" len="1" method="Default_Bit(5,1)" max="" issave="True" subtractor="" remark="输出位置反馈" />
<Data name="BU1BLT01_UnSetPosition" runname="BU1BLT01_UnSetPosition" start="15" len="1" method="Default_Bit(6,1)" max="" issave="True" subtractor="" remark="非输出位置反馈" />
<Data name="BU1BLT01_Set" runname="BU1BLT01_Set" start="15" len="1" method="Default_Bit(7,1)" max="" issave="True" subtractor="" remark="输出指令" />
<Data name="BU1BLT01_AlarmSetPos" runname="BU1BLT01_AlarmSetPos" start="15" len="1" method="Default_Bit(8,1)" max="" issave="True" subtractor="" remark="输出指令时位置故障" />
@ -3969,6 +3971,7 @@
<Data name="BU1BLT01_AlarmPosition" runname="BU1BLT01_AlarmPosition" start="15" len="1" method="Default_Bit(10,1)" max="" issave="True" subtractor="" remark="反馈位置故障" />
<Data name="BU1BLT01_Alarm" runname="BU1BLT01_Alarm" start="15" len="1" method="Default_Bit(11,1)" max="" issave="True" subtractor="" remark="故障指示" />
<Data name="BU1BLT01_P" runname="BU1BLT01_P" start="15" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
<Data name="BU1BLT02_ManualMode" runname="BU1BLT02_ManualMode" start="16" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
<Data name="BU1BLT02_AutoMode" runname="BU1BLT02_AutoMode" start="16" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
<Data name="BU1BLT02_AlarmReset" runname="BU1BLT02_AlarmReset" start="16" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="报警复位" />
@ -5868,7 +5871,7 @@
<Data name="DM8GEM_ACT_Speed" runname="DM8GEM_ACT_Speed" start="199" len="2" method="Default_Float()" max="" issave="True" subtractor="" remark="运行速度反馈0-200" />
</Data>
</Group>
<Group name="FC3_Analog" block="1" start="0" len="276" access="ReadWrite" remark="" isautoread="True">
<Group name="FC3_Analog" block="1" start="0" len="276" access="ReadWrite" remark="" isautoread="False">
<Data>
<Data name="PR1DBT01_Min" runname="PR1DBT01_Min" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="" />
<Data name="PR1DBT01_Max" runname="PR1DBT01_Max" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="" />
@ -6148,7 +6151,7 @@
<Data name="From_SiloO_Alarm" runname="From_SiloO_Alarm" start="275" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="" />
</Data>
</Group>
<Group name="FC5_Motor" block="91" start="0" len="46" access="ReadWrite" remark="" isautoread="True">
<Group name="FC5_Motor" block="91" start="0" len="46" access="ReadWrite" remark="" isautoread="False">
<Data>
<Data name="DM1GDP01_ManualMode" runname="DM1GDP01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
<Data name="DM1GDP01_AutoMode" runname="DM1GDP01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@ -6430,7 +6433,7 @@
<Data name="DM1GDS12_ActSpeed" runname="DM1GDS12_ActSpeed" start="44" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
</Data>
</Group>
<Group name="FC4_Valve" block="90" start="0" len="77" access="ReadWrite" remark="" isautoread="True">
<Group name="FC4_Valve" block="90" start="0" len="77" access="ReadWrite" remark="" isautoread="False">
<Data>
<Data name="BU3DBT06_ManualMode" runname="BU3DBT06_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
<Data name="BU3DBT06_AutoMode" runname="BU3DBT06_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />

1210
Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save