sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

任务检查逻辑数据错误修正

master
sc 2 months ago
parent
c4f98eda2a eae0bbeed3
commit
aaee65200a
1 changed files with 10 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      ViewModel/MainWindowViewModel.cs

19
ViewModel/MainWindowViewModel.cs
View File

@ -1019,8 +1019,9 @@ namespace DyeingComputer.ViewModel
dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0];
//SQLiteHelpers.Close();//关闭数据库
//启动副功能
STEP_RUN_slave_stop(); DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S1"]))
STEP_RUN_slave_stop();
DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
if (arrRows.First().Field<object>("StepID_S1") != null)
{
STEP_IDp1 = (string)arrRows[0]["StepID_S1"];
STEP_P1p1 = (double)arrRows[0]["Parameter1_S1"];
@ -1029,7 +1030,7 @@ namespace DyeingComputer.ViewModel
STEP_P4p1 = (double)arrRows[0]["Parameter4_S1"];
STEP_P5p1 = (double)arrRows[0]["Parameter5_S1"];
}
if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S2"]))
if (arrRows.First().Field<object>("StepID_S2") != null)
{
STEP_IDp2 = (string)arrRows[0]["StepID_S2"];
STEP_P1p2 = (double)arrRows[0]["Parameter1_S2"];
@ -1038,7 +1039,7 @@ namespace DyeingComputer.ViewModel
STEP_P4p2 = (double)arrRows[0]["Parameter4_S2"];
STEP_P5p2 = (double)arrRows[0]["Parameter5_S2"];
}
if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S2"]))
if (arrRows.First().Field<object>("StepID_S3") != null)
{
STEP_IDp3 = (string)arrRows[0]["StepID_S3"];
STEP_P1p3 = (double)arrRows[0]["Parameter1_S3"];
@ -2390,6 +2391,7 @@ namespace DyeingComputer.ViewModel
{
if (STEP_finish)
{
STEP_RUN_slave_stop();
STEP_finish = false;
UserCall_OK = false;
RUN_STEPID = dt_TP.Select("RUN ='1'").First().Field<int>("Step") +1;
@ -2402,8 +2404,7 @@ namespace DyeingComputer.ViewModel
double T_P5 = Convert.ToDouble(arrRows[0]["Parameter5"].ToString());
STEP_START(T_ID, T_P1, T_P2, T_P3, T_P4, T_P5);
STEP_RUN_slave_stop();
if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S1"]))
/* if (arrRows.First().Field<object>("StepID_S1") != null)
{
STEP_IDp1 = (string)arrRows[0]["StepID_S1"];
STEP_P1p1 = (double)arrRows[0]["Parameter1_S1"];
@ -2412,7 +2413,7 @@ namespace DyeingComputer.ViewModel
STEP_P4p1 = (double)arrRows[0]["Parameter4_S1"];
STEP_P5p1 = (double)arrRows[0]["Parameter5_S1"];
}
if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S2"]))
if (arrRows.First().Field<object>("StepID_S") != null)
{
STEP_IDp2 = (string)arrRows[0]["StepID_S2"];
STEP_P1p2 = (double)arrRows[0]["Parameter1_S2"];
@ -2421,7 +2422,7 @@ namespace DyeingComputer.ViewModel
STEP_P4p2 = (double)arrRows[0]["Parameter4_S2"];
STEP_P5p2 = (double)arrRows[0]["Parameter5_S2"];
}
if (!String.IsNullOrEmpty((string)arrRows[0]["StepID_S2"]))
if (arrRows[0]["StepID_S2"] != null)
{
STEP_IDp3 = (string)arrRows[0]["StepID_S3"];
STEP_P1p3 = (double)arrRows[0]["Parameter1_S3"];
@ -2429,7 +2430,7 @@ namespace DyeingComputer.ViewModel
STEP_P3p3 = (double)arrRows[0]["Parameter3_S3"];
STEP_P4p3 = (double)arrRows[0]["Parameter4_S3"];
STEP_P5p3 = (double)arrRows[0]["Parameter5_S3"];
}
}*/
APILog.LOGlog(WorkNumder.ToString(), "Process", "Next", "STEP = " + RUN_STEPID + ";StepID=" +
T_ID + ";P1=" + T_P1 + ";P2=" + T_P2 + ";P3=" + T_P3 + ";P4=" + T_P4 + ";P5=" + T_P5);

Write Preview
Loading…
Cancel
Save