提交代码

2023-11-22 16:06:58 +08:00
parent 55b52e460a
commit 60d29ffb4e
8 changed files with 210 additions and 126 deletions
@@ -202,7 +202,10 @@ namespace BLL

            var mat1 = BLL.Base_MaterialService.GetMaterialByMaterialId(material1);
            var mat2 = BLL.Base_MaterialService.GetMaterialByMaterialId(material2);
-
+            if (mat1.MaterialCode == "No matl" || mat2.MaterialCode == "No matl")  //材质1或材质2有一种为无材质，则匹配不了wpq
+            {
+                return null;
+            }
            int m1 = SNClass(mat1.MaterialClass);
            int m2 = SNClass(mat2.MaterialClass);