|
|
@@ -34,6 +34,8 @@ namespace UAS_MES_NEW.Special
|
|
|
cd_stepcode.SelectField = "cd_stepname # 工序名称 ,cd_stepcode # 工序编号,cd_stepno # 执行顺序";
|
|
|
cd_stepcode.DBTitle = "回流工序";
|
|
|
cd_stepcode.DbChange += Cd_stepcode_DbChange;
|
|
|
+
|
|
|
+ cd_stepcode.Text = "Z_OA3";
|
|
|
}
|
|
|
|
|
|
private void Cd_stepcode_DbChange(object sender, EventArgs e)
|
|
|
@@ -47,7 +49,7 @@ 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 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,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; }
|
|
|
@@ -69,7 +71,7 @@ namespace UAS_MES_NEW.Special
|
|
|
OperateResult.AppendText(">>序列号" + SN.Text + "不存在Key\n", Color.Red, SN);
|
|
|
return;
|
|
|
}
|
|
|
- dh.ExecuteSql("update makeimeilist set mil_status=-2,MIL_REMARK='主动冻结' where mil_id='" + mil_id + "'", "update");
|
|
|
+ dh.ExecuteSql("update makeimeilist set mil_sncode='',mil_status=-2,MIL_REMARK='主动冻结' where mil_id='" + mil_id + "'", "update");
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "Key冻结成功", "Key冻结成功", SN.Text, "");
|
|
|
OperateResult.AppendText(">>序列号" + SN.Text + "Key[" + mil_netcode + "]冻结成功\n", Color.Green, SN);
|
|
|
if (cr_code.Text != "" && cr_code.Text != ms_craftcode) { OperateResult.AppendText(">>序列号途程和所选途程不一致\n"); return; }
|
|
|
@@ -90,7 +92,8 @@ namespace UAS_MES_NEW.Special
|
|
|
|
|
|
dh.ExecuteSql("update oqcbatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + ms_checkno + "') where ob_checkno='" + ms_checkno + "'", "update");
|
|
|
|
|
|
- dh.ExecuteSql("update makeserial set ms_status=1,ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
|
|
|
+ dh.ExecuteSql("update makeserial set ms_keyid='',ms_qccheck='',ms_status=1,ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
|
|
|
+ dh.ExecuteSql("update sninfo set si_keyid='' where si_sn='" + ms_sncode + "'", "update");
|
|
|
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "OQC回流", "回流成功" + cd_stepcode.Text + "产品:" + ms_prodcode + "序号:" + stepno, ms_sncode, ms_checkno);
|
|
|
OperateResult.AppendText(">>" + SN.Text + "回流成功\n");
|
callm