|
|
@@ -53,7 +53,7 @@ namespace UAS_MES_NEW.Special
|
|
|
}
|
|
|
}
|
|
|
//获取序列号的途程
|
|
|
- dt = (DataTable)dh.ExecuteSql("select ms_code,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where (ms_sncode='" + sn_code.Text + "' or ms_imei1='" + sn_code.Text + "' and ms_imei2='" + sn_code.Text + "')and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select ms_code,ms_status,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where (ms_sncode='" + sn_code.Text + "' or ms_imei1='" + sn_code.Text + "' and ms_imei2='" + sn_code.Text + "')and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string pr_code = dt.Rows[0]["ms_prodcode"].ToString();
|
|
|
@@ -81,8 +81,12 @@ namespace UAS_MES_NEW.Special
|
|
|
OperateResult.AppendText(">>序列号" + sn_code.Text + "已装箱" + ms_outboxcode + ",不允许取消采集\n", Color.Red, sn_code);
|
|
|
return;
|
|
|
}
|
|
|
- //存在不良删除不良记录
|
|
|
- if (ms_status == "3")
|
|
|
+ if (ms_status == "3") {
|
|
|
+ OperateResult.AppendText(">>序列号" + sn_code.Text + "处于不良状态,不允许取消采集\n", Color.Red, sn_code);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ //存在不良删除不良记录
|
|
|
+ if (ms_status == "3")
|
|
|
{
|
|
|
sqls.Add("delete from makebad where mb_sncode='" + sn_code.Text + "' and mb_makecode='" + ms_makecode + "'");
|
|
|
//更新MakeCraftDetail表记录
|
callm