|
|
@@ -237,12 +237,18 @@ namespace UAS_MES_NEW.Make
|
|
|
OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号即将送检,此序列号经过维修，提示\n", Color.Purple);
|
|
|
}
|
|
|
|
|
|
- dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select ms_checkno,ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
|
|
|
string status = dt.Rows[0]["ms_status"].ToString();
|
|
|
reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
|
|
|
string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
|
|
|
string ifrepair = dt.Rows[0]["st_ifrepair"].ToString();
|
|
|
string sncode = dt.Rows[0]["ms_sncode"].ToString();
|
|
|
+ string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
|
|
|
+ if (ms_checkno != "")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>" + ms_sncode.Text + " 处于抽检状态，不允许使用当前界面过站\n", Color.Red, ms_sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (sncode != ms_sncode.Text)
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过转号,不允许使用TSN采集\n", Color.Red, ms_sncode);
|
|
|
@@ -291,7 +297,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
|
|
|
sql.Append("from product left join productkind on pk_name=pr_kind ");
|
|
|
sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
|
|
|
- sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' and bg_code='"+User.DefaultBadGroup+"' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
|
|
|
+ sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' and bg_code='" + User.DefaultBadGroup + "' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
bc_groupcode.DisplayMember = "bg_name";
|
|
|
bc_groupcode.ValueMember = "bg_code";
|
callm