Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
142e653276
4 files changed
+103
-57
No files matched your search
@@ -119,9 +119,16 @@ namespace DyeingComputer.View
|
||||
{
|
||||
if (e.Key == Key.Y) //按键y
|
||||
{
|
||||
MainWindowViewModel.RUN_DATATABLE = sql.Tables[0];//缓存表
|
||||
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(ID);//插入步骤号
|
||||
MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));
|
||||
if (string.IsNullOrEmpty(Numder))
|
||||
{
|
||||
MainWindowViewModel.WORK_RUN = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
MainWindowViewModel.RUN_DATATABLE = sql.Tables[0];//缓存表
|
||||
MainWindowViewModel.RUN_STEPID = Convert.ToInt16(ID);//插入步骤号
|
||||
MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user