Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
62bea59ed1
6 files changed
+38
-2
No files matched your search
@@ -930,12 +930,15 @@ namespace DyeingComputer.ViewModel
|
||||
}
|
||||
if (Pump_M) //主泵状态
|
||||
{
|
||||
Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStart+"]";//主泵状态
|
||||
Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStart+"]";//主泵状态
|
||||
}
|
||||
else
|
||||
{
|
||||
Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStops+"]";//主泵状态
|
||||
Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStops+"]";//主泵状态
|
||||
}
|
||||
Sys_log = Sys_log + "\n-------------------------------------------------------";
|
||||
Sys_log = Sys_log + "\n" + Resources.ClothWheel;
|
||||
|
||||
}
|
||||
|
||||
public static DataTable dt_d = new DataTable("DIO");
|
||||
|
||||
Reference in new issue
Block a user