From bdcbefd8e7da99826006a87e3e0c0d57b6e08a11 Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Thu, 13 Jun 2024 10:37:01 +0800
Subject: [PATCH] 112

---
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1069056 -> 1261056 bytes
 .../TestPackageManageAudit.aspx.cs            | 143 +++++++-----------
 2 files changed, 57 insertions(+), 86 deletions(-)

diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index e8f5e966cec6bc70152b7d45eb407113cdd2e31d..9837c9ceadb163e0bfa8b2f980df02d49767da3e 100644
GIT binary patch
delta 55910
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

delta 16615
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

diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
index d673a15..21e8f6b 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
@@ -3998,81 +3998,53 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             ////模拟数据
             //string sql = "SELECT '' AS totalNum,'' TestPackageNo,'' PipelineId,'模拟数据' PipelineCode,'' Specification,'' MaterialCode,'' WelderCode,''  FNum,''  NdeNum,''  FNdeNum,'' NdeCode from Sys_User union all SELECT '' AS totalNum,'' TestPackageNo,'' PipelineId,'模拟数据' PipelineCode,'' Specification,'' MaterialCode,'' WelderCode,''  FNum,''  NdeNum,''  FNdeNum,'' NdeCode from Sys_User union all SELECT '' AS totalNum,'' TestPackageNo,'' PipelineId,'模拟数据' PipelineCode,'' Specification,'' MaterialCode,'' WelderCode,''  FNum,''  NdeNum,''  FNdeNum,'' NdeCode from Sys_User";
 
-            string sql = @"
-                SELECT COUNT(1) AS totalNum,
-                t.TestPackageNo,
-                t.PipelineId,
-                T.PipelineCode,
-                t.Specification,
-                t.MaterialCode,
-                t.WelderCode,
-                (SELECT COUNT(1) FROM dbo.View_Pipeline_WeldJoint AS jot  
-                  WHERE jot.PipelineId=T.PipelineId  AND jot.MaterialCode=t.MaterialCode AND jot.Specification=t.Specification
-                         AND jot.WelderCode=t.WelderCode AND jot.JointAttribute='固定F'
-                  ) AS FNum,
-                  SUM(T.NdeNum) AS NdeNum,
-                  SUM(t.FNdeNum) AS FNdeNum,
-                  NdeCode
-                 FROM 
-                 (
-                SELECT 
-                a.TestPackageNo,
-                b.PipelineId,
-                c.PipelineCode,
-                c.WeldJointId,
-                c.Specification,
-                c.MaterialCode,
-                c.WelderCode,
-                (SELECT COUNT(1) FROM dbo.Batch_NDEItem nde 
-                  LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
-                  WHERE trust.WeldJointId=c.WeldJointId) AS NdeNum, --检测数
-
-                STUFF((SELECT nde.NDEReportNo FROM dbo.Batch_NDEItem nde 
-                  LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
-                  WHERE trust.WeldJointId=c.WeldJointId for xml path('')),1,1,'') AS NdeCode, --检测报告编号
-
-                (SELECT COUNT(1) FROM dbo.Batch_NDEItem nde 
-                  LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
-                  LEFT JOIN dbo.Pipeline_WeldJoint j ON j.WeldJointId = trust.WeldJointId
-                  WHERE trust.WeldJointId=c.WeldJointId AND j.JointAttribute='固定F') AS FNdeNum --固定口检测数
-                FROM  dbo.PTP_TestPackage AS a
-                INNER JOIN  dbo.PTP_PipelineList AS b 
-                ON a.PTP_ID=b.PTP_ID
-                LEFT JOIN dbo.View_Pipeline_WeldJoint AS C
-                ON b.PipelineId=c.PipelineId
-                WHERE b.isAll=1 and b.PTP_ID=@PTPID and a.projectId=@projectId
-                UNION ALL
-                SELECT 
-                a.TestPackageNo,
-                b.PipelineId,
-                c.PipelineCode,
-                c.WeldJointId,
-                c.Specification,
-                c.MaterialCode,
-                c.WelderCode,
-                (SELECT COUNT(1) FROM dbo.Batch_NDEItem nde 
-                  LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
-                  WHERE trust.WeldJointId=c.WeldJointId) AS NdeNum, --检测数
-
-                STUFF((SELECT nde.NDEReportNo FROM dbo.Batch_NDEItem nde 
-                  LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
-                  WHERE trust.WeldJointId=c.WeldJointId for xml path('')),1,1,'') AS NdeCode, --检测报告编号
-
-                (SELECT COUNT(1) FROM dbo.Batch_NDEItem nde 
-                  LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
-                  LEFT JOIN dbo.Pipeline_WeldJoint j ON j.WeldJointId = trust.WeldJointId
-                  WHERE trust.WeldJointId=c.WeldJointId AND j.JointAttribute='固定F') AS FNdeNum --固定口检测数
-                FROM  dbo.PTP_TestPackage AS a
-                INNER JOIN  dbo.PTP_PipelineList AS b 
-                ON a.PTP_ID=b.PTP_ID
-                LEFT JOIN dbo.View_Pipeline_WeldJoint AS C
-                ON b.PipelineId=c.PipelineId
-                WHERE b.isAll=0  and b.PTP_ID=@PTPID and a.projectId=@projectId
-                AND PATINDEX('%'+c.WeldJointCode+'%',b.WeldJonintCode)>0
-                ) AS t 
-                GROUP BY t.TestPackageNo,t.PipelineCode,t.Specification,t.MaterialCode,t.WelderCode,
-                t.PipelineId,t.NdeCode
-                ";
+            string sql = @"SELECT H.*,
+	            Ma.MaterialCode, PPline.Specification FROM
+	            ( SELECT COUNT ( 1 ) AS totalNum,t.TestPackageNo,t.PipelineId,T.PipelineCode,t.WelderCode,
+		        (	SELECT COUNT( 1 ) FROM dbo.View_Pipeline_WeldJoint AS jot 
+		        WHERE jot.PipelineId= T.PipelineId  AND jot.WelderCode= t.WelderCode AND jot.JointAttribute= '固定F' 
+		        ) AS FNum,
+		        SUM ( T.NdeNum ) AS NdeNum,
+		        SUM ( t.FNdeNum ) AS FNdeNum,
+		        NdeCode 
+                FROM ( SELECT
+			    a.TestPackageNo,b.PipelineId,c.PipelineCode,c.WeldJointId,c.WelderCode,
+			    (SELECT COUNT( 1 ) FROM dbo.Batch_NDEItem nde
+				    LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId 
+			    WHERE trust.WeldJointId= c.WeldJointId ) AS NdeNum,--检测数
+			STUFF((SELECT nde.NDEReportNo FROM dbo.Batch_NDEItem nde
+				LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId 
+				WHERE trust.WeldJointId= c.WeldJointId FOR xml path ( '' ) ),1,1,'' ) AS NdeCode,--检测报告编号
+			(SELECT COUNT( 1 ) FROM dbo.Batch_NDEItem nde
+				LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
+				LEFT JOIN dbo.Pipeline_WeldJoint j ON j.WeldJointId = trust.WeldJointId 
+			WHERE trust.WeldJointId= c.WeldJointId  AND j.JointAttribute= '固定F'  ) AS FNdeNum --固定口检测数
+			FROM dbo.PTP_TestPackage AS a
+			INNER JOIN dbo.PTP_PipelineList AS b ON a.PTP_ID= b.PTP_ID
+			LEFT JOIN dbo.View_Pipeline_WeldJoint AS C ON b.PipelineId= c.PipelineId
+			LEFT JOIN dbo.Pipeline_Pipeline AS d ON b.PipelineId= d.PipelineId 
+		    WHERE b.isAll= 1 and a.ProjectId=@projectId and a.PTP_ID=@PTPID
+            UNION ALL
+		    SELECT a.TestPackageNo, b.PipelineId,d.PipelineCode,c.WeldJointId,c.WelderCode,
+			(SELECT COUNT( 1 ) 
+			FROM dbo.Batch_NDEItem nde LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId 
+			WHERE trust.WeldJointId= c.WeldJointId  ) AS NdeNum,--检测数
+			STUFF((SELECT nde.NDEReportNo FROM dbo.Batch_NDEItem nde
+				LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId 
+				WHERE trust.WeldJointId= c.WeldJointId FOR xml path ( '' ) ),1,1,'' ) AS NdeCode,--检测报告编号
+			(SELECT COUNT( 1 ) 
+			FROM dbo.Batch_NDEItem nde LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId
+			LEFT JOIN dbo.Pipeline_WeldJoint j ON j.WeldJointId = trust.WeldJointId 
+			WHERE trust.WeldJointId= c.WeldJointId  AND j.JointAttribute= '固定F' ) AS FNdeNum --固定口检测数
+			FROM dbo.PTP_TestPackage AS a INNER JOIN dbo.PTP_PipelineList AS b ON a.PTP_ID= b.PTP_ID
+			LEFT JOIN dbo.View_Pipeline_WeldJoint AS C ON b.PipelineId= c.PipelineId
+			LEFT JOIN dbo.Pipeline_Pipeline AS d ON b.PipelineId= d.PipelineId 
+		    WHERE b.isAll= 0  AND PATINDEX( '%' + c.WeldJointCode+ '%', b.WeldJonintCode ) > 0 
+            and a.ProjectId=@projectId and a.PTP_ID=@PTPID
+            ) AS t 
+	        GROUP BY t.TestPackageNo, t.PipelineCode, t.WelderCode, t.PipelineId, t.NdeCode ) AS H
+	        LEFT JOIN Pipeline_Pipeline AS PPline ON H.PipelineId= PPline.PipelineId
+	        LEFT JOIN Base_Material AS Ma ON PPline.MainMaterialId= Ma.MaterialId";
 
             SqlParameter[] parms =
             {
@@ -4358,23 +4330,22 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
                 ws.GetRow(rowIndex + 17).GetCell(0).CellStyle = ws.GetRow(rowIndex + 17).GetCell(4).CellStyle = ws.GetRow(rowIndex + 17).GetCell(10).CellStyle = ws.GetRow(rowIndex + 17).GetCell(17).CellStyle = style1;
                 ws.GetRow(rowIndex + 17).Height = 28 * 20;
 
-                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 23, rowIndex + 23, 0, 3));
-                ws.GetRow(rowIndex + 23).GetCell(0).SetCellValue("专业工程师\r\nDiscipline Engineer:");
-                ws.GetRow(rowIndex + 23).Height = 25 * 20;
+                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 0, 3));
+                ws.GetRow(rowIndex + 18).GetCell(0).SetCellValue("专业工程师\r\nDiscipline Engineer:");
+                ws.GetRow(rowIndex + 18).Height = 25 * 20;
 
-                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 23, rowIndex + 23, 4, 9));
-                ws.GetRow(rowIndex + 23).GetCell(4).SetCellValue("专业工程师\r\nDiscipline Engineer:");
+                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 4, 9));
+                ws.GetRow(rowIndex + 18).GetCell(4).SetCellValue("专业工程师\r\nDiscipline Engineer:");
 
-                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 23, rowIndex + 23, 10, 16));
-                ws.GetRow(rowIndex + 23).GetCell(10).SetCellValue("专业工程师\r\nDiscipline Engineer:");
+                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 10, 16));
+                ws.GetRow(rowIndex + 18).GetCell(10).SetCellValue("专业工程师\r\nDiscipline Engineer:");
 
-                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 23, rowIndex + 23, 17, 20));
-                ws.GetRow(rowIndex + 23).GetCell(17).SetCellValue("专业工程师\r\nDiscipline Engineer:");
+                ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 17, 20));
+                ws.GetRow(rowIndex + 18).GetCell(17).SetCellValue("专业工程师\r\nDiscipline Engineer:");
 
                 ws.AddMergedRegion(new CellRangeAddress(rowIndex + 20, rowIndex + 20, 17, 20));
                 ws.GetRow(rowIndex + 20).GetCell(17).SetCellValue("质量检查员：\r\nQuality Inspector:");
                 ws.GetRow(rowIndex + 20).Height = 25 * 20;
-
                 ws.AddMergedRegion(new CellRangeAddress(rowIndex + 22, rowIndex + 22, 17, 20));
                 ws.GetRow(rowIndex + 22).GetCell(17).SetCellValue("制表：\r\nPrepared:");
                 ws.GetRow(rowIndex + 22).Height = 25 * 20;
@@ -4409,7 +4380,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
 
                 #endregion
 
-                rowIndex = rowIndex + 24;
+                rowIndex = rowIndex + 23;
             }
 
             ws.PrintSetup.Landscape = true;