取消采集日志删除

UAS_MES_LGDZ/FunctionCode/Special/Special_CancelCollectionWN.cs

@@ -24,7 +24,7 @@ namespace UAS_MES_NEW.Special
         private void Confirm_Click(object sender, EventArgs e)
         {
             //获取序列号的途程
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,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_imei2='" + sn_code.Text + "')and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_code,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,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_imei2='" + sn_code.Text + "')and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 string pr_code = dt.Rows[0]["ms_prodcode"].ToString();
@@ -38,6 +38,7 @@ namespace UAS_MES_NEW.Special
                 string ms_currentstepcode = dt.Rows[0]["ms_currentstepcode"].ToString();
                 string ms_id = dt.Rows[0]["ms_id"].ToString();
                 string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
+                string ms_code = dt.Rows[0]["ms_code"].ToString();
                 sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
                 sql.Clear();
                 sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid where ");
@@ -100,7 +101,7 @@ namespace UAS_MES_NEW.Special
                 //更新MAC使用记录
                 sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + sn_code.Text + "' and mal_makecode='" + ms_makecode + "'");
                 //解除前一工单板的使用
-                sqls.Add("update makeserial set ms_nextmacode='' where ms_firstsn='" + ms_firstsn + "' and ms_nextmacode='" + ms_makecode + "'");
+                sqls.Add("update makeserial set ms_nextmacode='' where ms_firstsn='" + ms_firstsn + "' or ms_code='"+ ms_code + "' and ms_nextmacode='" + 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'");
                 ////初始化号段状态
@@ -113,8 +114,7 @@ namespace UAS_MES_NEW.Special
                 //投入数-1
                 sqls.Add("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'");
                 //删除StepPass
-                sqls.Add("delete from steppassed where sp_sncode='" + ms_firstsn + "' and sp_makecode='" + ms_makecode + "'");
-                sqls.Add("delete from steppassed where sp_sncode='" + sn_code.Text + "' and sp_makecode='" + ms_makecode + "'");
+                sqls.Add("delete from steppassed where sp_sncode='" + ms_firstsn + "' or sp_sncode='"+ ms_code + "' and sp_makecode='" + ms_makecode + "'");
                 sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
                 dh.ExecuteSQLTran(sqls.ToArray());
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", sn_code.Text, "");

UAS_MES_LGDZ/FunctionCode/Special/Special_Delete.cs

@@ -56,11 +56,12 @@ namespace UAS_MES_NEW.Special
 
         private bool ReSN(string sncode)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_sncode from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_sncode,ms_code from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
+                string ms_code = dt.Rows[0]["ms_code"].ToString();
                 dh.ExecuteSql("delete makeserial  where ms_sncode='" + sncode + "' and ms_makecode='" + ms_makecode + "'", "update");
                 dh.ExecuteSql("delete makebad where mb_sncode = '" + sncode + "' and mb_status = 0", "delete");
                 dh.ExecuteSql("delete labelprintlog where lpl_value = '" + sncode + "' and lpl_makecode='" + ms_makecode + "'", "delete");
@@ -77,7 +78,7 @@ namespace UAS_MES_NEW.Special
                 //删除IMIE分配记录
                 sqls.Add("update  makeimeilist set mil_status=0 where mil_sncode='" + ms_sncode + "' and mil_makecode='" + ms_makecode + "'");
                 //更新MAC使用记录
-                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='"+ms_sncode+"' and ms_nextmacode='" + ms_makecode + "'");
+                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='"+ms_sncode+"' or ms_code='"+ ms_code + "' and ms_nextmacode='" + ms_makecode + "'");
                 sqls.Add("update  makeaddresslist set mal_status=0 where mal_sncode='" + ms_sncode + "' and mal_makecode='" + ms_makecode + "'");
                 //初始化导入数据状态
                 sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + ms_sncode + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");

UAS_MES_LGDZ/FunctionCode/Special/Special_DeleteWN.cs

@@ -56,11 +56,12 @@ namespace UAS_MES_NEW.Special
 
         private bool ReSN(string sncode)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_sncode,ms_outboxcode from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_sncode,ms_outboxcode,ms_code from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
+                string ms_code = dt.Rows[0]["ms_code"].ToString();
                 string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
                 if (ms_outboxcode != "") {
                     OperatResult.AppendText("SN：" + sncode + "已装箱不允许解绑\n", Color.Red);
@@ -79,10 +80,11 @@ namespace UAS_MES_NEW.Special
                 sqls.Add("delete from labelprintlog where lpl_value='" + ms_sncode + "' and lpl_makecode='" + ms_makecode + "'");
                 //删除老化记录
                 sqls.Add("delete from AGINGRECORD where ar_sncode='" + ms_sncode + "' and ar_macode='" + ms_makecode + "'");
+                sqls.Add("delete from steppassed where sp_sncode='" + ms_sncode + "' or sp_sncode='"+ms_code+"' and sp_makecode='" + ms_makecode + "'");
                 //删除IMIE分配记录
                 sqls.Add("update  makeimeilist set mil_status=0,mil_sncode='',mil_psn='' where mil_sncode='" + ms_sncode + "' and mil_makecode='" + ms_makecode + "'");
                 //更新MAC使用记录
-                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='"+ms_sncode+"' and ms_nextmacode='" + ms_makecode + "'");
+                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + ms_sncode + "' or ms_code='" + ms_code + "' and ms_nextmacode='" + ms_makecode + "'");
                 sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + ms_sncode + "' and mal_makecode='" + ms_makecode + "'");
                 //初始化导入数据状态
                 sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + ms_sncode + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");