|
|
@@ -259,7 +259,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//将录入框的值给序列号
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ma_prodcode,ma_bomversion,ma_qty,ma_code,pr_detail,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
|
|
|
+ sql.Append("select ma_prodcode,ma_craftcode,ma_bomversion,ma_qty,ma_code,pr_detail,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");
|
|
|
@@ -273,6 +273,11 @@ namespace UAS_MES.Make
|
|
|
nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
|
|
|
ms_status = dt.Rows[0]["ms_status"].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_craftcode='" + ma_craftcode.Text + "' and sb_bomversion='" + ma_bomversion.Text + "' order by sp_detno").ToString();
|
|
|
+ if (ifforsn != "" && ifforsn != "0")
|
|
|
+ iflastsn.Checked = true;
|
|
|
+ else
|
|
|
+ iflastsn.Checked = false;
|
|
|
LockMakeCode.Checked = true;
|
|
|
string oMakeCode = "";
|
|
|
string oMsID = "";
|