跳步按钮效果
This commit is contained in:
commit
64c467137b
2 files changed
+18
-7
No files matched your search
@@ -455,12 +455,18 @@ namespace DyeingComputer.View
|
|||||||
}
|
}
|
||||||
private void ProgramgroupView_Jump_Click(object sender, RoutedEventArgs e)
|
private void ProgramgroupView_Jump_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
int n = Convert.ToInt16(ID);
|
||||||
|
DataRow dr = sql.Tables[0].Rows[n - 1];
|
||||||
|
dr.BeginEdit();
|
||||||
|
dr["RUN"] = 2;
|
||||||
|
dr.EndEdit();
|
||||||
|
MainWindowViewModel.User_Button = true;
|
||||||
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(ID);//插入步骤号
|
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(ID);//插入步骤号
|
||||||
MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3),
|
MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3),
|
||||||
Convert.ToDouble(P4), Convert.ToDouble(P5));
|
Convert.ToDouble(P4), Convert.ToDouble(P5));
|
||||||
APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "Jump", "STEP = " + ID +
|
APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "Jump", "STEP = " + ID +
|
||||||
";StepID=" + Numder + ";P1=" + P1 + ";P2=" + P2 + ";P3=" + P3 + ";P4=" + P4 + ";P5=" + P5);
|
";StepID=" + Numder + ";P1=" + P1 + ";P2=" + P2 + ";P3=" + P3 + ";P4=" + P4 + ";P5=" + P5);
|
||||||
|
|
||||||
}//跳步
|
}//跳步
|
||||||
private void DyeingMachine_Click(object sender, RoutedEventArgs e)//染色剂
|
private void DyeingMachine_Click(object sender, RoutedEventArgs e)//染色剂
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -469,7 +469,8 @@ namespace DyeingComputer.ViewModel
|
|||||||
{
|
{
|
||||||
if (TX_t != TX) { _Link_bool = true; TX_t = TX; } else { _Link_bool = false; TX_t = TX; } //中央连接状态判断
|
if (TX_t != TX) { _Link_bool = true; TX_t = TX; } else { _Link_bool = false; TX_t = TX; } //中央连接状态判断
|
||||||
if(WORK_RUN !=0) Chart();//写入记录
|
if(WORK_RUN !=0) Chart();//写入记录
|
||||||
if(!UserButton) TechnologicalProcess_view();
|
if(!UserButton) TechnologicalProcess_view();//刷新步骤页面
|
||||||
|
|
||||||
|
|
||||||
if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))
|
if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))
|
||||||
{
|
{
|
||||||
@@ -570,7 +571,12 @@ namespace DyeingComputer.ViewModel
|
|||||||
}
|
}
|
||||||
void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件200MS
|
void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件200MS
|
||||||
{
|
{
|
||||||
if (User_Button) TechnologicalProcess_view();
|
if (User_Button)
|
||||||
|
{
|
||||||
|
TechnologicalProcess_view();
|
||||||
|
User_Button = false;
|
||||||
|
}//按钮刷新步骤页面
|
||||||
|
|
||||||
IOm_DATA();
|
IOm_DATA();
|
||||||
|
|
||||||
timer1s_++;
|
timer1s_++;
|
||||||
@@ -1594,8 +1600,8 @@ namespace DyeingComputer.ViewModel
|
|||||||
else
|
else
|
||||||
if (WORK_RUN == 0)
|
if (WORK_RUN == 0)
|
||||||
{
|
{
|
||||||
if (Status_Str == Resources.Paused)
|
// if (Status_Str == Resources.Paused)
|
||||||
{
|
// {
|
||||||
|
|
||||||
Updata_dtm("1004", 0);
|
Updata_dtm("1004", 0);
|
||||||
Updata_dtm("1005", Selet_dtm("1010"));
|
Updata_dtm("1005", Selet_dtm("1010"));
|
||||||
@@ -1603,7 +1609,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
{
|
{
|
||||||
Updata_dtd((3000+i).ToString(), false);
|
Updata_dtd((3000+i).ToString(), false);
|
||||||
}
|
}
|
||||||
}//清除输出状态
|
// }//清除输出状态
|
||||||
if (errTabler.Rows.Count == 0)
|
if (errTabler.Rows.Count == 0)
|
||||||
{
|
{
|
||||||
//WorkNumder = "----------";
|
//WorkNumder = "----------";
|
||||||
@@ -1901,7 +1907,6 @@ namespace DyeingComputer.ViewModel
|
|||||||
{
|
{
|
||||||
if (ViewID == 1)
|
if (ViewID == 1)
|
||||||
{
|
{
|
||||||
User_Button = false;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
TechnologicalProcess_View = ToObservableCollection<TechnologicalProcess>(dt_TP);
|
TechnologicalProcess_View = ToObservableCollection<TechnologicalProcess>(dt_TP);
|
||||||
|
|||||||
Reference in new issue
Block a user