20260702

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs

@@ -28,7 +28,8 @@ namespace FineUIPro.Web.ContinuousPrint
                 }
                 BindGrid();
                 this.Grid1.SelectedRowID = this.CurrUser.LoginProjectId;
-                BindGrid1(this.CurrUser.LoginProjectId);
+                //BindGrid1(this.CurrUser.LoginProjectId);
+                Grid1_RowClick(sender, null);
             }
         }
 

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj

@@ -7010,7 +7010,7 @@
     </Compile>
     <Compile Include="JGZL\Cover.aspx.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\Cover.aspx.designer.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
@@ -7080,7 +7080,7 @@
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.designer.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
@@ -7149,14 +7149,14 @@
       <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.cs">
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.designer.cs">
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.cs">
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>ConcealedWorksInspectionRecordEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.designer.cs">

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <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 />

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs

@@ -39,7 +39,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 this.drpIsoId.DataBind();
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                this.txtEndDate.Text = DateTime.Now.ToShortDateString();
+                //this.txtEndDate.Text = DateTime.Now.ToShortDateString();
 
                 // 绑定表格
                 BindGrid();
@@ -51,41 +51,48 @@ namespace FineUIPro.Web.HJGL.WeldingReport
         /// </summary>
         private void BindGrid()
         {
-            //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
+            string strSql = @" select distinct batch.ProjectId,
-            //                          (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝' 
+                                    Project.ProjectCode,
-            //                                WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+                                    Project.ProjectName,
-            //                         v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
+                                    weldReport.JOT_WeldDate,
-            //                    FROM
-            //                      (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
-            //                         FROM  dbo.HJGL_BO_BatchDetail batchDetail
-            //                               LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
-            //                               LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
-            //                               LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
-            //                        WHERE BatchDetail.VICheckDate IS NOT NULL
-            //                             GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
-            //                       LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
-            //                       LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID    
-            //                   WHERE 1=1";
-            string strSql = @"select distinct batch.BatchCode,
-                                    batch.ProjectId,
-                                    batch.NDTR_ID,
-                                    project.ProjectCode,
-                                    project.ProjectName,
-                                    isoinfo.ISO_ID,
-                                    isoinfo.ISO_IsoNo,
-                                    batchDetail.VICheckDate,
-                                    rate.NDTR_Name,
-                                    jointType.JOTY_Group,
                                     (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝' 
-		                                    WHEN jointType.JOTY_Group='2' THEN '角焊缝' 
+		                            WHEN jointType.JOTY_Group='2' THEN '角焊缝' 
-		                                     WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
+                                    WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
-                        from HJGL_BO_BatchDetail as batchDetail
+                                    jointType.JOTY_Group,
-                        left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
+                                    rate.NDTR_ID,
-                        left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
+                                    rate.NDTR_Name,
-                        left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
+                                    isoInfo.ISO_ID,
-                        left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
+                                    isoInfo.ISO_IsoNo,
-                        left join Base_Project as project on project.ProjectId = batch.ProjectId
+                                    batch.BatchCode,
-                        LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
+                                    batchDetail.VICheckDate
+                                    from HJGL_BO_BatchDetail batchDetail
+                            JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+                            LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+                            left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
+                            LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+                            left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
+                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID
+                            LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId and joint.DReportID IS NOT NULL ";
+            //string strSql = @"select distinct batch.BatchCode,
+            //                        batch.ProjectId,
+            //                        batch.NDTR_ID,
+            //                        project.ProjectCode,
+            //                        project.ProjectName,
+            //                        isoinfo.ISO_ID,
+            //                        isoinfo.ISO_IsoNo,
+            //                        batchDetail.VICheckDate,
+            //                        rate.NDTR_Name,
+            //                        jointType.JOTY_Group,
+            //                        (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝' 
+		          //                          WHEN jointType.JOTY_Group='2' THEN '角焊缝' 
+		          //                           WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
+            //            from HJGL_BO_BatchDetail as batchDetail
+            //            left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
+            //            left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
+            //            left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
+            //            left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
+            //            left join Base_Project as project on project.ProjectId = batch.ProjectId
+            //            LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
             {

HJGL_DS/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -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>