BUG优化

UAS_MES_JH/FunctionCode/Make/Make_TestCollectionqrcode.cs

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