1.序列号烧录转换IMEI读取重复BUG修改

2.SMT测试采集增加不良零件BUG修改

UAS_MES_NEW/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -556,12 +556,14 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText(">>备注栏信息为空,录入备注信息\n", Color.Black);
                         Remark.SelectAll();
                         Remark.Focus();
+                        imei.Replace(code.Text, "");
                         return false;
                     }
                     if (IFONLY.Checked)
                     {
                         if (!CheckPre())
                         {
+                            imei.Replace(code.Text, "");
                             return false;
                         }
                         string UsedSncode = dh.getFieldDataByCondition("SNRELATIONINFORECORD", "SIR_SNCODE", "sir_remark = '" + Remark.Text + "'").ToString();
@@ -570,6 +572,7 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText(">>备注信息" + Remark.Text + "已被" + UsedSncode + "采集，不可重复采集\n", Color.Red);
                             Remark.SelectAll();
                             Remark.Focus();
+                            imei.Replace(code.Text, "");
                             return false;
                         }
                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", ms_macode.Text, ma_prodcode.Text, Remark.Text);
@@ -578,6 +581,7 @@ namespace UAS_MES_NEW.Make
                     {
                         if (!CheckPre())
                         {
+                            imei.Replace(code.Text, "");
                             return false;
                         }
                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", ms_macode.Text, ma_prodcode.Text, Remark.Text);

UAS_MES_NEW/FunctionCode/Make/Make_SmtTestCollection.cs

@@ -872,14 +872,17 @@ namespace UAS_MES_NEW.Make
             {
                 for (int i = 0; i < MakeBadView.Rows.Count; i++)
                 {
-                    if ((Boolean)MakeBadView.Rows[i].Cells["choose1"].Value == true)
+                    if (MakeBadView.Rows[i].Cells["choose1"].Value != null)
                     {
-                        if (MakeBadView.Rows[i].Cells["mbp_part"].Value.ToString() == "")
+                        if ((Boolean)MakeBadView.Rows[i].Cells["choose1"].Value == true)
                         {
-                            MakeBadView.Rows[i].Cells["mbp_part"].Value = bd_soncode.Text;
+                            if (MakeBadView.Rows[i].Cells["mbp_part"].Value.ToString() == "")
+                            {
+                                MakeBadView.Rows[i].Cells["mbp_part"].Value = bd_soncode.Text;
+                            }
+                            else if (!MakeBadView.Rows[i].Cells["mbp_part"].Value.ToString().Contains(bd_soncode.Text))
+                                MakeBadView.Rows[i].Cells["mbp_part"].Value += "," + bd_soncode.Text;
                         }
-                        else if (!MakeBadView.Rows[i].Cells["mbp_part"].Value.ToString().Contains(bd_soncode.Text))
-                            MakeBadView.Rows[i].Cells["mbp_part"].Value += "," + bd_soncode.Text;
                     }
                 }
             }