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

物性参数更改1

Browse Source
This commit is contained in:
Tyrone CT
2026-05-07 11:38:28 +08:00
parent b04fc71d6a
commit bdc90d4473
7 changed files with 98 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CapMachine.Wpf/App.config
View File

@@ -2,12 +2,12 @@
<configuration> <configuration>
<appSettings> <appSettings>
<add key="connecting1" value="Data Source=192.168.40.2;user instance=false;Initial Catalog=FrontLineMachine;User ID=sa;Password=ABCabc123"/> <add key="connecting1" value="Data Source=192.168.40.2;user instance=false;Initial Catalog=FrontLineMachine;User ID=sa;Password=ABCabc123"/>
<add key="connecting" value="Data Source=DESKTOP-T7B3OHC\SQLEXPRESS;user instance=false;Encrypt=false;Initial Catalog=CapMachine;User ID=sa;Password=12345678"/> <add key="connecting" value="Data Source=CT-PC;user instance=false;Encrypt=false;Initial Catalog=CapMachine;User ID=sa;Password=12345678"/>
<add key="connecting2" value="Data Source=DESKTOP-94B7RIE\SQLEXPRESS;user instance=false;Encrypt=false;Initial Catalog=CapMachine;User ID=sa;Password=12345678"/> <add key="connecting2" value="Data Source=DESKTOP-94B7RIE\SQLEXPRESS;user instance=false;Encrypt=false;Initial Catalog=CapMachine;User ID=sa;Password=12345678"/>
<add key="connecting5" value="Data Source=@Address@; Attachs=ems.db; Pooling=true;Min Pool Size=1"/> <add key="connecting5" value="Data Source=@Address@; Attachs=ems.db; Pooling=true;Min Pool Size=1"/>
<add key="PLCScan" value="600"/> <add key="PLCScan" value="600"/>
<add key="PLCIP" value="127.0.0.1"/> <add key="PLCIP" value="127.0.0.1"/>
<add key="FluidsPath" value="D:\fluids"/> <add key="FluidsPath" value="D:\FLUIDS"/>
<add key="Cryogen" value="R134a"/> <add key="Cryogen" value="R134a"/>
<add key="Therdy_H3TempOffset_C" value="-10"/> <add key="Therdy_H3TempOffset_C" value="-10"/>
<add key="LocalDBPath" value="D:\MSDB\LocalDb\CapMachineDb"/> <add key="LocalDBPath" value="D:\MSDB\LocalDb\CapMachineDb"/>

28
CapMachine.Wpf/Models/CsvRecordModel.cs
View File

@@ -146,15 +146,15 @@ namespace CapMachine.Wpf.Models
public double EVAPExpTemp { get; set; } public double EVAPExpTemp { get; set; }
/// <summary> /// <summary>
/// 冷媒流量[L/min] /// 冷媒流量[kg/h]
/// </summary> /// </summary>
[Name("冷媒流量[L/min]")] [Name("冷媒流量[kg/h]")]
public double VRV { get; set; } public double VRV { get; set; }
/// <summary> /// <summary>
/// 润滑油流量[L/min] /// 润滑油流量[kg/h]
/// </summary> /// </summary>
[Name("润滑油流量[L/min]")] [Name("润滑油流量[kg/h]")]
public double LubeFlow { get; set; } public double LubeFlow { get; set; }
/// <summary> /// <summary>
@@ -211,17 +211,17 @@ namespace CapMachine.Wpf.Models
[Name("PTC出水温度[℃]")] [Name("PTC出水温度[℃]")]
public double PTCExpTemp { get; set; } public double PTCExpTemp { get; set; }
/// <summary> ///// <summary>
/// AT04_01[℃] ///// AT04_01[℃]
/// </summary> ///// </summary>
[Name("AT04_01[℃]")] //[Name("AT04_01[℃]")]
public double AT04_01Temp { get; set; } //public double AT04_01Temp { get; set; }
/// <summary> ///// <summary>
/// AT04_02[℃] ///// AT04_02[℃]
/// </summary> ///// </summary>
[Name("AT04_02[℃]")] //[Name("AT04_02[℃]")]
public double AT04_02Temp { get; set; } //public double AT04_02Temp { get; set; }
/// <summary> /// <summary>
/// 通讯Cmp母线电流[A] /// 通讯Cmp母线电流[A]

8
CapMachine.Wpf/Models/CsvRecordModelMap.cs
View File

@@ -37,8 +37,8 @@ namespace CapMachine.Wpf.Models
Map(m => m.OS2Temp).Name("OS2温度[℃]"); Map(m => m.OS2Temp).Name("OS2温度[℃]");
Map(m => m.Cond2Temp).Name("COND2温度[℃]"); Map(m => m.Cond2Temp).Name("COND2温度[℃]");
Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]"); Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]");
Map(m => m.VRV).Name("冷媒流量[L/min]"); Map(m => m.VRV).Name("冷媒流量[kg/h]");
Map(m => m.LubeFlow).Name("润滑油流量[L/min]"); Map(m => m.LubeFlow).Name("润滑油流量[kg/h]");
Map(m => m.ExTemp).Name("排气温度[℃]"); Map(m => m.ExTemp).Name("排气温度[℃]");
Map(m => m.TxvFrPress).Name("膨胀阀前压力[BarA]"); Map(m => m.TxvFrPress).Name("膨胀阀前压力[BarA]");
Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]"); Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]");
@@ -48,8 +48,8 @@ namespace CapMachine.Wpf.Models
Map(m => m.PTCFlow).Name("PTC流量[L/min]"); Map(m => m.PTCFlow).Name("PTC流量[L/min]");
Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]"); Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]");
Map(m => m.PTCExpTemp).Name("PTC出水温度[℃]"); Map(m => m.PTCExpTemp).Name("PTC出水温度[℃]");
Map(m => m.AT04_01Temp).Name("AT04_01[℃]"); //Map(m => m.AT04_01Temp).Name("AT04_01[℃]");
Map(m => m.AT04_02Temp).Name("AT04_02[℃]"); //Map(m => m.AT04_02Temp).Name("AT04_02[℃]");
Map(m => m.ComCapBusCur).Name("通讯Cmp母线电流[A]"); Map(m => m.ComCapBusCur).Name("通讯Cmp母线电流[A]");
Map(m => m.ComCapBusVol).Name("通讯Cmp母线电压[V]"); Map(m => m.ComCapBusVol).Name("通讯Cmp母线电压[V]");
Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度[℃]"); Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度[℃]");

12
CapMachine.Wpf/Models/LightChart/ChartManager.cs
View File

@@ -239,9 +239,9 @@ namespace CapMachine.Wpf.Models.LightChart
return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "EVAP出口温度[℃]": case "EVAP出口温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "冷媒流量[L/min]": case "冷媒流量[kg/h]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.VRV, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.VRV, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "润滑油流量[L/min]": case "润滑油流量[kg/h]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubeFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubeFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "排气温度[℃]": case "排气温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.ExTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.ExTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
@@ -261,10 +261,10 @@ namespace CapMachine.Wpf.Models.LightChart
return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCEntTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCEntTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "PTC出水温度[℃]": case "PTC出水温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "AT04_01[℃]": //case "AT04_01[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.AT04_01Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); // return CurHistoryData.Select(a => new ChartPoint() { Value = a.AT04_01Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "AT04_02[℃]": //case "AT04_02[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.AT04_02Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); // return CurHistoryData.Select(a => new ChartPoint() { Value = a.AT04_02Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "通讯Cmp母线电流[A]": case "通讯Cmp母线电流[A]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapBusCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapBusCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "通讯Cmp母线电压[V]": case "通讯Cmp母线电压[V]":

8
CapMachine.Wpf/Services/DataRecordService.cs
View File

@@ -123,8 +123,8 @@ namespace CapMachine.Wpf.Services
new Columns(){ Name="OS2温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="OS2温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="COND2温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="COND2温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="EVAP出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="EVAP出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="冷媒流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="冷媒流量[kg/h]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="润滑油流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="润滑油流量[kg/h]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="排气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="排气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="膨胀阀前压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="膨胀阀前压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="膨胀阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="膨胀阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
@@ -134,8 +134,8 @@ namespace CapMachine.Wpf.Services
new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="AT04_01[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, //new Columns(){ Name="AT04_01[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="AT04_02[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, //new Columns(){ Name="AT04_02[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="通讯Cmp母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="通讯Cmp母线电压[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp母线电压[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="通讯Cmp逆变器温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp逆变器温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},

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

@@ -164,8 +164,8 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag<short>("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("EVAP出口温度", "EVAP出口温度[℃]", "EVAPExpTemp", "程序", "VW15036", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("EVAP出口温度", "EVAP出口温度[℃]", "EVAPExpTemp", "程序", "VW15036", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[kg/h]", "VRV", "程序", "VW15038", 100, 0, 10, "kg/h", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("润滑油流量", "润滑油流量[L/min]", "LubeFlow", "程序", "VW15040", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("润滑油流量", "润滑油流量[kg/h]", "LubeFlow", "程序", "VW15040", 100, 0, 10, "kg/h", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("膨胀阀前压力", "膨胀阀前压力[BarA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("膨胀阀前压力", "膨胀阀前压力[BarA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
@@ -176,8 +176,8 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag<short>("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 100, "℃", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 100, "℃", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("PTC出水温度", "PTC出水温度[℃]", "PTCExpTemp", "程序", "VW15058", 100, 0, 100, "℃", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("PTC出水温度", "PTC出水温度[℃]", "PTCExpTemp", "程序", "VW15058", 100, 0, 100, "℃", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("AT04_01", "AT04_01[℃]", "AT04_01Temp", "程序", "VW70", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag<short>("AT04_01", "AT04_01[℃]", "AT04_01Temp", "程序", "VW70", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("AT04_02", "AT04_02[℃]", "AT04_02Temp", "程序", "VW72", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag<short>("AT04_02", "AT04_02[℃]", "AT04_02Temp", "程序", "VW72", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("通讯Cmp母线电流", "通讯Cmp母线电流[A]", "ComCapBusCur", "程序", "VW14102", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("通讯Cmp母线电流", "通讯Cmp母线电流[A]", "ComCapBusCur", "程序", "VW14102", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("通讯Cmp母线电压", "通讯Cmp母线电压[V]", "ComCapBusVol", "程序", "VW14104", 100, 0, 1, "V", new ShortTagValue(), false) { DecimalPoint = 0 }); TagManger.AddTag(new Tag<short>("通讯Cmp母线电压", "通讯Cmp母线电压[V]", "ComCapBusVol", "程序", "VW14104", 100, 0, 1, "V", new ShortTagValue(), false) { DecimalPoint = 0 });
@@ -193,17 +193,15 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag<short>("通讯PTC膜温", "通讯PTC膜温[℃]", "ComPTCFlmTemp", "程序", "VW14128", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); TagManger.AddTag(new Tag<short>("通讯PTC膜温", "通讯PTC膜温[℃]", "ComPTCFlmTemp", "程序", "VW14128", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 });
TagManger.AddTag(new Tag<short>("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW14130", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); TagManger.AddTag(new Tag<short>("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW14130", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 });
TagManger.AddTag(new Tag<short>("过热度", "过热度[K]", "Superheat", "程序", string.Empty, 100, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("过冷度", "过冷度[K]", "Subcooling", "程序", string.Empty, 100, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("过热度", "过热度[K]", "Superheat", "程序", "VW14132", 100, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("制热量Qh", "制热量Qh[W]", "HeatingCapacity", "程序", string.Empty, 1000, 0, 1, "W", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("过冷度", "过冷度[K]", "Subcooling", "程序", "VW14134", 100, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("压缩机性能系数(制热COP)", "压缩机性能系数(制热COP)", "COPHeat", "程序", string.Empty, 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("等熵效率ns", "等熵效率ns[%]", "IsentrpEff", "程序", string.Empty, 1000, 0, 1, "%", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("制热量Qh", "制热量Qh[KW]", "HeatingCapacity", "程序", "VW14134", 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("制冷量Qc", "制冷量Qc[W]", "CoolCapacity", "程序", string.Empty, 1000, 0, 1, "W", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("压缩机性能系数(制热)", "压缩机性能系数(制热)[K]", "COPHeat", "程序", "VW14134", 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("压缩机性能系数(制冷COP)", "压缩机性能系数(制冷COP)", "COPCool", "程序", string.Empty, 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("等熵效率ns", "等熵效率ns[%]", "IsentrpEff", "程序", "VW14134", 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("容积效率nv", "容积效率nv[%]", "VoltricEff", "程序", string.Empty, 1000, 0, 1, "%", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("制冷量Qc", "制冷量Qc[KW]", "CoolCapacity", "程序", "VW14134", 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("压缩机性能系数(制冷)", "压缩机性能系数(制冷)[K]", "COPCool", "程序", "VW14134", 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("容积效率nv", "容积效率nv[%]", "VoltricEff", "程序", "VW14134", 1000, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 });
#endregion #endregion

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

@@ -88,7 +88,7 @@ namespace CapMachine.Wpf.Services
VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[kg/h]"); VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[kg/h]");
if (VRVTag == null) if (VRVTag == null)
{ {
VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[L/min]"); VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[kg/h]");
} }
LiqRefFlowTag = TagManager.DicTags.GetValueOrDefault("液冷媒流量[kg/h]"); LiqRefFlowTag = TagManager.DicTags.GetValueOrDefault("液冷媒流量[kg/h]");
@@ -100,18 +100,22 @@ namespace CapMachine.Wpf.Services
LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[kg/h]"); LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[kg/h]");
if (LubeFlowTag == null) if (LubeFlowTag == null)
{ {
LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[L/min]"); LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[kg/h]");
} }
Superheat = TagManager.DicTags.GetValueOrDefault("过热度[K]"); Superheat = TagManager.DicTags.GetValueOrDefault("过热度[K]");
Subcool = TagManager.DicTags.GetValueOrDefault("过冷度[K]"); Subcool = TagManager.DicTags.GetValueOrDefault("过冷度[K]");
HeatingCapacity = TagManager.DicTags.GetValueOrDefault("制热量Qh[KW]"); HeatingCapacity = TagManager.DicTags.GetValueOrDefault("制热量Qh[KW]")
COPHeat = TagManager.DicTags.GetValueOrDefault("压缩机性能系数(制热)[K]"); ?? TagManager.DicTags.GetValueOrDefault("制热量Qh[W]");
COPHeat = TagManager.DicTags.GetValueOrDefault("压缩机性能系数(制热)[K]")
?? TagManager.DicTags.GetValueOrDefault("压缩机性能系数(制热COP)");
IsentrpEff = TagManager.DicTags.GetValueOrDefault("等熵效率ns[%]"); IsentrpEff = TagManager.DicTags.GetValueOrDefault("等熵效率ns[%]");
CoolCapacity = TagManager.DicTags.GetValueOrDefault("制冷量Qc[KW]"); CoolCapacity = TagManager.DicTags.GetValueOrDefault("制冷量Qc[KW]")
COPCool = TagManager.DicTags.GetValueOrDefault("压缩机性能系数(制冷)[K]"); ?? TagManager.DicTags.GetValueOrDefault("制冷量Qc[W]");
COPCool = TagManager.DicTags.GetValueOrDefault("压缩机性能系数(制冷)[K]")
?? TagManager.DicTags.GetValueOrDefault("压缩机性能系数(制冷COP)");
VoltricEff = TagManager.DicTags.GetValueOrDefault("容积效率nv[%]"); VoltricEff = TagManager.DicTags.GetValueOrDefault("容积效率nv[%]");
SuperHeatCoolConfig.FluidsPath = ConfigHelper.GetValue("FluidsPath"); SuperHeatCoolConfig.FluidsPath = ConfigHelper.GetValue("FluidsPath");
@@ -333,7 +337,7 @@ namespace CapMachine.Wpf.Services
{ {
while (RtCalcEnable) while (RtCalcEnable)
{ {
await Task.Delay(1000); await Task.Delay(100);
try try
{ {
if (!TryUpdateSuperheatAndSubcool(out var superheatSubcoolErr)) if (!TryUpdateSuperheatAndSubcool(out var superheatSubcoolErr))
@@ -344,33 +348,34 @@ namespace CapMachine.Wpf.Services
} }
} }
if (TryUpdateDryness(out var drynessErr)) //if (TryUpdateDryness(out var drynessErr))
{ //{
if (!string.IsNullOrWhiteSpace(drynessErr)) // if (!string.IsNullOrWhiteSpace(drynessErr))
{ // {
Logger?.Error($"干度计算警告: {drynessErr}"); // Logger?.Error($"干度计算警告: {drynessErr}");
} // }
} //}
else //else
{ //{
if (!string.IsNullOrWhiteSpace(drynessErr)) // if (!string.IsNullOrWhiteSpace(drynessErr))
{ // {
Logger?.Error($"干度计算失败: {drynessErr}"); // Logger?.Error($"干度计算失败: {drynessErr}");
} // }
} //}
if (TryUpdateThermodynamicSixResults(out var thermoErr)) if (TryUpdateThermodynamicSixResults(out var thermoErr))
{ {
if (!string.IsNullOrWhiteSpace(thermoErr)) if (!string.IsNullOrWhiteSpace(thermoErr))
{ {
Logger?.Error($"六个物性结果计算警告: {thermoErr}"); //Logger?.Error($"六个物性结果计算警告: {thermoErr}");
} }
} }
else else
{ {
if (!string.IsNullOrWhiteSpace(thermoErr)) if (!string.IsNullOrWhiteSpace(thermoErr))
{ {
Logger?.Error($"六个物性结果计算失败: {thermoErr}"); //Logger?.Error($"六个物性结果计算失败: {thermoErr}");
} }
} }
@@ -540,19 +545,41 @@ namespace CapMachine.Wpf.Services
IsentropicEfficiencyPct = result.IsentropicEfficiencyPct; IsentropicEfficiencyPct = result.IsentropicEfficiencyPct;
// 再把结果回写到对应工程量标签。 // 再把结果回写到对应工程量标签。
HeatingCapacity.EngPvValue = HeatingCapacityQh_kW; if (HeatingCapacity != null)
{
HeatingCapacity.EngPvValue = string.Equals(HeatingCapacity.Unit, "W", StringComparison.OrdinalIgnoreCase)
? HeatingCapacityQh_kW * 1000.0
: HeatingCapacityQh_kW;
}
if (COPHeat != null)
{
COPHeat.EngPvValue = COPHeating; COPHeat.EngPvValue = COPHeating;
}
if (IsentrpEff != null)
{
IsentrpEff.EngPvValue = IsentropicEfficiencyPct; IsentrpEff.EngPvValue = IsentropicEfficiencyPct;
CoolCapacity.EngPvValue = CoolingCapacityQc_kW; }
if (CoolCapacity != null)
{
CoolCapacity.EngPvValue = string.Equals(CoolCapacity.Unit, "W", StringComparison.OrdinalIgnoreCase)
? CoolingCapacityQc_kW * 1000.0
: CoolingCapacityQc_kW;
}
if (COPCool != null)
{
COPCool.EngPvValue = COPCooling; COPCool.EngPvValue = COPCooling;
}
// 容积效率在旧逻辑中允许单独失败； // 容积效率在旧逻辑中允许单独失败；
// 因此只有拿到有效数值时才回写，避免覆盖已有结果为 NaN/Inf。 // 因此只有拿到有效数值时才回写，避免覆盖已有结果为 NaN/Inf。
if (!double.IsNaN(result.VolumetricEfficiencyPct) && !double.IsInfinity(result.VolumetricEfficiencyPct)) if (!double.IsNaN(result.VolumetricEfficiencyPct) && !double.IsInfinity(result.VolumetricEfficiencyPct))
{ {
VolumetricEfficiencyPct = result.VolumetricEfficiencyPct; VolumetricEfficiencyPct = result.VolumetricEfficiencyPct;
if (VoltricEff != null)
{
VoltricEff.EngPvValue = VolumetricEfficiencyPct; VoltricEff.EngPvValue = VolumetricEfficiencyPct;
} }
}
return true; return true;
} }