Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -148,9 +148,6 @@ namespace UAS_MES.Make
                                         //IMEI核对成功
                                         //>> 请输入SN
                                         OperateResult.AppendText("<<核对成功\n", Color.Green, sncode);
-                                        OperateResult.AppendText(">>请采集SN\n", Color.Black);
-                                        checkIndex = 0;
-                                        isCheckItem = false;
                                     }
                                     else
                                     {
@@ -172,6 +169,9 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                                 recordResult(SN, DateTime.Now.ToString(), "失败");
                             }
+                            OperateResult.AppendText(">>请采集SN\n", Color.Black);
+                            checkIndex = 0;
+                            isCheckItem = false;
                         }
                         else
                         {