From c2437f1d3cd60118074e9e332b9976cf4660922d Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 22 Dec 2025 14:25:44 +0800
Subject: [PATCH 1/2] 1

---
 .../HJGL/WeldingReport/IsoCmprehensive.aspx.cs         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
index f3c9782..6cdeb1a 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
@@ -30,6 +30,7 @@
                 this.drpProject.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProject.DataBind();
                 this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
+                Funs.FineUIPleaseSelect(this.drpProject);
 
                 var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(this.drpProject.SelectedValue, BLL.Const.UnitType_4);
                 ///单位
@@ -176,7 +177,14 @@
             {
                 listStr.Add(new SqlParameter("@EndDate", Convert.ToDateTime(this.txtEndDate.Text)));
             }
-            listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            if (this.drpProject.SelectedValue == BLL.Const._Null)
+            {
+                listStr.Add(new SqlParameter("@projectId", null));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
 
             //tb = (DataTable)CacheHelper.GetCache("HJGL_sp_rpt_iso_analyze");

From 79948bf676d49ec6853c677fd476fc6882a2e09b Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 23 Dec 2025 09:28:20 +0800
Subject: [PATCH 2/2] 1

---
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user             | 2 +-
 .../HJGL/WeldingManage/JointReportUpdate.aspx.cs            | 6 +++---
 HJGL_DS/FineUIPro.Web/Web.config                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 72b6a27..a1d9585 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
index ebe161c..a1207c5 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
@@ -240,7 +240,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 if (!string.IsNullOrEmpty(wmeCode))   //焊接方法
                 {
-                    if (wmeCode.Contains(welderQualify.WeldingMethodId))
+                    if (welderQualify.WeldingMethodId.Contains(wmeCode))
                     {
                         okNum++;
                     }
@@ -373,14 +373,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
             var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
             var floorQ = from x in floorWelderQualifys
-                         where wmeCode1.Contains(x.WeldingMethodId)
+                         where x.WeldingMethodId.Contains(wmeCode1)
                          && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
                          && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
                          && x.WeldType.Contains(weldType)
                          // && (dia == null || x.SizesMin<=dia)
                          select x;
             var cellQ = from x in cellWelderQualifys
-                        where wmeCode2.Contains(x.WeldingMethodId)
+                        where x.WeldingMethodId.Contains(wmeCode2)
                          && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
                          && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
                          && x.WeldType.Contains(weldType)
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 93f82b5..5c46a5b 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -67,7 +67,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>