|
|
@@ -54,10 +54,12 @@ namespace UAS_MES.Make
|
|
|
|
|
|
private void InPrint()
|
|
|
{
|
|
|
- try {
|
|
|
+ try
|
|
|
+ {
|
|
|
lbl = new ApplicationClass();
|
|
|
}
|
|
|
- catch (Exception ex) {
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
MessageBox.Show("未正确安装codesoft");
|
|
|
}
|
|
|
}
|
|
|
@@ -106,7 +108,7 @@ namespace UAS_MES.Make
|
|
|
OperateResult.AppendText(">>开始执行上料工序\n");
|
|
|
//判断当前工序是否是上料工序cd_ifinput或者是否是测试工序cd_iftest
|
|
|
sql.Clear();
|
|
|
- sql.Append("select cr_code,cd_stepcode,cd_ifinput,cd_iftest,ma_bomversion from makeserial left join craft on ms_craftcode=cr_code left join craftdetail on cd_crid=cr_id and ");
|
|
|
+ sql.Append("select cr_code,cd_stepcode,cd_ifinput,cd_iftest from makeserial left join craft on ms_craftcode=cr_code left join craftdetail on cd_crid=cr_id and ");
|
|
|
sql.Append("cd_stepcode=ms_nextstepcode where ms_sncode='" + code.Text + "' and ms_makecode='" + ms_makecode.Text + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
@@ -144,7 +146,8 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- else {
|
|
|
+ else
|
|
|
+ {
|
|
|
//如果ListA中没有数据执行的是测试工序
|
|
|
if (ListA.Rows.Count == 0)
|
|
|
{
|
|
|
@@ -180,7 +183,8 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- else {
|
|
|
+ else
|
|
|
+ {
|
|
|
OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
code.Clear();
|
|
|
}
|