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

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

master
sc 2 months ago
parent
8b11146d06 6f835ea088
commit
ae2ddc1691
1 changed files with 63 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      ViewModel/MainWindowViewModel.cs

68
ViewModel/MainWindowViewModel.cs
View File

@ -32,6 +32,7 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Threading;
using TouchSocket.Sockets;
using static CommunityToolkit.Mvvm.ComponentModel.__Internals.__TaskExtensions.TaskAwaitableWithoutEndValidation;
using static DyeingComputer.UserClass.SqliteHelper;
using static DyeingComputer.ViewModel.MainWindowViewModel;
using static DyeingComputer.Windows.ViewStep;
@ -298,6 +299,8 @@ namespace DyeingComputer.ViewModel
private int MT41;//安全水位
private int MT42;//水洗排水阀
private int MT43;//水洗排水完成水位
private int MT44;
private int MT45;
private static int MU01;//呼叫操作员
public static string S01;//机台号
public static string S03;//设备组
@ -351,6 +354,8 @@ namespace DyeingComputer.ViewModel
MT41 = Convert.ToInt16(Selet_con("MT41"));//
MT42 = Convert.ToInt16(Selet_con("MT42"));//
MT43 = Convert.ToInt16(Selet_con("MT43"));//
MT44 = Convert.ToInt16(Selet_con("MT44"));//
MT45 = Convert.ToInt16(Selet_con("MT45"));//
MU01 = Convert.ToInt16(Selet_con("MU01"));//呼叫操作员
MS01 = Convert.ToDouble(Selet_con("MS01"));
MS02 = Convert.ToDouble(Selet_con("MS02"));
@ -384,6 +389,7 @@ namespace DyeingComputer.ViewModel
UserButton = true;
IsInteractive = true;
WORK_RUN = 1;// 运行时停止键为暂停
errTabler.Clear();
APILog.LOGlog(WorkNumder.ToString(), "UserActions", "WORK_RUN = Pause", WORK_RUN.ToString());
}
else
@ -723,14 +729,14 @@ namespace DyeingComputer.ViewModel
case "020":
STEP_P1 = Convert.ToDouble(P1);
STEP_P2 = Convert.ToDouble(P2);
STEP_TIME = Convert.ToInt16(MT05); //排水倒计时
STEP_P3 = Convert.ToInt16(MT05); //排水倒计时
SETP_runtime = true;
STEP_finish = false;
break;
case "022":
STEP_P1 = Convert.ToDouble(P1);
STEP_P2 = Convert.ToDouble(P2);
STEP_TIME = Convert.ToInt16(MT06); //动力排水倒计时
STEP_P3 = Convert.ToInt16(MT06); //动力排水倒计时
SETP_runtime = true;
STEP_finish = false;
break;
@ -785,12 +791,14 @@ namespace DyeingComputer.ViewModel
case "050":
STEP_P1 = Convert.ToDouble(P1);
STEP_P2 = Convert.ToDouble(P2);
STEP_TIME = 0;
SETP_runtime = true;
STEP_finish = false;
break;//主缸加压
case "051":
STEP_P1 = Convert.ToDouble(P1);
STEP_P2 = Convert.ToDouble(P2);
STEP_TIME = 0;
SETP_runtime = true;
STEP_finish = false;
break;//主缸减压
@ -1042,9 +1050,21 @@ namespace DyeingComputer.ViewModel
Updata_dtd("3014", false);
Updata_dtd("3015", false);
Updata_dtd("3016", false);
ERRinf.ERRinf_d(errTabler, "202");//
if (errTabler.Rows.Count == 0) Status_Str = Resources.AddWater + ":" + Resources.Finish;
STEP_finish = true;
}
else
{
if (STEP_TIME > MT44)
{
ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Abnormal + "]", "202");//写入
}
else
{
STEP_TIME++;
}
}
break;//液位入水
case "008":
if (STEP_P1.ToString() == "1")
@ -1075,9 +1095,21 @@ namespace DyeingComputer.ViewModel
Updata_dtd("3014", false);
Updata_dtd("3015", false);
Updata_dtd("3016", false);
ERRinf.ERRinf_d(errTabler, "202");//
if (errTabler.Rows.Count == 0) Status_Str = Resources.AddWater + ":" + Resources.Finish;
STEP_finish = true;
}
else
{
if (STEP_TIME > MT44)
{
ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Abnormal + "]", "202");//写入
}
else
{
STEP_TIME++;
}
}
break;//流量入水
case "013":
if (STEP_P4 > 0)
@ -1213,7 +1245,8 @@ namespace DyeingComputer.ViewModel
if (Selet_dtm("1015") <= STEP_P2) //排水状态完成
{
if (STEP_TIME <= 0)//排水延时
ERRinf.ERRinf_d(errTabler, "203");//
if (STEP_P3 <= 0)//排水延时
{
Updata_dtd("3017", false);
Updata_dtd("3018", false);
@ -1223,10 +1256,21 @@ namespace DyeingComputer.ViewModel
}
else
{
STEP_TIME--; //排水延时计时
STEP_P3--; //排水延时计时
if (errTabler.Rows.Count == 0) Status_Str = Resources.Drainage + ":" + Resources.Time + STEP_TIME;
}
}
else
{
if (STEP_TIME > MT45)
{
ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Abnormal + "]", "203");//写入
}
else
{
STEP_TIME++;
}
}
break;//排水
case "022":
if (STEP_P1.ToString() == "1")
@ -1249,7 +1293,8 @@ namespace DyeingComputer.ViewModel
Updata_dtd("3020", true);//开排水泵
if (Selet_dtm("1015") <= STEP_P2) //排水状态完成
{
if (STEP_TIME <= 0)//排水延时
ERRinf.ERRinf_d(errTabler, "203");//
if (STEP_P3 <= 0)//排水延时
{
Updata_dtd("3017", false);
Updata_dtd("3018", false);
@ -1260,10 +1305,21 @@ namespace DyeingComputer.ViewModel
}
else
{
STEP_TIME--; //排水延时计时
STEP_P3--; //排水延时计时
if (errTabler.Rows.Count == 0) Status_Str = Resources.Drainage + ":" + Resources.Time + STEP_TIME;
}
}
else
{
if (STEP_TIME > MT45)
{
ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Abnormal + "]", "203");//写入
}
else
{
STEP_TIME++;
}
}
break;//动力排水
case "031":
if (STEP_TIME <= 0)

Write Preview
Loading…
Cancel
Save