diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 2aa0eb4..1292100 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -433,6 +433,9 @@ namespace DyeingComputer.UserClass try { Dictionary Chart_new = new Dictionary();//缓存函数 + Chart_new.Add("UserButton", MainWindowViewModel._UserButton); + Chart_new.Add("WORK_RUN", MainWindowViewModel.WORK_RUN); + Chart_new.Add("RUN_STEPID", MainWindowViewModel.RUN_STEPID); Chart_new.Add("LOCK", MainWindowViewModel._Lock_bool); Chart_new.Add("CALL", MainWindowViewModel.CALL_FR); Chart_new.Add("Status", MainWindowViewModel.StatusStr); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 161dedc..6908c89 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -91,7 +91,7 @@ namespace DyeingComputer.ViewModel OnPropertyChanged("IsInteractive"); } } - public bool _UserButton; + public static bool _UserButton; public bool UserButton//步骤按钮交互选择 { get => _UserButton; @@ -420,7 +420,7 @@ namespace DyeingComputer.ViewModel Work_Numder = WorkNumder.ToString(); StatusStr = Status_Str; Program_Name = ProgramName; - if (dt_TP == null) Process_step = dt_TP.Select("Step=" + RUN_STEPID).First().Field("ParameterName"); + if (dt_TP != null) Process_step = dt_TP.Select("Step=" + RUN_STEPID).First().Field("ParameterName"); if (set_) { set_ = false; SYS_SET(); }//设置更新 if (!SETP_runtime) DIDETime++; @@ -1625,6 +1625,7 @@ namespace DyeingComputer.ViewModel string SK5; void FeedingRecords(string WorkOrder,string Dyelot,int TANK,int STEP,int Type) //呼叫输送 { + CALL_FR = true; int SQLI = 0; Dictionary dat_FR = new Dictionary(); dat_FR.Add("State", "201");