TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KR25003初步更改项目的信息

Browse Source
This commit is contained in:
Tyrone CT
2025-09-06 10:43:35 +08:00
parent e954988fb5
commit c35da1d6d5
12 changed files with 204 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
CapMachine.Wpf/Services/AlarmService.cs
View File

@@ -17,7 +17,7 @@ namespace CapMachine.Wpf.Services
/// </summary>
public class AlarmService : BindableBase
{
public AlarmService(ConfigService configService, IEventAggregator eventAggregator,IFreeSql freeSql
public AlarmService(ConfigService configService, IEventAggregator eventAggregator, IFreeSql freeSql
)
{
ConfigService = configService;
@@ -65,47 +65,47 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
//new AlarmRunCell(FreeSql){Index=3,CurAlarmConfig=new AlarmConfig()
//{
// Name="水压低",
// ActiveType=ActiveType.Bool,
// Address="V0.3",
// AlarmLevel=AlarmLevel.Level1,
// Category="一般报警",
// Message="水压低",
// ThresholdDown=1,
// ThresholdUp=1,
// BoolActiveValue=true
//}},
//new AlarmRunCell(FreeSql){Index=4,CurAlarmConfig=new AlarmConfig()
//{
// Name="水泵过载",
// ActiveType=ActiveType.Bool,
// Address="V0.4",
// AlarmLevel=AlarmLevel.Level1,
// Category="一般报警",
// Message="水泵过载",
// ThresholdDown=1,
// ThresholdUp=1,
// BoolActiveValue=true
//}},
//new AlarmRunCell(FreeSql){Index=5,CurAlarmConfig=new AlarmConfig()
//{
// Name="冷水机组故障",
// ActiveType=ActiveType.Bool,
// Address="V0.5",
// AlarmLevel=AlarmLevel.Level1,
// Category="一般报警",
// Message="冷水机组故障",
// ThresholdDown=1,
// ThresholdUp=1,
// BoolActiveValue=true
//}},
new AlarmRunCell(FreeSql){Index=3,CurAlarmConfig=new AlarmConfig()
{
Name="水压低",
ActiveType=ActiveType.Bool,
Address="V0.3",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="水压低",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=4,CurAlarmConfig=new AlarmConfig()
{
Name="水泵过载",
ActiveType=ActiveType.Bool,
Address="V0.4",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="水泵过载",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=5,CurAlarmConfig=new AlarmConfig()
{
Name="冷水机组故障",
ActiveType=ActiveType.Bool,
Address="V0.5",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="冷水机组故障",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=6,CurAlarmConfig=new AlarmConfig()
{
Name="排气压力",
ActiveType=ActiveType.Bool,
Address="V0.6",
Address="V0.3",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="排气压力",
@@ -113,11 +113,11 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=7,CurAlarmConfig=new AlarmConfig()
new AlarmRunCell(FreeSql){Index=4,CurAlarmConfig=new AlarmConfig()
{
Name="吸气压力",
ActiveType=ActiveType.Bool,
Address="V0.7",
Address="V0.4",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="吸气压力",
@@ -125,11 +125,11 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=8,CurAlarmConfig=new AlarmConfig()
new AlarmRunCell(FreeSql){Index=5,CurAlarmConfig=new AlarmConfig()
{
Name="吸气温度",
ActiveType=ActiveType.Bool,
Address="V1.0",
Address="V0.5",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="吸气温度",
@@ -137,11 +137,23 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=9,CurAlarmConfig=new AlarmConfig()
new AlarmRunCell(FreeSql){Index=6,CurAlarmConfig=new AlarmConfig()
{
Name="冷凝器循环水温",
ActiveType=ActiveType.Bool,
Address="V0.6",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="冷凝器循环水温",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=7,CurAlarmConfig=new AlarmConfig()
{
Name="吸气混合器温度",
ActiveType=ActiveType.Bool,
Address="V1.1",
Address="V0.7",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="吸气混合器温度",
@@ -149,23 +161,12 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=10,CurAlarmConfig=new AlarmConfig()
{
Name="水加热温度",
ActiveType=ActiveType.Bool,
Address="V1.2",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="水加热温度",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=11,CurAlarmConfig=new AlarmConfig()
new AlarmRunCell(FreeSql){Index=8,CurAlarmConfig=new AlarmConfig()
{
Name="排气温度",
ActiveType=ActiveType.Bool,
Address="V1.3",
Address="V1.0",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="排气温度",
@@ -173,23 +174,35 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=12,CurAlarmConfig=new AlarmConfig()
new AlarmRunCell(FreeSql){Index=9,CurAlarmConfig=new AlarmConfig()
{
Name="水箱进水温度",
Name="水加热温度",
ActiveType=ActiveType.Bool,
Address="V1.4",
Address="V1.1",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="水箱进水温度",
Message="水加热温度",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=13,CurAlarmConfig=new AlarmConfig()
//new AlarmRunCell(FreeSql){Index=12,CurAlarmConfig=new AlarmConfig()
//{
// Name="水箱进水温度",
// ActiveType=ActiveType.Bool,
// Address="V1.4",
// AlarmLevel=AlarmLevel.Level1,
// Category="一般报警",
// Message="水箱进水温度",
// ThresholdDown=1,
// ThresholdUp=1,
// BoolActiveValue=true
//}},
new AlarmRunCell(FreeSql){Index=10,CurAlarmConfig=new AlarmConfig()
{
Name="压缩机表面温度",
ActiveType=ActiveType.Bool,
Address="V1.5",
Address="V1.2",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="压缩机表面温度",
@@ -197,18 +210,18 @@ namespace CapMachine.Wpf.Services
ThresholdUp=1,
BoolActiveValue=true
}},
new AlarmRunCell(FreeSql){Index=14,CurAlarmConfig=new AlarmConfig()
{
Name="试验箱",
ActiveType=ActiveType.Bool,
Address="V1.6",
AlarmLevel=AlarmLevel.Level1,
Category="一般报警",
Message="试验箱",
ThresholdDown=1,
ThresholdUp=1,
BoolActiveValue=true
}},
//new AlarmRunCell(FreeSql){Index=14,CurAlarmConfig=new AlarmConfig()
//{
// Name="试验箱",
// ActiveType=ActiveType.Bool,
// Address="V1.6",
// AlarmLevel=AlarmLevel.Level1,
// Category="一般报警",
// Message="试验箱",
// ThresholdDown=1,
// ThresholdUp=1,
// BoolActiveValue=true
//}},
};
}
public ConfigService ConfigService { get; }

140
CapMachine.Wpf/Services/MachineRtDataService.cs
View File

@@ -274,8 +274,8 @@ namespace CapMachine.Wpf.Services
});
TagManger.AddTag(new Tag<short>(new ShortTagValue())
{
Name = "冷凝器出口水温[℃]",//名称带单位 COND1水温
NameNoUnit = "冷凝器出口水温",//无单位名称
Name = "冷凝器循环水温[℃]",//名称带单位 COND1水温
NameNoUnit = "冷凝器循环水温",//无单位名称
EnName = "Cond1Temp",//英文名称
Group = "程序",//分组
MinValue = 0,
@@ -384,8 +384,8 @@ namespace CapMachine.Wpf.Services
MVAddress = "",
IsMeter = true,
AutoHandSwitchAddress = "",
Precision = 10,
DecimalPoint = 1,
Precision = 100,
DecimalPoint = 2,
Samp = 1,
ValueType = typeof(short),
Index = "",
@@ -403,8 +403,8 @@ namespace CapMachine.Wpf.Services
SVAddress = "",
MVAddress = "",
IsMeter = false,
Precision = 100,
DecimalPoint = 2,
Precision = 1000,
DecimalPoint = 3,
Samp = 1,
ValueType = typeof(short),
Index = "",
@@ -544,25 +544,25 @@ namespace CapMachine.Wpf.Services
ValueType = typeof(short),
Index = "",
});
TagManger.AddTag(new Tag<short>(new ShortTagValue())
{
Name = "水箱进水温度[℃]",//名称带单位
NameNoUnit = "水箱进水温度",//无单位名称
EnName = "WaterTankInTemp",//英文名称
Group = "程序",//分组
MinValue = 0,
Unit = "℃",
MaxValue = 100,
PVAddress = "VW136",//地址信息
SVAddress = "",
MVAddress = "",
IsMeter = false,
Precision = 10,
DecimalPoint = 1,
Samp = 1,
ValueType = typeof(short),
Index = "",
});
//TagManger.AddTag(new Tag<short>(new ShortTagValue())
//{
// Name = "水箱进水温度[℃]",//名称带单位
// NameNoUnit = "水箱进水温度",//无单位名称
// EnName = "WaterTankInTemp",//英文名称
// Group = "程序",//分组
// MinValue = 0,
// Unit = "℃",
// MaxValue = 100,
// PVAddress = "VW136",//地址信息
// SVAddress = "",
// MVAddress = "",
// IsMeter = false,
// Precision = 10,
// DecimalPoint = 1,
// Samp = 1,
// ValueType = typeof(short),
// Index = "",
//});
TagManger.AddTag(new Tag<short>(new ShortTagValue())
{
Name = "水加热温度H1[℃]",//名称带单位
@@ -601,44 +601,44 @@ namespace CapMachine.Wpf.Services
ValueType = typeof(short),
Index = "",
});
TagManger.AddTag(new Tag<short>(new ShortTagValue())
{
Name = "压缩机表面温度2[℃]",//名称带单位
NameNoUnit = "压缩机表面温度2",//无单位名称
EnName = "CapSurfTemp2",//英文名称
Group = "程序",//分组
MinValue = 0,
MaxValue = 100,
Unit = "℃",
PVAddress = "VW142",//地址信息
SVAddress = "",
MVAddress = "",
IsMeter = false,
Precision = 10,
DecimalPoint = 1,
Samp = 1,
ValueType = typeof(short),
Index = "",
});
TagManger.AddTag(new Tag<short>(new ShortTagValue())
{
Name = "压缩机表面温度3[℃]",//名称带单位
NameNoUnit = "压缩机表面温度3",//无单位名称
EnName = "CapSurfTemp3",//英文名称
Group = "程序",//分组
MinValue = 0,
MaxValue = 100,
Unit = "℃",
PVAddress = "VW144",//地址信息
SVAddress = "",
MVAddress = "",
IsMeter = false,
Precision = 10,
DecimalPoint = 1,
Samp = 1,
ValueType = typeof(short),
Index = "",
});
//TagManger.AddTag(new Tag<short>(new ShortTagValue())
//{
// Name = "压缩机表面温度2[℃]",//名称带单位
// NameNoUnit = "压缩机表面温度2",//无单位名称
// EnName = "CapSurfTemp2",//英文名称
// Group = "程序",//分组
// MinValue = 0,
// MaxValue = 100,
// Unit = "℃",
// PVAddress = "VW142",//地址信息
// SVAddress = "",
// MVAddress = "",
// IsMeter = false,
// Precision = 10,
// DecimalPoint = 1,
// Samp = 1,
// ValueType = typeof(short),
// Index = "",
//});
//TagManger.AddTag(new Tag<short>(new ShortTagValue())
//{
// Name = "压缩机表面温度3[℃]",//名称带单位
// NameNoUnit = "压缩机表面温度3",//无单位名称
// EnName = "CapSurfTemp3",//英文名称
// Group = "程序",//分组
// MinValue = 0,
// MaxValue = 100,
// Unit = "℃",
// PVAddress = "VW144",//地址信息
// SVAddress = "",
// MVAddress = "",
// IsMeter = false,
// Precision = 10,
// DecimalPoint = 1,
// Samp = 1,
// ValueType = typeof(short),
// Index = "",
//});
TagManger.AddTag(new Tag<short>(new ShortTagValue())
{
Name = "通讯母线电压[V]",//名称带单位
@@ -831,13 +831,13 @@ namespace CapMachine.Wpf.Services
new HandSwitchData(){Name="冷凝器电加热",ActionAddress="M1.5",StateAddress="Q0.4" },
new HandSwitchData(){Name="吸气混合器电加热",ActionAddress="M1.6",StateAddress="Q0.5" },
new HandSwitchData(){Name="吸排气球阀",ActionAddress="M1.7",StateAddress="Q0.7" },
new HandSwitchData(){Name="试验箱",ActionAddress="M2.0",StateAddress="V15.0" },
new HandSwitchData(){Name="水SEV1",ActionAddress="M2.1",StateAddress="Q1.0" },
new HandSwitchData(){Name="水SEV2",ActionAddress="M2.2",StateAddress="Q1.1" },
new HandSwitchData(){Name="HCV1",ActionAddress="M2.3",StateAddress="Q1.2" },
new HandSwitchData(){Name="HCV2",ActionAddress="M2.4",StateAddress="Q1.3" },
new HandSwitchData(){Name="ECV1",ActionAddress="M2.5",StateAddress="Q1.4" },
new HandSwitchData(){Name="ECV2",ActionAddress="M2.6",StateAddress="Q1.5" },
//new HandSwitchData(){Name="试验箱",ActionAddress="M2.0",StateAddress="V15.0" },
//new HandSwitchData(){Name="水SEV1",ActionAddress="M2.1",StateAddress="Q1.0" },
//new HandSwitchData(){Name="水SEV2",ActionAddress="M2.2",StateAddress="Q1.1" },
new HandSwitchData(){Name="HCV1",ActionAddress="M2.3",StateAddress="Q1.0" },
new HandSwitchData(){Name="HCV2",ActionAddress="M2.4",StateAddress="Q1.1" },
new HandSwitchData(){Name="ECV1",ActionAddress="M2.5",StateAddress="Q1.2" },
new HandSwitchData(){Name="ECV2",ActionAddress="M2.6",StateAddress="Q1.3" },
new HandSwitchData(){Name="使能",ActionAddress="M2.7",StateAddress="V15.1" },
};

2
CapMachine.Wpf/Services/PPCService.cs
View File

@@ -64,7 +64,7 @@ namespace CapMachine.Wpf.Services
//OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]")!;
TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]")!;
//Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
//Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器循环水温[℃]");
//CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
Superheat = TagManager.DicTags.GetValueOrDefault("过热度[K]");