Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -260,7 +260,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        if (LogicHandler.CS_SetResult(ms_makecode.Text, User.UserSourceCode,sncode.Text, User.UserCode,"BT/MAC采集完成",  out ErrorMessage))
+                        if (LogicHandler.CS_SetResult(ms_makecode.Text, User.UserSourceCode, sn_code, User.UserCode,"BT/MAC采集完成",  out ErrorMessage))
                         {
                             dh.UpdateByCondition("makeserial", "ms_mac = '" + sncode.Text + "' ," + "ms_bt = '" + ms_bt + "'", "ms_id = '" + oMsID + "'");
                             ErrorMessage = "BT/MAC采集完成,执行更新";
@@ -279,6 +279,7 @@ namespace UAS_MES.Make
                         else
                         {
                             OperateResult.AppendText(">>采集错误" + ErrorMessage + "\n", Color.Red);
+                            return;
                         }
                         ErrorMessage = ">>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);