This commit is contained in:
jackchenyang 2024-06-13 10:37:01 +08:00
parent 46e237e84e
commit bdcbefd8e7
2 changed files with 57 additions and 86 deletions

Binary file not shown.

View File

@ -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;