|
|
@@ -208,7 +208,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ms_firstsn,cm_makecode,cm_craftcode,nvl(cm_status,0)cm_status,cm_id,cm_stepcode,");
|
|
|
+ sql.Append("select ms_sncode,ms_firstsn,cm_makecode,cm_craftcode,nvl(cm_status,0)cm_status,cm_id,cm_stepcode,");
|
|
|
sql.Append("ms_makecode,cm_mccode,cm_materialtype from craftmaterial left join makeserial on cm_makecode");
|
|
|
sql.Append("=ms_makecode and cm_sncode=ms_sncode where cm_sncode='" + code.Text + "' and cm_makecode='" + oMakeCode + "'");
|
|
|
sql.Append("and cm_materialtype=1");
|
|
|
@@ -216,7 +216,7 @@ namespace UAS_MES_NEW.Make
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string ms_macode = dt.Rows[0]["ms_makecode"].ToString();
|
|
|
- string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
|
|
|
+ string ms_firstsn = dt.Rows[0]["ms_sncode"].ToString();
|
|
|
string cm_stepcode = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
string cm_mccode = dt.Rows[0]["cm_mccode"].ToString();
|
|
|
string cm_materialtype = dt.Rows[0]["cm_materialtype"].ToString();
|
|
|
@@ -290,7 +290,7 @@ namespace UAS_MES_NEW.Make
|
|
|
//将录入框的值给序列号
|
|
|
sn_code.Text = code.Text;
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,ma_bomversion,ma_qty,ma_code,pr_spec,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
|
|
|
+ sql.Append("select ms_sncode,ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,ma_bomversion,ma_qty,ma_code,pr_spec,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
|
|
|
sql.Append(",ms_prodcode,ms_makecode,ms_code,ms_stepname from makeserial left join make on ma_code=ms_makecode ");
|
|
|
sql.Append("left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' order by ms_id desc");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
@@ -302,7 +302,7 @@ namespace UAS_MES_NEW.Make
|
|
|
make_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
|
|
|
nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
|
|
|
ms_status = dt.Rows[0]["ms_status"].ToString();
|
|
|
- ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
|
|
|
+ ms_firstsn = dt.Rows[0]["ms_sncode"].ToString();
|
|
|
BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
string ifforsn = dh.getFieldDataByCondition("make left join stepbom on ma_prodcode=sb_prodcode left join stepproduct on sb_id=sp_sbid", "nvl(sp_ifforsn,0) sp_ifforsn", "ma_code='" + ma_code.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' and sp_craftcode='" + ms_craftcode.Text + "' and sb_bomversion='" + ma_bomversion.Text + "' order by sp_detno").ToString();
|
|
|
if (ifforsn != "" && ifforsn != "0")
|
callm