取消采集不允许已装箱

UAS_MES_YD/FunctionCode/Special/Special_CancelCollection.cs

@@ -24,12 +24,12 @@ namespace UAS_MES_NEW.Special
         private void Confirm_Click(object sender, EventArgs e)
         {
             //获取序列号的途程
-            DataTable dt = (DataTable)dh.ExecuteSql("select 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 + "' or ms_imei2='" + sn_code.Text + "') and ms_makecode='" + ms_makecode.Text + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_outboxcode,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 + "' or ms_imei2='" + sn_code.Text + "') and ms_makecode='" + ms_makecode.Text + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 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();
+                string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 string ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
                 string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
@@ -37,6 +37,11 @@ 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();
+                if (ms_outboxcode != "")
+                {
+                    OperateResult.AppendText(">>序列号" + sn_code.Text + "已经装箱" + ms_outboxcode + "\n");
+                    return;
+                }
                 sql.Clear();
                 sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid where ");
                 sql.Append("cr_prodcode='" + pr_code + "' and cr_code='" + cr_code + "' order by cd_detno ");
@@ -82,8 +87,8 @@ 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("update makeaddresslist set mal_sncode='',mal_status=0 where (mal_sncode='" + sn_code.Text + "' or mal_sncode='"+ ms_firstsn + "' )and mal_makecode='" + ms_makecode + "'");
-                sqls.Add("update makeimeilist set mil_sncode='',mil_status=0 where (mil_sncode='" + sn_code.Text + "' or mil_sncode='"+ ms_firstsn + "') and mil_makecode='" + ms_makecode + "'");
+                sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where (mal_sncode='" + sn_code.Text + "' or mal_sncode='" + ms_firstsn + "' )and mal_makecode='" + ms_makecode + "'");
+                sqls.Add("update makeimeilist set mil_sncode='',mil_status=0 where (mil_sncode='" + sn_code.Text + "' or mil_sncode='" + ms_firstsn + "') and mil_makecode='" + ms_makecode + "'");
                 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 + "'");
                 //删除打印日志