|
|
@@ -551,8 +551,35 @@ namespace UAS_MES.Make
|
|
|
dh.ExecuteSql("delete from makebad where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and nvl(mb_status,0)=0", "delete");
|
|
|
if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserCode, User.UserSourceCode, "检查未通过", bgcode, bccode, bgname, bcname, bcremark, out ErrorMessage))
|
|
|
{
|
|
|
+ //存在的不良代码和
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select sr_badcode from STEPRETURN where sr_stepcode='" + User.CurrentStepCode + "'", "select");
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ int BadCodeInStep = 0;
|
|
|
+ string badname = "";
|
|
|
+ for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
+ {
|
|
|
+ for (int j = 0; j < bccode.Length; j++)
|
|
|
+ {
|
|
|
+ if (dt.Rows[i]["sr_badcode"].ToString() == bccode[j])
|
|
|
+ {
|
|
|
+ badname += "[" + bcname[j] + "]";
|
|
|
+ BadCodeInStep += 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //选中的不良代码必须全在工序默认的不良代码中才通过判断
|
|
|
+ if (BadCodeInStep == bccode.Length)
|
|
|
+ {
|
|
|
+ dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and mb_stepcode='" + User.CurrentStepCode + "'");
|
|
|
+ dh.UpdateByCondition("makeserial", "ms_stepcode='',ms_status=1,ms_nextstepcode='" + User.CurrentStepCode + "'", "ms_id='" + oMSID + "'");
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修成功", "快速维修", "", ob_checkno.Text);
|
|
|
+ OperateResult.AppendText(">>本次采集不良代码" + badname + "存在于本工序" + User.CurrentStepCode + "中，请解除故障后重新测试本站\n", Color.Black);
|
|
|
+ }
|
|
|
+ else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
|
|
|
+ }
|
|
|
+ else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
|
|
|
LastSncode = ms_sncode.Text;
|
|
|
- OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
|
|
|
//采集完不良，聚焦序列号
|
|
|
ms_sncode.Focus();
|
|
|
//记录操作日志
|
章政