diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index a7bfac0..e95b701 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -197,6 +197,9 @@ InputBox.xaml + + Sampling.xaml + UserCall.xaml @@ -274,6 +277,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -420,6 +427,7 @@ + diff --git a/Lmage/StreamlineUltimateColorColorPaletteSample1.png b/Lmage/StreamlineUltimateColorColorPaletteSample1.png new file mode 100644 index 0000000..c6a28c5 Binary files /dev/null and b/Lmage/StreamlineUltimateColorColorPaletteSample1.png differ diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 6d5bc55..cb39410 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -78,6 +78,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Add 的本地化字符串。 + /// + public static string ADD { + get { + return ResourceManager.GetString("ADD", resourceCulture); + } + } + /// /// 查找类似 AddTheMedicine 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 4f5ee15..3c9f423 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -582,4 +582,7 @@ Muffling + + Add + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index eee7c01..3a2a287 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -582,4 +582,7 @@ Muffling + + Add + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index a49f355..bc41b5b 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -582,4 +582,7 @@ 静音 + + 加色 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 21edd63..41319cc 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -582,4 +582,7 @@ + + + \ No newline at end of file diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index f593075..f2d42d9 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -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 updata_RUN = new Dictionary();// 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; } diff --git a/Windows/Sampling.xaml b/Windows/Sampling.xaml new file mode 100644 index 0000000..0af1bed --- /dev/null +++ b/Windows/Sampling.xaml @@ -0,0 +1,29 @@ + + + + + + + +