sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sc/DyeingComputer:e7df26de58809e8042f1aecd9ea5eba407449c85
sc/DyeingComputer:master
..
compare: sc/DyeingComputer:42d69e89a53da84f36fbd08a5fcf956e740b9776
sc/DyeingComputer:master
2 Commits
e7df26de58 .. 42d69e89a5
Author SHA1 Message Date
sc 42d69e89a5 Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer 2025-05-25 15:05:13 +08:00
sc 1e977a940e 添加报警信息及数据库信息 2025-05-25 15:05:09 +08:00
9 changed files with 84 additions and 11 deletions
Expand all files Collapse all files

No files matched your search

DATA/800COMPUTER.db
BIN
View File
Binary file not shown.
DATA/Chart.db
BIN
View File
Binary file not shown.
DATA/LOG.db
BIN
View File
Binary file not shown.
Properties/Resources.Designer.cs
Generated
+27
View File
@@ -375,6 +375,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 EmergencyStop 的本地化字符串。
/// </summary>
public static string EmergencyStop {
get {
return ResourceManager.GetString("EmergencyStop", resourceCulture);
}
}
/// <summary>
/// 查找类似 End of program 的本地化字符串。
/// </summary>
@@ -429,6 +438,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Fault 的本地化字符串。
/// </summary>
public static string Fault {
get {
return ResourceManager.GetString("Fault", resourceCulture);
}
}
/// <summary>
/// 查找类似 Finish 的本地化字符串。
/// </summary>
@@ -744,6 +762,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 OtherCircuits 的本地化字符串。
/// </summary>
public static string OtherCircuits {
get {
return ResourceManager.GetString("OtherCircuits", resourceCulture);
}
}
/// <summary>
/// 查找类似 OutTheCloth 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+9
View File
@@ -528,4 +528,13 @@
<data name="Timeout" xml:space="preserve">
<value>Timeout</value>
</data>
<data name="EmergencyStop" xml:space="preserve">
<value>EmergencyStop</value>
</data>
<data name="OtherCircuits" xml:space="preserve">
<value>Other Circuits</value>
</data>
<data name="Fault" xml:space="preserve">
<value>Fault</value>
</data>
</root>
Properties/Resources.resx
+9
View File
@@ -528,4 +528,13 @@
<data name="Timeout" xml:space="preserve">
<value>Timeout</value>
</data>
<data name="EmergencyStop" xml:space="preserve">
<value>EmergencyStop</value>
</data>
<data name="OtherCircuits" xml:space="preserve">
<value>OtherCircuits</value>
</data>
<data name="Fault" xml:space="preserve">
<value>Fault</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+9
View File
@@ -528,4 +528,13 @@
<data name="Timeout" xml:space="preserve">
<value>超时</value>
</data>
<data name="EmergencyStop" xml:space="preserve">
<value>紧急停止</value>
</data>
<data name="OtherCircuits" xml:space="preserve">
<value>其它电路</value>
</data>
<data name="Fault" xml:space="preserve">
<value>故障</value>
</data>
</root>
Properties/Resources.zh-TW.resx
+10 -1
View File
@@ -526,6 +526,15 @@
<value>目前有運行工藝，是否開始新工藝</value>
</data>
<data name="Timeout" xml:space="preserve">
<value />
<value>超時</value>
</data>
<data name="EmergencyStop" xml:space="preserve">
<value>緊急停止</value>
</data>
<data name="OtherCircuits" xml:space="preserve">
<value>其它電路</value>
</data>
<data name="Fault" xml:space="preserve">
<value>故障</value>
</data>
</root>
ViewModel/MainWindowViewModel.cs
+20 -10
View File
@@ -367,20 +367,31 @@ namespace DyeingComputer.ViewModel
Alert_red = false;
Alert_bell = false;
}
if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160))
{ ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERE101"); } //温度故障提示
else { ERRinf.ERRinf_d(errTabler, "ERR101"); }
if (Selet_dtd("2001")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.EmergencyStop, "ERE100"); } //急停
else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
if (Selet_dtd("2008")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Blower, "ERE102"); } //风机
else { ERRinf.ERRinf_d(errTabler, "ERE102"); }
if (Selet_dtd("2009")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-0", "ERE103"); } //主泵
else { ERRinf.ERRinf_d(errTabler, "ERE103"); }
if (Selet_dtd("2012")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Wiggle, "ERE109"); } //摆布故障
else { ERRinf.ERRinf_d(errTabler, "ERE109"); }
if (Selet_dtd("2013")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.OtherCircuits, "ERE108"); } //其它电器故障
else { ERRinf.ERRinf_d(errTabler, "ERE108"); }
if (Selet_dtd("2014")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-1", "ERE104-1"); } //加料泵
else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
if (Selet_dtd("2015")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-2", "ERE104-2"); } //加料泵
else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
if (Selet_dtd("2016")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-3", "ERE104-3"); } //加料泵
else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
}
void Tick_Event_5S()//Tick_Event周期执行事件5S
{
if(WORK_RUN !=0) Chart();//写入记录
if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160))
{
ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERE101");
} //温度故障提示
else
{
ERRinf.ERRinf_d(errTabler, "ERR101");
}
if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))
{
if (Selet_dtm("1030") == 0)
@@ -469,7 +480,6 @@ namespace DyeingComputer.ViewModel
}
else { ERRinf.ERRinf_d(errTabler, "ERE110-11"); }
}//布轮11检测超时
if ((Selet_dtm("1057") > 0) && (Selet_dtd("3073") || Selet_dtd("3074")))
{
if (Selet_dtm("1058") == 0)