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

Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

Browse Source
This commit is contained in:
sc committed 2025-08-19 23:28:32 +08:00
2 parents ae2ddc1691 0401dea0df
commit 1069a43cf4
2 files changed
+207 -217
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ViewModel/MainWindowViewModel.cs
+204 -207
View File
@@ -1859,242 +1859,239 @@ namespace DyeingComputer.ViewModel
{ {
if (WORK_RUN == 2) if (WORK_RUN == 2)
{ {
switch (STEP_ID) switch (STEP_ID)
{ {
case "015": case "015":
break;//溢流水洗 break;//溢流水洗
case "017": case "017":
break;//降温水洗 break;//降温水洗
case "064": case "064":
if ((STEP_P1 == 1) || (STEP_P1 == 0)) if ((STEP_P1 == 1) || (STEP_P1 == 0))
{
if (Selet_dtm("1017") >= STEP_P3)//水位
{ {
if (Selet_dtm("1017") >= STEP_P3)//水位 TANK1 = Resources.Ready;
Updata_dtd("3036", false);
Updata_dtd("3037", false);
Updata_dtd("3038", false);
if (Selet_dtm("1012") >= STEP_P4)//温度
{ {
TANK1 = Resources.Ready; Updata_dtd("3039", false);
Updata_dtd("3036", false);
Updata_dtd("3037", false);
Updata_dtd("3038", false);
if (Selet_dtm("1012") >= STEP_P4)//温度 if (Selet_dtd("2004"))//投料确认
{ {
Updata_dtd("3039", false); if (STEP_TIME <= 0)//搅拌
if (Selet_dtd("2004"))//投料确认
{ {
if (STEP_TIME <= 0)//搅拌 TANK1 = Resources.Ready + Resources.Finish;
{ Updata_dtd("3040", false);
TANK1 = Resources.Ready + Resources.Finish;
Updata_dtd("3040", false);
}
else
{
STEP_TIME--;
Updata_dtd("3040", true);
}
Alert_yellow = false;
Alert_bell = false;
} }
else else
{ {
Alert_yellow = true; STEP_TIME--;
STEP_TIME = Convert.ToInt16(STEP_P5); Updata_dtd("3040", true);
Alert_bell = true;
} }
Alert_yellow = false;
Alert_bell = false;
} }
else else
{ {
Updata_dtd("3039", true); Alert_yellow = true;
Updata_dtd("3040", true); STEP_TIME = Convert.ToInt16(STEP_P5);
Alert_bell = true;
} }
} }
else else
{ {
if (STEP_P2 == 0) Updata_dtd("3038", true); Updata_dtd("3039", true);
else if (STEP_P2 == 1) Updata_dtd("3036", true); Updata_dtd("3040", true);
else if (STEP_P2 == 2) Updata_dtd("3037", true);
} }
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 1 :" + Resources.Ready;
} //药缸1
else if (STEP_P1 == 2)
{
if (Selet_dtm("1018") >= STEP_P3)//水位
{
TANK2 = Resources.Ready;
Updata_dtd("3046", false);
Updata_dtd("3047", false);
Updata_dtd("3048", false);
if (Selet_dtm("1013") >= STEP_P4)//温度
{
Updata_dtd("3049", false);
if (Selet_dtd("2004"))//投料确认
{
if (STEP_TIME <= 0)//搅拌
{
TANK2 = Resources.Ready + Resources.Finish;
Updata_dtd("3050", false);
}
else
{
STEP_TIME--;
Updata_dtd("3050", true);
}
Alert_yellow = false;
Alert_bell = false;
}
else
{
Alert_yellow = true;
STEP_TIME = Convert.ToInt16(STEP_P5);
Alert_bell = true;
}
}
else
{
Updata_dtd("3049", true);
Updata_dtd("3050", true);
}
}
else
{
if (STEP_P2 == 0) Updata_dtd("3048", true);
else if (STEP_P2 == 1) Updata_dtd("3046", true);
else if (STEP_P2 == 2) Updata_dtd("3047", true);
}
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 2 :" + Resources.Ready;
}//药缸2
else if (STEP_P1 == 3)
{
if (Selet_dtm("1019") >= STEP_P3)//水位
{
TANK3 = Resources.Ready;
Updata_dtd("3056", false);
Updata_dtd("3057", false);
Updata_dtd("3058", false);
if (Selet_dtm("1014") >= STEP_P4)//温度
{
Updata_dtd("3059", false);
if (Selet_dtd("2004"))//投料确认
{
if (STEP_TIME <= 0)//搅拌
{
TANK3 = Resources.Ready + Resources.Finish;
Updata_dtd("3060", false);
}
else
{
STEP_TIME--;
Updata_dtd("3060", true);
}
Alert_yellow = false;
Alert_bell = false;
}
else
{
Alert_yellow = true;
STEP_TIME = Convert.ToInt16(STEP_P5);
Alert_bell = true;
}
}
else
{
Updata_dtd("3059", true);
Updata_dtd("3060", true);
}
}
else
{
if (STEP_P2 == 0) Updata_dtd("3058", true);
else if (STEP_P2 == 1) Updata_dtd("3056", true);
else if (STEP_P2 == 2) Updata_dtd("3057", true);
}
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 3 :" + Resources.Ready;
}//药缸3
break;//药缸备药
case "066":
if (STEP_P1 == 1)
{
TANK1_REDYE = SYS_REDYE;
if (string.IsNullOrEmpty(TANK1_DYELOT)) TANK1_DYELOT = WorkNumder.ToString();
TANK1_STEP = Convert.ToInt16(STEP_P3);
FeedingRecords(work_Numder, TANK1_DYELOT, Convert.ToInt16(STEP_P1), TANK1_STEP, Convert.ToInt16(STEP_P2));//调用呼叫
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 1 :" + Resources.CallDistribution;
STEP_finish = true;
} //药缸1
else if (STEP_P1 == 2)
{
TANK2_REDYE = SYS_REDYE;
if (string.IsNullOrEmpty(TANK2_DYELOT)) TANK2_DYELOT = WorkNumder.ToString();
TANK2_STEP = Convert.ToInt16(STEP_P3);
FeedingRecords(work_Numder, TANK2_DYELOT, Convert.ToInt16(STEP_P1), TANK2_STEP, Convert.ToInt16(STEP_P2));//调用呼叫
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 2 :" + Resources.CallDistribution;
STEP_finish = true;
}//药缸2
else if (STEP_P1 == 3)
{
TANK3_REDYE = SYS_REDYE;
if (string.IsNullOrEmpty(TANK3_DYELOT)) TANK3_DYELOT = WorkNumder.ToString();
TANK3_STEP = Convert.ToInt16(STEP_P3);
FeedingRecords(work_Numder, TANK3_DYELOT, Convert.ToInt16(STEP_P1), TANK3_STEP, Convert.ToInt16(STEP_P2));//调用呼叫
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 3 :" + Resources.CallDistribution;
STEP_finish = true;
}//药缸3
//STEP_finish = true;
break;//呼叫输送
case "067":
break;//等待输送
case "090":
if (((STEP_P1 - 1) < Selet_dtm("1010")) && (Selet_dtm("1010") < (STEP_P1 + 1))) PH_start = true;//达到温度开始ph控制
if (PH_start)
{
if (STEP_P2 >= Selet_dtm("1009"))
{
PH_start = false;
STEP_finish = true;
}
if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHControl + "(" + Selet_dtm("1009") + "pH)";
} }
else else
{ {
if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHControl + "(" + Resources.Await + Resources.Temperature + ")"; if (STEP_P2 == 0) Updata_dtd("3038", true);
else if (STEP_P2 == 1) Updata_dtd("3036", true);
else if (STEP_P2 == 2) Updata_dtd("3037", true);
} }
break;//快速加酸 if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 1 :" + Resources.Ready;
case "091": } //药缸1
else if (STEP_P1 == 2)
{
if (Selet_dtm("1018") >= STEP_P3)//水位
{
TANK2 = Resources.Ready;
Updata_dtd("3046", false);
Updata_dtd("3047", false);
Updata_dtd("3048", false);
if (Selet_dtm("1013") >= STEP_P4)//温度
{
Updata_dtd("3049", false);
if (Selet_dtd("2004"))//投料确认
{
if (STEP_TIME <= 0)//搅拌
{
TANK2 = Resources.Ready + Resources.Finish;
Updata_dtd("3050", false);
}
else
{
STEP_TIME--;
Updata_dtd("3050", true);
}
Alert_yellow = false;
Alert_bell = false;
}
else
{
Alert_yellow = true;
STEP_TIME = Convert.ToInt16(STEP_P5);
Alert_bell = true;
}
}
else
{
Updata_dtd("3049", true);
Updata_dtd("3050", true);
}
}
else
{
if (STEP_P2 == 0) Updata_dtd("3048", true);
else if (STEP_P2 == 1) Updata_dtd("3046", true);
else if (STEP_P2 == 2) Updata_dtd("3047", true);
}
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 2 :" + Resources.Ready;
}//药缸2
else if (STEP_P1 == 3)
{
if (Selet_dtm("1019") >= STEP_P3)//水位
{
TANK3 = Resources.Ready;
Updata_dtd("3056", false);
Updata_dtd("3057", false);
Updata_dtd("3058", false);
if (Selet_dtm("1014") >= STEP_P4)//温度
{
Updata_dtd("3059", false);
if (Selet_dtd("2004"))//投料确认
{
if (STEP_TIME <= 0)//搅拌
{
TANK3 = Resources.Ready + Resources.Finish;
Updata_dtd("3060", false);
}
else
{
STEP_TIME--;
Updata_dtd("3060", true);
}
Alert_yellow = false;
Alert_bell = false;
}
else
{
Alert_yellow = true;
STEP_TIME = Convert.ToInt16(STEP_P5);
Alert_bell = true;
}
}
else
{
Updata_dtd("3059", true);
Updata_dtd("3060", true);
}
}
else
{
if (STEP_P2 == 0) Updata_dtd("3058", true);
else if (STEP_P2 == 1) Updata_dtd("3056", true);
else if (STEP_P2 == 2) Updata_dtd("3057", true);
}
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 3 :" + Resources.Ready;
}//药缸3
break;//药缸备药
case "066":
if (STEP_P1 == 1)
{
TANK1_REDYE = SYS_REDYE;
if (string.IsNullOrEmpty(TANK1_DYELOT)) TANK1_DYELOT = WorkNumder.ToString();
TANK1_STEP = Convert.ToInt16(STEP_P3);
FeedingRecords(work_Numder, TANK1_DYELOT, Convert.ToInt16(STEP_P1), TANK1_STEP, Convert.ToInt16(STEP_P2));//调用呼叫
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 1 :" + Resources.CallDistribution;
STEP_finish = true;
} //药缸1
else if (STEP_P1 == 2)
{
TANK2_REDYE = SYS_REDYE;
if (string.IsNullOrEmpty(TANK2_DYELOT)) TANK2_DYELOT = WorkNumder.ToString();
TANK2_STEP = Convert.ToInt16(STEP_P3);
FeedingRecords(work_Numder, TANK2_DYELOT, Convert.ToInt16(STEP_P1), TANK2_STEP, Convert.ToInt16(STEP_P2));//调用呼叫
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 2 :" + Resources.CallDistribution;
STEP_finish = true;
}//药缸2
else if (STEP_P1 == 3)
{
TANK3_REDYE = SYS_REDYE;
if (string.IsNullOrEmpty(TANK3_DYELOT)) TANK3_DYELOT = WorkNumder.ToString();
TANK3_STEP = Convert.ToInt16(STEP_P3);
FeedingRecords(work_Numder, TANK3_DYELOT, Convert.ToInt16(STEP_P1), TANK3_STEP, Convert.ToInt16(STEP_P2));//调用呼叫
if (errTabler.Rows.Count == 0) Status_Str = Resources.Tank + " 3 :" + Resources.CallDistribution;
STEP_finish = true;
}//药缸3
//STEP_finish = true;
break;//呼叫输送
case "067":
break;//等待输送
case "090":
if (((STEP_P1 - 1) < Selet_dtm("1010")) && (Selet_dtm("1010") < (STEP_P1 + 1))) PH_start = true;//达到温度开始ph控制
if (PH_start)
{
if (STEP_P2 >= Selet_dtm("1009")) if (STEP_P2 >= Selet_dtm("1009"))
{ {
PH_start = false; PH_start = false;
STEP_finish = true; STEP_finish = true;
} }
else if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHControl + "(" + Selet_dtm("1009") + "pH)";
{ }
PH_start = true; else
Status_Str = Status_Str + "(" + Selet_dtm("1009") + "pH)"; {
} if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHControl + "(" + Resources.Await + Resources.Temperature + ")";
break;//PH温度控制 }
case "093": break;//快速加酸
if (STEP_TIME <= 0) case "091":
{ if (STEP_P2 >= Selet_dtm("1009"))
STEP_finish = true; {
} PH_start = false;
else STEP_finish = true;
{ }
STEP_TIME--; else
} {
if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHDetection + "(" + STEP_TIME + ")"; PH_start = true;
break;//PH检测 Status_Str = Status_Str + "(" + Selet_dtm("1009") + "pH)";
default: }
break; break;//PH温度控制
} case "093":
if (STEP_TIME <= 0)
{
STEP_finish = true;
}
else
{
STEP_TIME--;
}
if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHDetection + "(" + STEP_TIME + ")";
break;//PH检测
default:
break;
}
} }
} }
public static bool CALL_FR = false;//呼叫状态 public static bool CALL_FR = false;//呼叫状态
string SK5; string SK5;
Windows/ViewStep.xaml.cs
+3 -10
View File
@@ -340,10 +340,9 @@ namespace DyeingComputer.Windows
} }
private readonly string[] id_dat = {"001","007","008","013","015" ,"017", "020", "022", "031", "035", private readonly string[] id_dat = {"001","007","008","013","015" , "020", "022", "031", "035",
"036", "039", "040", "041", "049", "050", "051", "054", "055", "056","064","065","066","067","090", "036", "039", "040", "041", "049", "050", "051", "054", "055", "056","064","065","066","067"};
"091","093","094" }; private readonly string[] id_datp = {" " ,"017", "050", "051", "064", "066","067","090","091",
private readonly string[] id_datp = {" ","015" ,"017", "050", "051", "064", "066","067","090","091",
"093","094" }; "093","094" };
private void Form1_Load() private void Form1_Load()
@@ -353,7 +352,6 @@ namespace DyeingComputer.Windows
this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.Flowmeter + ")");//流量进水008 this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.Flowmeter + ")");//流量进水008
this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.WaterLevel + ")");//水位水洗013 this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.WaterLevel + ")");//水位水洗013
this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015 this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015
this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
this.boxID.Items.Add(Properties.Resources.Drainage);//排水020 this.boxID.Items.Add(Properties.Resources.Drainage);//排水020
this.boxID.Items.Add(Properties.Resources.PumpDrainage);//主泵排水022 this.boxID.Items.Add(Properties.Resources.PumpDrainage);//主泵排水022
this.boxID.Items.Add(Properties.Resources.RunningTime);//运转031 this.boxID.Items.Add(Properties.Resources.RunningTime);//运转031
@@ -372,14 +370,9 @@ namespace DyeingComputer.Windows
this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065 this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
this.boxID.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066 this.boxID.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066
this.boxID.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067 this.boxID.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067
this.boxID.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
this.boxID.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
this.boxID.Items.Add(Properties.Resources.PHDetection);//ph检测093
this.boxID.Items.Add(Properties.Resources.PHControl);//ph控制094
this.boxIDp.Items.Add("");// this.boxIDp.Items.Add("");//
this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015
this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017 this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
this.boxIDp.Items.Add(Properties.Resources.Pressurized);//加压050 this.boxIDp.Items.Add(Properties.Resources.Pressurized);//加压050
this.boxIDp.Items.Add(Properties.Resources.Depressurized);//减压051 this.boxIDp.Items.Add(Properties.Resources.Depressurized);//减压051