shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shecs:bdcbefd8e7da99826006a87e3e0c0d57b6e08a11
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:e9448a10056bc970a4279febf2df59e129d20eb9
Branches Tags
shecs:master
shecs:Feature_20240510

No commits in common. "bdcbefd8e7da99826006a87e3e0c0d57b6e08a11" and "e9448a10056bc970a4279febf2df59e129d20eb9" have entirely different histories.
bdcbefd8e7 ... e9448a1005

3 changed files with 87 additions and 58 deletions
Show Stats Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

2
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />

143
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
View File

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