|
|
@@ -212,10 +212,10 @@ namespace UAS_MES.Make
|
|
|
string cm_status = dt.Rows[0]["cm_status"].ToString();
|
|
|
string cm_makecode = dt.Rows[0]["cm_makecode"].ToString();
|
|
|
string cm_craftcode = dt.Rows[0]["cm_craftcode"].ToString();
|
|
|
- sql.Clear();
|
|
|
- sql.Append("update makeserial set ms_nextstepcode=ms_stepcode where ms_id=" + oMsid);
|
|
|
- dh.ExecuteSql(sql.GetString(), "update");
|
|
|
- //清除已被使用的序列号
|
|
|
+ // sql.Clear();
|
|
|
+ // sql.Append("update makeserial set ms_nextstepcode=ms_stepcode where ms_id=" + oMsid);
|
|
|
+ // dh.ExecuteSql(sql.GetString(), "update");
|
|
|
+ // 清除已被使用的序列号
|
|
|
sql.Clear();
|
|
|
sql.Append("update makeserial set ms_nextmacode='' where ms_sncode in(select cm_barcode from craftmaterial where ");
|
|
|
sql.Append("cm_makecode='" + cm_makecode + "' and cm_sncode='" + code.Text + "' and cm_stepcode='" + cm_stepcode + "' and cm_craftcode='" + cm_craftcode + "' ");
|
|
|
@@ -373,7 +373,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append("sp_bomversion='" + ms_bomversion.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' ");
|
|
|
sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where ");
|
|
|
sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_fsoncode=");
|
|
|
- sql.Append("sp_fsoncode and cm_status=0) group by sp_fsoncode order by SP_DETNO asc");
|
|
|
+ sql.Append("sp_fsoncode and cm_makecode = '" + ma_code.Text + "' and cm_status=0) group by sp_fsoncode order by SP_DETNO asc");
|
|
|
dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
code.Clear();
|
|
|
//用于记录提醒的数据长度
|
