修改优化

UAS_MES_JH/FunctionCode/Make/Make_TestCollectionqrcode.cs

@@ -290,7 +290,7 @@ namespace UAS_MES_NEW.Make
                         }
                         if (dh.CheckExist("product", "pr_code  = '" + ma_prodcode.Text + "' and pr_volume = -1 "))
                         {
-                            bool shouldNotIntercept = !string.IsNullOrEmpty(bt) && bt.Contains("UNKNOWN");
+                            bool shouldNotIntercept = !string.IsNullOrEmpty(bt) || bt.Contains("UNKNOWN");
                             if (!shouldNotIntercept)  // 若不满足不拦截条件，则拦截
                             {
                                 OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " BT信息异常\n", Color.Red);
@@ -299,10 +299,10 @@ namespace UAS_MES_NEW.Make
                         }
                         if (dh.CheckExist("product", "pr_code  = '" + ma_prodcode.Text + "' and pr_height = -1 ") )
                         {
-                            bool shouldNotIntercept = !string.IsNullOrEmpty(bt) && mac.Contains("UNKNOWN");
+                            bool shouldNotIntercept = !string.IsNullOrEmpty(bt) || mac.Contains("UNKNOWN");
                             if (!shouldNotIntercept)  // 若不满足不拦截条件，则拦截
                             {
-                                OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " BT信息异常\n", Color.Red);
+                                OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " WIFI信息异常\n", Color.Red);
                                 return;
                             }
                         }