|
|
@@ -57,6 +57,7 @@ namespace UAS_MES.Make
|
|
|
|
|
|
li_code.TableName = "Line";
|
|
|
li_code.SelectField = "li_code # 线别编号,li_name # 线别名称";
|
|
|
+ li_code.Condition = "li_wccode='SMT'";
|
|
|
li_code.FormName = Name;
|
|
|
li_code.SetValueField = new string[] { "li_code", "li_name" };
|
|
|
li_code.DbChange += Li_code_DbChange;
|
|
|
@@ -100,7 +101,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
MessageBox.Show("工单号不能为空");
|
|
|
}
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS from Stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS from Stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string status = dt.Rows[0]["ST_USESTATUS"].ToString();
|
|
|
@@ -112,7 +113,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
|
|
|
+ MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
|
|
|
}
|
|
|
dt = (DataTable)dh.ExecuteSql("select 1 from STENILCANUSEPRO where sp_stcode='" + SU_DEVCODE.Text + "' and sp_prodcode='" + ma_prodcode.Text + "'", "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
@@ -140,7 +141,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (SU_RETURNIFCLEAN.Checked)
|
|
|
{
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string status = dt.Rows[0]["ST_USESTATUS"].ToString();
|
|
|
@@ -157,7 +158,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
|
|
|
+ MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
|
|
|
}
|
|
|
string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
|
|
|
sql.Clear();
|
|
|
@@ -340,10 +341,10 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (e.KeyCode == Keys.Enter)
|
|
|
{
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
{
|
|
|
- MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
|
|
|
+ MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
|
|
|
}
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -367,14 +368,14 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (e.KeyCode == Keys.Enter)
|
|
|
{
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
|
|
|
+ MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
|
|
|
}
|
|
|
}
|
|
|
}
|