diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index b6dbabd..1758fee 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
index f833f0e..f5670bd 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
@@ -1020,7 +1020,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id)
-                                || (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id))
+                                && (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id))
                             {
                                 errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；";
                             }
@@ -1041,7 +1041,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.Material2Id) &&  steel.MaterialId!=d.Material2Id)
-                                || (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id))
+                                && (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id))
                             {
                                 errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；";
                             }
@@ -1063,7 +1063,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
-                                || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
+                                && (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
 
                             {
                                 errorInfos += (i + 2) + "行,组件1[" + ds.Tables[0].Rows[i]["组件1"].ToString() + "]验证不一至；";
@@ -1085,7 +1085,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
-                                || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
+                                && (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
                             {
                                 errorInfos += (i + 2) + "行,组件2[" + ds.Tables[0].Rows[i]["组件2"].ToString() + "]验证不一至；";
                             }
@@ -1099,7 +1099,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString()))
                     {
                         if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo1)
-                            || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2))
+                            && (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2))
                         {
                             errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；";
                         }
@@ -1112,7 +1112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString()))
                     {
                         if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo1)
-                           || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2))
+                           && (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2))
                         {
                             errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；";
                         }