|
|
@@ -31,6 +31,10 @@ namespace UAS_MES.Query
|
|
|
|
|
|
DataTable dt;
|
|
|
|
|
|
+ string ms_id;//记录ms_id
|
|
|
+
|
|
|
+ string sn;//记录数据的当前序列号
|
|
|
+
|
|
|
AutoSizeFormClass asc = new AutoSizeFormClass();
|
|
|
|
|
|
public Query_ExeProgress()
|
|
|
@@ -56,7 +60,8 @@ namespace UAS_MES.Query
|
|
|
{
|
|
|
if (e.KeyCode == Keys.Enter)
|
|
|
{
|
|
|
- string ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + sn_code.Text + "' or ms_beforesn='"+sn_code.Text+"'").ToString();
|
|
|
+ ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + sn_code.Text + "' or ms_beforesn='"+sn_code.Text+"'").ToString();
|
|
|
+ sn = dh.getFieldDataByCondition("makeserial","ms_sncode","ms_id='"+ms_id+"'").ToString();
|
|
|
dt = (DataTable)dh.ExecuteSql("select ms_status,ms_nextstepcode,ms_paststep,ms_stepcode,NVL(ms_ifrework, 0) ms_ifrework,NVL(ms_reworkstatus, 0) ms_reworkstatus from makeserial where ms_id='" + ms_id + "'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -211,7 +216,7 @@ namespace UAS_MES.Query
|
|
|
sql.Clear();
|
|
|
sql.Append("select mp_makecode,ma_prodcode,sc_linecode,ma_craftcode,mp_sourcecode,mp_sncode,");
|
|
|
sql.Append("mp_indate,mp_inman,em_name from makeprocess left join make on mp_makecode=ma_code left join employee on mp_inman = em_code left join source on ");
|
|
|
- sql.Append("mp_sourcecode=sc_code where mp_sncode='" + sn_code.Text + "' and ma_code='" + dt.Rows[0]["ms_makecode"].ToString() + "'");
|
|
|
+ sql.Append("mp_sourcecode=sc_code where mp_sncode='" + sn + "' and ma_code='" + dt.Rows[0]["ms_makecode"].ToString() + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
BaseUtil.FillDgvWithDataTable(CraftInfDgv, dt);
|
|
|
}
|
shim