From 2c7c66d9392f69a61bbf8a57f5ffc302399cb020 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Mon, 20 Oct 2025 13:19:10 +0800
Subject: [PATCH] =?UTF-8?q?20251020=20=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/HJGLDB_DS_2025-10-20_bwj.sql | 129 +++++++
.../Fastreport/管道无损检测数量统计表.frx | 325 ++++++++++++++++++
.../Fastreport/管道无损检测结果汇总表.frx | 34 +-
.../管道焊接接头射线检测比例确认表（一）.frx | 261 ++++++++++++++
.../CheckManage/CheckQuantityStatistics.aspx | 5 +
.../CheckQuantityStatistics.aspx.cs | 90 ++++-
.../CheckQuantityStatistics.aspx.designer.cs | 68 ++--
.../HJGL/CheckManage/CheckResultsSummary.aspx | 4 +-
.../CheckManage/CheckResultsSummary.aspx.cs | 105 +++---
.../CheckResultsSummary.aspx.designer.cs | 169 +++++----
.../WeldingReport/RTCheckRateConfirm.aspx | 5 +
.../WeldingReport/RTCheckRateConfirm.aspx.cs | 72 ++++
.../RTCheckRateConfirm.aspx.designer.cs | 62 ++--
HJGL_DS/FineUIPro.Web/Web.config | 2 +-
14 files changed, 1121 insertions(+), 210 deletions(-)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-10-20_bwj.sql
create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测数量统计表.frx
create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头射线检测比例确认表（一）.frx
diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-20_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-20_bwj.sql
new file mode 100644
index 0000000..1d98d42
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2025-10-20_bwj.sql
@@ -0,0 +1,129 @@
+
+
+ALTER VIEW [dbo].[HJGL_View_CheckResultSummary1]
+/*ܱ-1*/
+AS
+
+SELECT batchItem.BatchDetailId,batch.ProjectId,batch.BatchCode,iso.ISO_IsoNo,jot.JOT_JointNo,
+ jot.Sort1,jot.Sort2,jot.Sort3,jot.Sort4,jot.Sort5,
+ iso.ISO_ID,jot.JOT_JointDesc,batch.BatchId,batchItem.NDT,
+ (case when welder.WED_Code is null then
+ (case when welder2.WED_Code is not null then welder2.WED_Code end)
+ else (case when welder2.WED_Code is not null and welder.WED_Code<>welder2.WED_Code
+ then welder.WED_Code+'/'+welder2.WED_Code
+ else welder.WED_Code end) end) as WED_Code,--
+ iso.ISC_ID,iso.SER_ID,jot.STE_ID,joty.JOTY_Group,jot.JOT_Dia
+FROM dbo.HJGL_BO_BatchDetail batchItem
+LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId = batchItem.BatchId
+LEFT JOIN dbo.HJGL_PW_JointInfo jot ON jot.JOT_ID=batchItem.JOT_ID
+LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID=jot.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_CellWelder
+LEFT JOIN dbo.HJGL_BS_Welder welder2 ON welder2.WED_ID = jot.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_BS_JointType joty ON joty.JOTY_ID = jot.JOTY_ID
+
+WHERE batchItem.NDT IS NOT NULL
+
+
+GO
+
+
+ALTER PROCEDURE [dbo].[HJGL_sp_CheckResultSummary]
+(
+ @ProjectId NVARCHAR(50),
+ @ISC_ID NVARCHAR(50), --ܵȼ
+ @SER_ID NVARCHAR(50), --
+ @STE_ID NVARCHAR(50), --
+ @Flag CHAR(1)
+)
+/*ܱ*/
+AS
+BEGIN
+IF(@Flag='1')
+BEGIN
+SELECT v.*
+FROM
+(SELECT ROW_NUMBER() OVER(ORDER BY case when RTReport is null then 1 else 0 end asc, RTReport,UTReport,MTReport,PTReport) AS Number,
+ BatchDetailId, ISO_IsoNo,
+ (JOT_JointNo+(case (select top (1) PointType from dbo.HJGL_BO_BatchDetail bd where bd.BatchDetailId=c.BatchDetailId ORDER BY bd.PointType) when '2' then 'K'
+ else '' end)) as JOT_JointNo,
+ WED_Code, BatchCode,
+
+ (CASE (CASE WHEN RT IS NULL THEN ISNULL(UT,'') ELSE (CASE WHEN UT IS NULL THEN ISNULL(RT,'')
+ ELSE (ISNULL(RT,'') +'/'+ ISNULL(UT,'')) END) END)
+ WHEN '2' THEN 'ϸ' WHEN '2/4' THEN 'ϸ/ϸ' WHEN '4/2' THEN 'ϸ/ϸ' WHEN '4' THEN 'ϸ' ELSE '' END) AS RTUTResult,
+
+ CASE WHEN RTReport IS NULL THEN ISNULL(UTReport,'') ELSE (CASE WHEN UTReport IS NULL THEN ISNULL(RTReport,'')
+ ELSE (ISNULL(RTReport,'') +'/'+ ISNULL(UTReport,'')) END) END AS RTUTReport,
+
+ (CASE (CASE WHEN MT IS NULL THEN ISNULL(PT,'') ELSE (CASE WHEN PT IS NULL THEN ISNULL(MT,'')
+ ELSE (ISNULL(MT,'') +'/'+ ISNULL(PT,'')) END) END) WHEN '2' THEN 'ϸ' WHEN
+ '2/4' THEN 'ϸ/ϸ' WHEN '4/2' THEN 'ϸ/ϸ' WHEN '4' THEN 'ϸ' ELSE '' END) AS MTPTResult,
+
+ CASE WHEN MTReport IS NULL THEN ISNULL(PTReport,'') ELSE (CASE WHEN PTReport IS NULL THEN ISNULL(MTReport,'')
+ ELSE (ISNULL(MTReport,'') +'/'+ ISNULL(PTReport,'')) END) END AS MTPTReport
+ ,c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5
+FROM dbo.HJGL_View_CheckResultSummary c
+WHERE Projectid=@ProjectId AND ISC_ID=@ISC_ID AND SER_ID=@SER_ID AND STE_ID=@STE_ID) AS v
+WHERE v.Number<=5
+END
+ELSE IF(@Flag='2')
+BEGIN
+SELECT v.*
+FROM
+(SELECT ROW_NUMBER() OVER(ORDER BY case when RTReport is null then 1 else 0 end asc, RTReport,UTReport,MTReport,PTReport) AS Number,
+ BatchDetailId,ISO_IsoNo,
+ (JOT_JointNo+(case (select top (1) PointType from dbo.HJGL_BO_BatchDetail bd where bd.BatchDetailId=c.BatchDetailId ORDER BY bd.PointType) when '2' then 'K'
+ else '' end)) as JOT_JointNo,
+ WED_Code,BatchCode,
+
+ (CASE (CASE WHEN RT IS NULL THEN ISNULL(UT,'') ELSE (CASE WHEN UT IS NULL THEN ISNULL(RT,'')
+ ELSE (ISNULL(RT,'') +'/'+ ISNULL(UT,'')) END) END)
+ WHEN '2' THEN 'ϸ' WHEN '2/4' THEN 'ϸ/ϸ' WHEN '4/2' THEN 'ϸ/ϸ' WHEN '4' THEN 'ϸ' ELSE '' END) AS RTUTResult,
+
+ CASE WHEN RTReport IS NULL THEN ISNULL(UTReport,'') ELSE (CASE WHEN UTReport IS NULL THEN ISNULL(RTReport,'')
+ ELSE (ISNULL(RTReport,'') +'/'+ ISNULL(UTReport,'')) END) END AS RTUTReport,
+
+ (CASE (CASE WHEN MT IS NULL THEN ISNULL(PT,'') ELSE (CASE WHEN PT IS NULL THEN ISNULL(MT,'')
+ ELSE (ISNULL(MT,'') +'/'+ ISNULL(PT,'')) END) END) WHEN '2' THEN 'ϸ' WHEN
+ '2/4' THEN 'ϸ/ϸ' WHEN '4/2' THEN 'ϸ/ϸ' WHEN '4' THEN 'ϸ' ELSE '' END) AS MTPTResult,
+
+ CASE WHEN MTReport IS NULL THEN ISNULL(PTReport,'') ELSE (CASE WHEN PTReport IS NULL THEN ISNULL(MTReport,'')
+ ELSE (ISNULL(MTReport,'') +'/'+ ISNULL(PTReport,'')) END) END AS MTPTReport
+ ,c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5
+FROM dbo.HJGL_View_CheckResultSummary c
+WHERE Projectid=@ProjectId AND ISC_ID=@ISC_ID AND SER_ID=@SER_ID AND STE_ID=@STE_ID) AS v
+WHERE v.Number>5
+END
+ELSE
+BEGIN
+SELECT v.*
+FROM
+(SELECT ROW_NUMBER() OVER(ORDER BY case when RTReport is null then 1 else 0 end asc, RTReport,UTReport,MTReport,PTReport) AS Number,
+ BatchDetailId,ISO_IsoNo,
+ (JOT_JointNo+(case (select top (1) PointType from dbo.HJGL_BO_BatchDetail bd where bd.BatchDetailId=c.BatchDetailId ORDER BY bd.PointType) when '2' then 'K'
+ else '' end)) as JOT_JointNo,
+ WED_Code, BatchCode,
+
+ (CASE (CASE WHEN RT IS NULL THEN ISNULL(UT,'') ELSE (CASE WHEN UT IS NULL THEN ISNULL(RT,'')
+ ELSE (ISNULL(RT,'') +'/'+ ISNULL(UT,'')) END) END)
+ WHEN '2' THEN 'ϸ' WHEN '2/4' THEN 'ϸ/ϸ' WHEN '4/2' THEN 'ϸ/ϸ' WHEN '4' THEN 'ϸ' ELSE '' END) AS RTUTResult,
+
+ CASE WHEN RTReport IS NULL THEN ISNULL(UTReport,'') ELSE (CASE WHEN UTReport IS NULL THEN ISNULL(RTReport,'')
+ ELSE (ISNULL(RTReport,'') +'/'+ ISNULL(UTReport,'')) END) END AS RTUTReport,
+
+ (CASE (CASE WHEN MT IS NULL THEN ISNULL(PT,'') ELSE (CASE WHEN PT IS NULL THEN ISNULL(MT,'')
+ ELSE (ISNULL(MT,'') +'/'+ ISNULL(PT,'')) END) END) WHEN '2' THEN 'ϸ' WHEN
+ '2/4' THEN 'ϸ/ϸ' WHEN '4/2' THEN 'ϸ/ϸ' WHEN '4' THEN 'ϸ' ELSE '' END) AS MTPTResult,
+
+ CASE WHEN MTReport IS NULL THEN ISNULL(PTReport,'') ELSE (CASE WHEN PTReport IS NULL THEN ISNULL(MTReport,'')
+ ELSE (ISNULL(MTReport,'') +'/'+ ISNULL(PTReport,'')) END) END AS MTPTReport
+ ,c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5
+FROM dbo.HJGL_View_CheckResultSummary c
+WHERE Projectid=@ProjectId AND ISC_ID=@ISC_ID AND SER_ID=@SER_ID AND STE_ID=@STE_ID) AS v
+END
+END
+
+
+GO
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测数量统计表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测数量统计表.frx
new file mode 100644
index 0000000..b80f667
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测数量统计表.frx
@@ -0,0 +1,325 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ private void Table3_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Table3.PrintRow(0);
+ Table3.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测结果汇总表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测结果汇总表.frx
index eb8623d..f437108 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测结果汇总表.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测结果汇总表.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -67,20 +67,16 @@ namespace FastReport
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -153,7 +149,7 @@ namespace FastReport
-
+
@@ -170,9 +166,9 @@ namespace FastReport
-
+
-
+
@@ -313,7 +309,7 @@ namespace FastReport
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头射线检测比例确认表（一）.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头射线检测比例确认表（一）.frx
new file mode 100644
index 0000000..b09564a
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头射线检测比例确认表（一）.frx
@@ -0,0 +1,261 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ private void Table3_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Table3.PrintRow(0);
+ Table3.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
index 2eeec05..68c5d5c 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
@@ -50,6 +50,7 @@
+
@@ -143,6 +144,10 @@
+
+