|
|
@@ -294,11 +294,11 @@ namespace UAS_MES_NEW.Make
|
|
|
oMakeCode = dt.Rows[0]["ms_makecode"].ToString();
|
|
|
ms_status = dt.Rows[0]["ms_status"].ToString();
|
|
|
}
|
|
|
- if (ms_status != "3")
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>序列号" + code.Text + "需处于维修状态\n", Color.Red, code);
|
|
|
- return;
|
|
|
- }
|
|
|
+ //if (ms_status != "3")
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText(">>序列号" + code.Text + "需处于维修状态\n", Color.Red, code);
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
//将录入框的值给序列号
|
|
|
sn_code.Text = code.Text;
|
|
|
sql.Clear();
|
|
|
@@ -411,7 +411,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial left join makematerial on cm_makecode=mm_code " +
|
|
|
"and (cm_fsoncode=mm_prodcode or instr(mm_repprodcode,cm_fsoncode)>0) where ");
|
|
|
sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ma_code.Text + "' and ");
|
|
|
- sql.Append("(sp_fsoncode=mm_prodcode or sp_fsoncode=mm_repprodcode or cm_fsoncode=sp_fsoncode) and cm_status=0 and cm_stepcode=sp_stepcode) group by sp_fsoncode,sp_id order by SP_DETNO asc");
|
|
|
+ sql.Append("(sp_fsoncode=mm_prodcode or sp_fsoncode=mm_repprodcode or cm_fsoncode=sp_fsoncode ) and cm_spid=sp_id and cm_status=0 and cm_stepcode=sp_stepcode) group by sp_fsoncode,sp_id order by SP_DETNO asc");
|
|
|
dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
code.Clear();
|
|
|
//用于记录提醒的数据长度
|
callm