Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
sc committed
commit
9f29b8d505
2 files changed
+71
-72
No files matched your search
@@ -333,7 +333,7 @@ namespace DyeingComputer.View
|
||||
}
|
||||
else
|
||||
{
|
||||
MainWindowViewModel.RUN_DATATABLE = sql.Tables[0];//缓存表
|
||||
// MainWindowViewModel.RUN_DATATABLE = sql.Tables[0];//缓存表
|
||||
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(ID);//插入步骤号
|
||||
MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));
|
||||
}
|
||||
|
||||
@@ -362,31 +362,31 @@ namespace DyeingComputer.ViewModel
|
||||
Alert_red = true;
|
||||
Alert_bell = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Alert_red = false;
|
||||
Alert_bell = false;
|
||||
}
|
||||
|
||||
Updata_dtd("3001", Alert_red);
|
||||
Updata_dtd("3003", Alert_yellow);
|
||||
Updata_dtd("3004", Alert_bell);
|
||||
|
||||
|
||||
if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160))
|
||||
{ ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERE101"); } //温度故障提示
|
||||
{ ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERR101"); } //温度故障提示
|
||||
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"); }
|
||||
if (Selet_dtd("2001")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.EmergencyStop, "ERR100"); } //急停
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR100"); }
|
||||
if (Selet_dtd("2008")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Blower, "ERR102"); } //风机
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR102"); }
|
||||
if (Selet_dtd("2009")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-0", "ERR103"); } //主泵
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR103"); }
|
||||
if (Selet_dtd("2012")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Wiggle, "ERR109"); } //摆布故障
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR109"); }
|
||||
if (Selet_dtd("2013")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.OtherCircuits, "ERR108"); } //其它电器故障
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR108"); }
|
||||
if (Selet_dtd("2014")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-1", "ERR104-1"); } //加料泵
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR100"); }
|
||||
if (Selet_dtd("2015")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-2", "ERR104-2"); } //加料泵
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR100"); }
|
||||
if (Selet_dtd("2016")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-3", "ERR104-3"); } //加料泵
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR100"); }
|
||||
}
|
||||
void Tick_Event_5S()//Tick_Event周期执行事件5S
|
||||
{
|
||||
@@ -396,97 +396,97 @@ namespace DyeingComputer.ViewModel
|
||||
{
|
||||
if (Selet_dtm("1030") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "1 :" + Resources.Timeout, "ERE110-1");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "1 :" + Resources.Timeout, "ERR110-1");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-1"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-1"); }
|
||||
}//布轮1检测超时
|
||||
if ((Selet_dtm("1026") > 0) && (Selet_dtd("3023") || Selet_dtd("3024")))
|
||||
{
|
||||
if (Selet_dtm("1031") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "2 :" + Resources.Timeout, "ERE110-2");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "2 :" + Resources.Timeout, "ERR110-2");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-2"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-2"); }
|
||||
}//布轮2检测超时
|
||||
if ((Selet_dtm("1027") > 0) && (Selet_dtd("3025") || Selet_dtd("3026")))
|
||||
{
|
||||
if (Selet_dtm("1032") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "3 :" + Resources.Timeout, "ERE110-3");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "3 :" + Resources.Timeout, "ERR110-3");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-3"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-3"); }
|
||||
}//布轮3检测超时
|
||||
if ((Selet_dtm("1028") > 0) && (Selet_dtd("3027") || Selet_dtd("3028")))
|
||||
{
|
||||
if (Selet_dtm("1033") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "4 :" + Resources.Timeout, "ERE110-4");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "4 :" + Resources.Timeout, "ERR110-4");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-4"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-4"); }
|
||||
}//布轮4检测超时
|
||||
if ((Selet_dtm("1029") > 0) && (Selet_dtd("3029") || Selet_dtd("3030")))
|
||||
{
|
||||
if (Selet_dtm("1034") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "5 :" + Resources.Timeout, "ERE110-5");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "5 :" + Resources.Timeout, "ERR110-5");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-5"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-5"); }
|
||||
}//布轮5检测超时
|
||||
if ((Selet_dtm("1035") > 0) && (Selet_dtd("3031") || Selet_dtd("3022")))
|
||||
{
|
||||
if (Selet_dtm("1036") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "6 :" + Resources.Timeout, "ERE110-6");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "6 :" + Resources.Timeout, "ERR110-6");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-6"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-6"); }
|
||||
}//布轮6检测超时
|
||||
if ((Selet_dtm("1037") > 0) && (Selet_dtd("3033") || Selet_dtd("3034")))
|
||||
{
|
||||
if (Selet_dtm("1038") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "7 :" + Resources.Timeout, "ERE110-7");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "7 :" + Resources.Timeout, "ERR110-7");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-7"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-7"); }
|
||||
}//布轮7检测超时
|
||||
if ((Selet_dtm("1039") > 0) && (Selet_dtd("3065") || Selet_dtd("3066")))
|
||||
{
|
||||
if (Selet_dtm("1040") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "8 :" + Resources.Timeout, "ERE110-8");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "8 :" + Resources.Timeout, "ERR110-8");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-8"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-8"); }
|
||||
}//布轮8检测超时
|
||||
if ((Selet_dtm("1051") > 0) && (Selet_dtd("3067") || Selet_dtd("3068")))
|
||||
{
|
||||
if (Selet_dtm("1052") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "9 :" + Resources.Timeout, "ERE110-9");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "9 :" + Resources.Timeout, "ERR110-9");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-9"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-9"); }
|
||||
}//布轮9检测超时
|
||||
if ((Selet_dtm("1053") > 0) && (Selet_dtd("3069") || Selet_dtd("3070")))
|
||||
{
|
||||
if (Selet_dtm("1054") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "10 :" + Resources.Timeout, "ERE110-10");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "10 :" + Resources.Timeout, "ERR110-10");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-10"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-10"); }
|
||||
}//布轮10检测超时
|
||||
if ((Selet_dtm("1055") > 0) && (Selet_dtd("3071") || Selet_dtd("3072")))
|
||||
if ((Selet_dtm("1055") > 0) && (Selet_dtd("3071") || Selet_dtd("3072")))
|
||||
{
|
||||
if (Selet_dtm("1056") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "11 :" + Resources.Timeout, "ERE110-11");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "11 :" + Resources.Timeout, "ERR110-11");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-11"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-11"); }
|
||||
}//布轮11检测超时
|
||||
if ((Selet_dtm("1057") > 0) && (Selet_dtd("3073") || Selet_dtd("3074")))
|
||||
{
|
||||
if (Selet_dtm("1058") == 0)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "12 :" + Resources.Timeout, "ERE110-12");
|
||||
ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "12 :" + Resources.Timeout, "ERR110-12");
|
||||
}
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERE110-12"); }
|
||||
else { ERRinf.ERRinf_d(errTabler, "ERR110-12"); }
|
||||
}//布轮12检测超时
|
||||
}
|
||||
void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件200MS
|
||||
@@ -499,7 +499,6 @@ namespace DyeingComputer.ViewModel
|
||||
|
||||
if (LINK_OK) IO_data();
|
||||
|
||||
|
||||
}
|
||||
|
||||
void Chart()
|
||||
@@ -773,7 +772,7 @@ namespace DyeingComputer.ViewModel
|
||||
TIME_M = (STEP_TIME - TIME_H * 3600) / 60;
|
||||
TIME_S = STEP_TIME - TIME_H * 3600 - TIME_M * 60;
|
||||
if (errTabler.Rows.Count==0) Status_Str = Resources.Heat_insulating + ":" + Resources.Time + string.Format(" {0:D2}", TIME_H) + ":" + string.Format(" {0:D2}", TIME_M) + ":" + string.Format(" {0:D2}", TIME_S);
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
STEP_finish = true;
|
||||
Updata_dtm("1004", 0);
|
||||
@@ -996,7 +995,7 @@ namespace DyeingComputer.ViewModel
|
||||
|
||||
if (Selet_dtm("1015") <= STEP_P2) //排水状态完成
|
||||
{
|
||||
if (STEP_TIME == 0)//排水延时
|
||||
if (STEP_TIME <= 0)//排水延时
|
||||
{
|
||||
Updata_dtd("3016", false);
|
||||
Updata_dtd("3017", false);
|
||||
@@ -1038,7 +1037,7 @@ namespace DyeingComputer.ViewModel
|
||||
Updata_dtd("3019", true);//开排水泵
|
||||
if (Selet_dtm("1015") <= STEP_P2) //排水状态完成
|
||||
{
|
||||
if (STEP_TIME == 0)//排水延时
|
||||
if (STEP_TIME <= 0)//排水延时
|
||||
{
|
||||
Updata_dtd("3016", false);
|
||||
Updata_dtd("3017", false);
|
||||
@@ -1055,7 +1054,7 @@ namespace DyeingComputer.ViewModel
|
||||
}
|
||||
break;//动力排水
|
||||
case "031":
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
STEP_finish = true;
|
||||
}
|
||||
@@ -1068,7 +1067,7 @@ namespace DyeingComputer.ViewModel
|
||||
}
|
||||
break;//运转时间
|
||||
case "035":
|
||||
if (Selet_dtd("2003"))
|
||||
if (Selet_dtd("2004"))
|
||||
{
|
||||
STEP_finish = true;
|
||||
Alert_yellow = false;
|
||||
@@ -1076,20 +1075,20 @@ namespace DyeingComputer.ViewModel
|
||||
else
|
||||
{
|
||||
Alert_yellow = true;
|
||||
STEP_TIME--;
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
Alert_bell = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
STEP_TIME--;
|
||||
Alert_bell = true;
|
||||
}
|
||||
}
|
||||
if (errTabler.Rows.Count == 0) Status_Str = Resources.ClothIntake;
|
||||
break;//准备入布
|
||||
case "036":
|
||||
if (Selet_dtd("2003"))
|
||||
if (Selet_dtd("2004"))
|
||||
{
|
||||
STEP_finish = true;
|
||||
Alert_yellow = false;
|
||||
@@ -1097,20 +1096,20 @@ namespace DyeingComputer.ViewModel
|
||||
else
|
||||
{
|
||||
Alert_yellow = true;
|
||||
STEP_TIME--;
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
Alert_bell = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
STEP_TIME--;
|
||||
Alert_bell = true;
|
||||
}
|
||||
}
|
||||
if (errTabler.Rows.Count == 0) Status_Str = Resources.OutTheCloth;
|
||||
break;//准备出布
|
||||
case "039":
|
||||
if (Selet_dtd("2003"))
|
||||
if (Selet_dtd("2004"))
|
||||
{
|
||||
STEP_finish = true;
|
||||
Alert_yellow = false;
|
||||
@@ -1118,20 +1117,20 @@ namespace DyeingComputer.ViewModel
|
||||
else
|
||||
{
|
||||
Alert_yellow = true;
|
||||
STEP_TIME--;
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
Alert_bell = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
STEP_TIME--;
|
||||
Alert_bell = true;
|
||||
}
|
||||
}
|
||||
if (errTabler.Rows.Count == 0) Status_Str = Resources.CallWorkers;
|
||||
break;//呼叫人工
|
||||
case "040":
|
||||
if (Selet_dtd("2003"))
|
||||
if (Selet_dtd("2004"))
|
||||
{
|
||||
STEP_finish = true;
|
||||
Alert_yellow = false;
|
||||
@@ -1139,13 +1138,13 @@ namespace DyeingComputer.ViewModel
|
||||
else
|
||||
{
|
||||
Alert_yellow = true;
|
||||
STEP_TIME--;
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
Alert_bell = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
STEP_TIME--;
|
||||
Alert_bell = true;
|
||||
}
|
||||
}
|
||||
@@ -1156,7 +1155,7 @@ namespace DyeingComputer.ViewModel
|
||||
if (errTabler.Rows.Count == 0) Status_Str = Resources.End;
|
||||
break;//结束
|
||||
case "049":
|
||||
if (Selet_dtd("2003"))
|
||||
if (Selet_dtd("2004"))
|
||||
{
|
||||
STEP_finish = true;
|
||||
Alert_yellow = false;
|
||||
@@ -1165,7 +1164,7 @@ namespace DyeingComputer.ViewModel
|
||||
{
|
||||
Alert_yellow = true;
|
||||
STEP_TIME--;
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
Alert_bell = false;
|
||||
}
|
||||
@@ -1194,7 +1193,7 @@ namespace DyeingComputer.ViewModel
|
||||
Updata_dtd("3011", true);//主泵启动
|
||||
if (S16 == 1) Updata_dtd("3012", true);//风机启动
|
||||
STEP_TIME--;
|
||||
if (STEP_TIME == 0)
|
||||
if (STEP_TIME <= 0)
|
||||
{
|
||||
STEP_finish = true;
|
||||
}
|
||||
@@ -1227,7 +1226,7 @@ namespace DyeingComputer.ViewModel
|
||||
{
|
||||
Updata_dtd("3039",false);
|
||||
|
||||
if (Selet_dtd("2003"))//投料确认
|
||||
if (Selet_dtd("2004"))//投料确认
|
||||
{
|
||||
if (STEP_TIME <= 0)//搅拌
|
||||
{
|
||||
@@ -1277,7 +1276,7 @@ namespace DyeingComputer.ViewModel
|
||||
{
|
||||
Updata_dtd("3049", false);
|
||||
|
||||
if (Selet_dtd("2003"))//投料确认
|
||||
if (Selet_dtd("2004"))//投料确认
|
||||
{
|
||||
if (STEP_TIME <= 0)//搅拌
|
||||
{
|
||||
@@ -1327,7 +1326,7 @@ namespace DyeingComputer.ViewModel
|
||||
{
|
||||
Updata_dtd("3059", false);
|
||||
|
||||
if (Selet_dtd("2003"))//投料确认
|
||||
if (Selet_dtd("2004"))//投料确认
|
||||
{
|
||||
if (STEP_TIME <= 0)//搅拌
|
||||
{
|
||||
@@ -1532,7 +1531,7 @@ namespace DyeingComputer.ViewModel
|
||||
if (STEP_finish)
|
||||
{
|
||||
RUN_STEPID++;
|
||||
DataRow[] arrRows = RUN_DATATABLE.Select("STEP ='" + RUN_STEPID + "'");
|
||||
DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
|
||||
string T_ID = arrRows[0]["StepID"].ToString();
|
||||
double T_P1 = Convert.ToDouble(arrRows[0]["Parameter1"].ToString());
|
||||
double T_P2 = Convert.ToDouble(arrRows[0]["Parameter2"].ToString());
|
||||
|
||||
Reference in new issue
Block a user