830指令添加细节
This commit is contained in:
commit
5185b1f4a4
2 files changed
+6
-2
No files matched your search
@@ -433,6 +433,9 @@ namespace DyeingComputer.UserClass
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
||||||
|
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("LOCK", MainWindowViewModel._Lock_bool);
|
||||||
Chart_new.Add("CALL", MainWindowViewModel.CALL_FR);
|
Chart_new.Add("CALL", MainWindowViewModel.CALL_FR);
|
||||||
Chart_new.Add("Status", MainWindowViewModel.StatusStr);
|
Chart_new.Add("Status", MainWindowViewModel.StatusStr);
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
OnPropertyChanged("IsInteractive");
|
OnPropertyChanged("IsInteractive");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public bool _UserButton;
|
public static bool _UserButton;
|
||||||
public bool UserButton//步骤按钮交互选择
|
public bool UserButton//步骤按钮交互选择
|
||||||
{
|
{
|
||||||
get => _UserButton;
|
get => _UserButton;
|
||||||
@@ -420,7 +420,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
Work_Numder = WorkNumder.ToString();
|
Work_Numder = WorkNumder.ToString();
|
||||||
StatusStr = Status_Str;
|
StatusStr = Status_Str;
|
||||||
Program_Name = ProgramName;
|
Program_Name = ProgramName;
|
||||||
if (dt_TP == null) Process_step = dt_TP.Select("Step=" + RUN_STEPID).First().Field<string>("ParameterName");
|
if (dt_TP != null) Process_step = dt_TP.Select("Step=" + RUN_STEPID).First().Field<string>("ParameterName");
|
||||||
if (set_) { set_ = false; SYS_SET(); }//设置更新
|
if (set_) { set_ = false; SYS_SET(); }//设置更新
|
||||||
if (!SETP_runtime) DIDETime++;
|
if (!SETP_runtime) DIDETime++;
|
||||||
|
|
||||||
@@ -1625,6 +1625,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
string SK5;
|
string SK5;
|
||||||
void FeedingRecords(string WorkOrder,string Dyelot,int TANK,int STEP,int Type) //呼叫输送
|
void FeedingRecords(string WorkOrder,string Dyelot,int TANK,int STEP,int Type) //呼叫输送
|
||||||
{
|
{
|
||||||
|
CALL_FR = true;
|
||||||
int SQLI = 0;
|
int SQLI = 0;
|
||||||
Dictionary<string, object> dat_FR = new Dictionary<string, object>();
|
Dictionary<string, object> dat_FR = new Dictionary<string, object>();
|
||||||
dat_FR.Add("State", "201");
|
dat_FR.Add("State", "201");
|
||||||
|
|||||||
Reference in new issue
Block a user