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

添加取样页面及相关资源

Browse Source
This commit is contained in:
sc committed 2025-08-01 15:09:47 +08:00
2 parents 928dc8099d ab45c593df
commit e1a567d1f7
12 files changed
+178 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ViewModel/MainWindowViewModel.cs
+30 -5
View File
@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.Input;
using DyeingComputer.Properties;
using DyeingComputer.UserClass;
using DyeingComputer.View;
using DyeingComputer.Windows;
using Microsoft.Win32;
using Newtonsoft.Json.Linq;
using NModbus;
@@ -82,6 +83,7 @@ namespace DyeingComputer.ViewModel
public static UInt32 TX = 0;
public static int UserInfoStart = 900;
public static string UserInfo;
public static bool UserCall_OK = false;
public ICommand ProgramgroupView_stop { get; }
bool _isInteractive;
public bool IsInteractive//步骤表交互选择
@@ -306,6 +308,8 @@ namespace DyeingComputer.ViewModel
public static string S06;//通讯编码
public static int S16;//风机联动
public static int S17;//
public static int S19;//
public static int S20;//
public static int SM01;//副缸
public static int SM02;//副缸
public static int SM03;//副缸
@@ -363,6 +367,8 @@ namespace DyeingComputer.ViewModel
S05 = Selet_sys("S05");//
S06 = Selet_sys("S06");//
S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息
S19 = Convert.ToInt16(Selet_sys("S19"));//工作信息
S20 = Convert.ToInt16(Selet_sys("S20"));//工作信息
MI01 = Convert.ToInt16(Selet_sys("MI01"));//工作信息
MI02 = Convert.ToInt16(Selet_sys("MI02"));//工作信息
MI03 = Convert.ToInt16(Selet_sys("MI03"));//工作信息
@@ -653,6 +659,10 @@ namespace DyeingComputer.ViewModel
static Dictionary<string, object> updata_RUN = new Dictionary<string, object>();//
public static void STEP_START(string ID, double P1, double P2, double P3, double P4, double P5) //启动模块
{
UserCall userCall = new UserCall();
userCall.Topmost = true;
userCall.CALL_time= S19;
STEP_ID = ID;
switch (ID)
{
@@ -711,30 +721,40 @@ namespace DyeingComputer.ViewModel
STEP_finish = false;
break;
case "035":
userCall.Inf_DAT = Resources.ClothIntake;
userCall.Show();
STEP_TIME = Convert.ToInt32(MU01);
SETP_runtime = true;
STEP_finish = false;
break;
case "036":
userCall.Show();
STEP_TIME = Convert.ToInt32(MU01);
SETP_runtime = true;
STEP_finish = false;
break;
case "039":
userCall.Show();
STEP_TIME = Convert.ToInt32(MU01);
SETP_runtime = true;
STEP_finish = false;
break;
case "040":
Sampling sampling = new Sampling();
sampling.Topmost = true;
sampling.CALL_time = S20;
sampling.Show();
STEP_TIME = Convert.ToInt32(MU01);
SETP_runtime = true;
STEP_finish = false;
break;
case "041":
userCall.Show();
SETP_runtime = false;
STEP_finish = false;
break;
case "049":
userCall.Show();
STEP_TIME = Convert.ToInt32(MU01);
SETP_runtime = true;
STEP_finish = false;
@@ -1131,8 +1151,9 @@ namespace DyeingComputer.ViewModel
}
break;//运转时间
case "035":
if (Selet_dtd("2004"))
if (Selet_dtd("2004")|| UserCall_OK)
{
UserCall_OK = false;
STEP_finish = true;
Alert_yellow = false;
}
@@ -1152,8 +1173,9 @@ namespace DyeingComputer.ViewModel
if (errTabler.Rows.Count == 0) Status_Str = Resources.ClothIntake;
break;//准备入布
case "036":
if (Selet_dtd("2004"))
if (Selet_dtd("2004")|| UserCall_OK)
{
UserCall_OK=false;
STEP_finish = true;
Alert_yellow = false;
}
@@ -1173,8 +1195,9 @@ namespace DyeingComputer.ViewModel
if (errTabler.Rows.Count == 0) Status_Str = Resources.OutTheCloth;
break;//准备出布
case "039":
if (Selet_dtd("2004"))
if (Selet_dtd("2004")|| UserCall_OK)
{
UserCall_OK = false;
STEP_finish = true;
Alert_yellow = false;
}
@@ -1194,8 +1217,9 @@ namespace DyeingComputer.ViewModel
if (errTabler.Rows.Count == 0) Status_Str = Resources.CallWorkers;
break;//呼叫人工
case "040":
if (Selet_dtd("2004"))
if (Selet_dtd("2004")|| UserCall_OK)
{
UserCall_OK = false;
STEP_finish = true;
Alert_yellow = false;
}
@@ -1219,8 +1243,9 @@ namespace DyeingComputer.ViewModel
if (errTabler.Rows.Count == 0) Status_Str = Resources.End;
break;//结束
case "049":
if (Selet_dtd("2004"))
if (Selet_dtd("2004")|| UserCall_OK)
{
UserCall_OK = false;
STEP_finish = true;
Alert_yellow = false;
}