|
|
@@ -234,11 +234,17 @@ namespace UAS_MES.Make
|
|
|
LockMakeCode.Checked = true;
|
|
|
}
|
|
|
}
|
|
|
- dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,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_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();
|
|
|
+ if (sncode != ms_sncode.Text)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过转号,不允许使用TSN采集\n", Color.Red, ms_sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
ifrework = dt.Rows[0]["ms_ifrework"].ToString();
|
|
|
if (GoodProduct.Checked)
|
|
|
{
|