|
|
@@ -49,12 +49,13 @@ namespace UAS_MES_NEW.Special
|
|
|
{
|
|
|
if (ms_id == "") { OperateResult.AppendText(">>请先获取SN\n"); return; }
|
|
|
if (cd_stepcode.Text == "") { OperateResult.AppendText(">>请选择回流工序\n"); return; }
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select mil_sncode,mil_id,ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode,mil_netcode from makeserial left join makeimeilist on mil_sncode=ms_sncode where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select mil_sncode,mil_id,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode,mil_netcode from makeserial left join makeimeilist on mil_sncode=ms_sncode where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
|
|
|
string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
|
|
|
|
|
|
if (dt.Rows.Count == 0) { OperateResult.AppendText(">>" + SN.Text + "不存在或未执行过" + cd_stepcode.Text + "工序\n"); return; }
|
|
|
|
|
|
string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
|
|
|
+ string ms_ifqccheck = dt.Rows[0]["ms_ifqccheck"].ToString();
|
|
|
string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
|
|
|
string ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
|
|
|
string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
|
|
|
@@ -64,6 +65,10 @@ namespace UAS_MES_NEW.Special
|
|
|
{
|
|
|
OperateResult.AppendText(">>序列号已经装箱" + ms_outboxcode + "\n"); return;
|
|
|
}
|
|
|
+ if (ms_ifqccheck == "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>序列号不处于抽检状态\n"); return;
|
|
|
+ }
|
|
|
string mil_id = dt.Rows[0]["mil_id"].ToString();
|
|
|
string mil_netcode = dt.Rows[0]["mil_netcode"].ToString();
|
|
|
if (mil_netcode == "")
|
callm