标签核对处理macbt 比对问题

UAS-MES/FunctionCode/Make/Make_LabelCheck.Designer.cs

@@ -230,7 +230,7 @@
             this.cancel.Power = null;
             this.cancel.Size = new System.Drawing.Size(88, 28);
             this.cancel.TabIndex = 17;
-            this.cancel.Text = "取消核对";
+            this.cancel.Text = "重新核对";
             this.cancel.UseVisualStyleBackColor = false;
             this.cancel.Click += new System.EventHandler(this.cancel_Click);
             // 

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -116,7 +116,7 @@ namespace UAS_MES.Make
                 else
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
-                    if (needCheckedInfo == sncode.Text)
+                    if (needCheckedInfo == sncode.Text||((needCheckedInfo == sncode.Text.Replace(":", "").Replace("-", ""))&&(checkItemInfo.Rows[checkIndex]["checkitem"].ToString() == "MAC"|| checkItemInfo.Rows[checkIndex]["checkitem"].ToString() == "BT")))
                     {
                         checkIndex += 1;//序号+1，进入下一步
                         if (checkIndex == checkItemInfo.Rows.Count)