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

Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer

master
sc 3 weeks ago
parent
62cd3c6e33 bb334e76cf
commit
2b93e8141e
2 changed files with 52 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      View/WorkOrderView.xaml.cs
  2. 114
      ViewModel/MainWindowViewModel.cs

4
View/WorkOrderView.xaml.cs
View File

@ -429,10 +429,6 @@ namespace DyeingComputer.View
for (int i = 0; i < a; i++) for (int i = 0; i < a; i++)
{ {
DataRow dr = WorkorderSteps.Rows[i];//行转 DataRow dr = WorkorderSteps.Rows[i];//行转
dr.BeginEdit(); //添加订单号
dr["ProgramID"] = Process_id;
dr["Program"] = MainWindowViewModel.ProgramName;
dr.EndEdit();
MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dr));//行插入 MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dr));//行插入
} }

114
ViewModel/MainWindowViewModel.cs
View File

@ -826,6 +826,10 @@ namespace DyeingComputer.ViewModel
STEP_ID = ID; STEP_ID = ID;
switch (ID) switch (ID)
{ {
case "999":
SETP_runtime = true;
STEP_finish = false;
break;
case "001": case "001":
STEP_P1 = Convert.ToDouble(P1); STEP_P1 = Convert.ToDouble(P1);
STEP_P2 = Convert.ToDouble(P2); STEP_P2 = Convert.ToDouble(P2);
@ -1028,34 +1032,37 @@ namespace DyeingComputer.ViewModel
dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0]; dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0];
//SQLiteHelpers.Close();//关闭数据库 //SQLiteHelpers.Close();//关闭数据库
//启动副功能 //启动副功能
STEP_RUN_slave_stop(); if (STEP_ID != "999")
DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'"); {
if (arrRows.First().Field<object>("StepID_S1") != null) STEP_RUN_slave_stop();
{ DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
STEP_IDp1 = (string)arrRows[0]["StepID_S1"]; if (arrRows.First().Field<object>("StepID_S1") != null)
STEP_P1p1 = (double)arrRows[0]["Parameter1_S1"]; {
STEP_P2p1 = (double)arrRows[0]["Parameter2_S1"]; STEP_IDp1 = (string)arrRows[0]["StepID_S1"];
STEP_P3p1 = (double)arrRows[0]["Parameter3_S1"]; STEP_P1p1 = (double)arrRows[0]["Parameter1_S1"];
STEP_P4p1 = (double)arrRows[0]["Parameter4_S1"]; STEP_P2p1 = (double)arrRows[0]["Parameter2_S1"];
STEP_P5p1 = (double)arrRows[0]["Parameter5_S1"]; STEP_P3p1 = (double)arrRows[0]["Parameter3_S1"];
} STEP_P4p1 = (double)arrRows[0]["Parameter4_S1"];
if (arrRows.First().Field<object>("StepID_S2") != null) STEP_P5p1 = (double)arrRows[0]["Parameter5_S1"];
{ }
STEP_IDp2 = (string)arrRows[0]["StepID_S2"]; if (arrRows.First().Field<object>("StepID_S2") != null)
STEP_P1p2 = (double)arrRows[0]["Parameter1_S2"]; {
STEP_P2p2 = (double)arrRows[0]["Parameter2_S2"]; STEP_IDp2 = (string)arrRows[0]["StepID_S2"];
STEP_P3p2 = (double)arrRows[0]["Parameter3_S2"]; STEP_P1p2 = (double)arrRows[0]["Parameter1_S2"];
STEP_P4p2 = (double)arrRows[0]["Parameter4_S2"]; STEP_P2p2 = (double)arrRows[0]["Parameter2_S2"];
STEP_P5p2 = (double)arrRows[0]["Parameter5_S2"]; STEP_P3p2 = (double)arrRows[0]["Parameter3_S2"];
} STEP_P4p2 = (double)arrRows[0]["Parameter4_S2"];
if (arrRows.First().Field<object>("StepID_S3") != null) STEP_P5p2 = (double)arrRows[0]["Parameter5_S2"];
{ }
STEP_IDp3 = (string)arrRows[0]["StepID_S3"]; if (arrRows.First().Field<object>("StepID_S3") != null)
STEP_P1p3 = (double)arrRows[0]["Parameter1_S3"]; {
STEP_P2p3 = (double)arrRows[0]["Parameter2_S3"]; STEP_IDp3 = (string)arrRows[0]["StepID_S3"];
STEP_P3p3 = (double)arrRows[0]["Parameter3_S3"]; STEP_P1p3 = (double)arrRows[0]["Parameter1_S3"];
STEP_P4p3 = (double)arrRows[0]["Parameter4_S3"]; STEP_P2p3 = (double)arrRows[0]["Parameter2_S3"];
STEP_P5p3 = (double)arrRows[0]["Parameter5_S3"]; STEP_P3p3 = (double)arrRows[0]["Parameter3_S3"];
STEP_P4p3 = (double)arrRows[0]["Parameter4_S3"];
STEP_P5p3 = (double)arrRows[0]["Parameter5_S3"];
}
} }
User_Button = true; User_Button = true;
} }
@ -1082,6 +1089,9 @@ namespace DyeingComputer.ViewModel
{ {
switch (STEP_ID) switch (STEP_ID)
{ {
case "999":
Status_Str = Resources.Await+"[Not End]";
break;
case "001": case "001":
if (Selet_dtd("3011")) if (Selet_dtd("3011"))
{ {
@ -2397,7 +2407,7 @@ namespace DyeingComputer.ViewModel
break; break;
} }
STEP_RUN_slave();//子功能 if(STEP_ID!="999") STEP_RUN_slave();//子功能
} }
else else
{ {
@ -2407,43 +2417,23 @@ namespace DyeingComputer.ViewModel
STEP_finish = false; STEP_finish = false;
UserCall_OK = false; UserCall_OK = false;
RUN_STEPID = dt_TP.Select("RUN ='1'").First().Field<int>("Step") +1; RUN_STEPID = dt_TP.Select("RUN ='1'").First().Field<int>("Step") +1;
DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'"); try
string T_ID = arrRows[0]["StepID"].ToString();
double T_P1 = Convert.ToDouble(arrRows[0]["Parameter1"].ToString());
double T_P2 = Convert.ToDouble(arrRows[0]["Parameter2"].ToString());
double T_P3 = Convert.ToDouble(arrRows[0]["Parameter3"].ToString());
double T_P4 = Convert.ToDouble(arrRows[0]["Parameter4"].ToString());
double T_P5 = Convert.ToDouble(arrRows[0]["Parameter5"].ToString());
STEP_START(T_ID, T_P1, T_P2, T_P3, T_P4, T_P5);
/* if (arrRows.First().Field<object>("StepID_S1") != null)
{ {
STEP_IDp1 = (string)arrRows[0]["StepID_S1"]; DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
STEP_P1p1 = (double)arrRows[0]["Parameter1_S1"]; string T_ID = arrRows[0]["StepID"].ToString();
STEP_P2p1 = (double)arrRows[0]["Parameter2_S1"]; double T_P1 = Convert.ToDouble(arrRows[0]["Parameter1"].ToString());
STEP_P3p1 = (double)arrRows[0]["Parameter3_S1"]; double T_P2 = Convert.ToDouble(arrRows[0]["Parameter2"].ToString());
STEP_P4p1 = (double)arrRows[0]["Parameter4_S1"]; double T_P3 = Convert.ToDouble(arrRows[0]["Parameter3"].ToString());
STEP_P5p1 = (double)arrRows[0]["Parameter5_S1"]; double T_P4 = Convert.ToDouble(arrRows[0]["Parameter4"].ToString());
double T_P5 = Convert.ToDouble(arrRows[0]["Parameter5"].ToString());
STEP_START(T_ID, T_P1, T_P2, T_P3, T_P4, T_P5);
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);
} }
if (arrRows.First().Field<object>("StepID_S") != null) catch (Exception)
{ {
STEP_IDp2 = (string)arrRows[0]["StepID_S2"]; STEP_START("999", 0, 0, 0, 0, 0);
STEP_P1p2 = (double)arrRows[0]["Parameter1_S2"];
STEP_P2p2 = (double)arrRows[0]["Parameter2_S2"];
STEP_P3p2 = (double)arrRows[0]["Parameter3_S2"];
STEP_P4p2 = (double)arrRows[0]["Parameter4_S2"];
STEP_P5p2 = (double)arrRows[0]["Parameter5_S2"];
} }
if (arrRows[0]["StepID_S2"] != null)
{
STEP_IDp3 = (string)arrRows[0]["StepID_S3"];
STEP_P1p3 = (double)arrRows[0]["Parameter1_S3"];
STEP_P2p3 = (double)arrRows[0]["Parameter2_S3"];
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);
if (ViewID == 1) { sys_workSTEPID = RUN_STEPID; } else { sys_workSTEPID = -1; } if (ViewID == 1) { sys_workSTEPID = RUN_STEPID; } else { sys_workSTEPID = -1; }
} }
if (errTabler.Rows.Count == 0) if (errTabler.Rows.Count == 0)

Write Preview
Loading…
Cancel
Save