diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 5d0c682..60159ce 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -728,12 +728,14 @@ namespace DyeingComputer.ViewModel STEP_finish = false; break; case "036": + userCall.Inf_DAT = Resources.OutTheCloth; userCall.Show(); STEP_TIME = Convert.ToInt32(MU01); SETP_runtime = true; STEP_finish = false; break; case "039": + userCall.Inf_DAT = Resources.CallWorkers; userCall.Show(); STEP_TIME = Convert.ToInt32(MU01); SETP_runtime = true; @@ -749,11 +751,13 @@ namespace DyeingComputer.ViewModel STEP_finish = false; break; case "041": + userCall.Inf_DAT = Resources.End; userCall.Show(); SETP_runtime = false; STEP_finish = false; break; case "049": + userCall.Inf_DAT = Resources.Await; userCall.Show(); STEP_TIME = Convert.ToInt32(MU01); SETP_runtime = true; @@ -1265,10 +1269,13 @@ namespace DyeingComputer.ViewModel if (errTabler.Rows.Count == 0) Status_Str = Resources.Await; break;//等待 case "050": - + if (STEP_P1 < Selet_dtm("1010")) Updata_dtd("3007", true); + if (STEP_P2 >= Selet_dta("4011")) { STEP_finish = true; Updata_dtd("3007", false); } + if (125 <= Selet_dtm("1010")) { STEP_finish = true; Updata_dtd("3007", false); } break;//主缸加压 case "051": - + if (STEP_P1 > Selet_dtm("1010")) Updata_dtd("3008", true); + if (STEP_P2 > Selet_dta("4011")) STEP_finish = true; break;//主缸减压 case "054": Updata_dtm("1020", STEP_P1);