|
@@ -24,10 +24,11 @@ namespace UAS_MES_NEW.Special
|
|
|
private void Confirm_Click(object sender, EventArgs e)
|
|
|
{
|
|
|
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_nextstepcode,ms_currentstepcode,ms_outboxcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' and ms_outboxcode is null order by ms_id desc", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_outboxcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' or ms_imei1='" + sn_code.Text + "' and ms_outboxcode is null order by ms_id desc", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
|
|
|
+ string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
|
|
|
string pr_code = dt.Rows[0]["ms_prodcode"].ToString();
|
|
|
string cr_code = dt.Rows[0]["ms_craftcode"].ToString();
|
|
|
string ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
|
|
@@ -55,7 +56,7 @@ namespace UAS_MES_NEW.Special
|
|
|
{
|
|
|
sqls.Add("delete from makebad where mb_sncode='" + sn_code.Text + "' and mb_makecode='" + ms_makecode + "'");
|
|
|
|
|
|
- sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1 where mcd_macode='" + ms_makecode + "' and instr((select ms_paststep from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='"+ ms_makecode + "'),mcd_stepcode)>0 ");
|
|
|
+ sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1 where mcd_macode='" + ms_makecode + "' and instr((select ms_paststep from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode + "'),mcd_stepcode)>0 ");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -90,7 +91,7 @@ namespace UAS_MES_NEW.Special
|
|
|
dh.BatchInsert(sql.GetString(), new string[] { "barcode" }, barcode.ToArray());
|
|
|
sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
|
|
|
}
|
|
|
- sqls.Add("delete from sninfo where si_sn='" + sn_code.Text + "'");
|
|
|
+ sqls.Add("delete from sninfo where si_sn='" + sn_code.Text + "' or si_sn='" + ms_firstsn + "'");
|
|
|
sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");
|
|
|
|
|
|
sqls.Add("delete from labelprintlog where lpl_value='" + sn_code.Text + "' and lpl_makecode='" + ms_makecode + "'");
|
|
@@ -99,6 +100,10 @@ namespace UAS_MES_NEW.Special
|
|
|
|
|
|
sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + sn_code.Text + "' and ms_nextmacode='" + ms_makecode + "'");
|
|
|
|
|
|
+ sqls.Add("update makeimeilist set mil_status=0,mil_sncode='' where ( mil_sncode='" + sn_code.Text + "' or mil_psn='" + sn_code.Text + "') and mil_makecode='" + ms_makecode + "'");
|
|
|
+
|
|
|
+ sqls.Add("update makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + sn_code.Text + "' and mal_makecode='" + ms_makecode + "'");
|
|
|
+
|
|
|
sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
|
|
|
|
|
|
sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "' and msd_type='before'");
|