diff --git a/DataBase/版本日志/HJGLDB_DS_2026-07-28_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-07-28_bwj.sql
new file mode 100644
index 0000000..20cc6a7
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-07-28_bwj.sql
@@ -0,0 +1,113 @@
+
+ALTER PROC [dbo].[HJGL_sp_rpt_welderStatistics]
+ @unitcode varchar(50) = NULL,
+ @WED_ID nvarchar(50) = NULL,
+ @projectId NVARCHAR(50) = NULL
+AS
+/*ӼͳƱ*/
+SELECT welder.ProjectWelderId,
+ welder.ProjectId,
+ project.ProjectCode,--ʩ
+ wld.wed_code,--
+ wld.wed_name,--
+
+ ISNULL(totalJoint.totalJoint,0) AS totalJoint, --Ѻ
+ ISNULL(TrustJointNum.TrustJointNum,0) AS TrustJointNum, --ίк
+ CAST((CASE ISNULL(TrustJointNum.TrustJointNum,0) WHEN 0 THEN 0
+ ELSE 1.0 * ISNULL(TrustJointNum.TrustJointNum,0)/(1.0 * totalJoint.totalJoint) END) AS DECIMAL(19,3))
+ AS OneCheckRate , ---һμ
+
+ ISNULL(FixedJoint.FixedJoint,0) AS FixedJoint, --Ѻ̶
+ ISNULL(TrustFixedJoint.TrustFixedJoint,0) AS TrustFixedJoint, --ίй̶
+ CAST((CASE ISNULL(TrustFixedJoint.TrustFixedJoint,0) WHEN 0 THEN 0
+ ELSE 1.0 * ISNULL(TrustFixedJoint.TrustFixedJoint,0)/(1.0 * FixedJoint.FixedJoint) END) AS DECIMAL(19,3))
+ AS FixedJointCheckRate , ---̶ڼ
+
+ ISNULL(ButtJoint.ButtJoint,0) AS ButtJoint, --ѺԽӺ
+ ISNULL(TrustButtJoint.TrustButtJoint,0) AS TrustButtJoint, --ίжԽӺ
+ CAST((CASE ISNULL(TrustButtJoint.TrustButtJoint,0) WHEN 0 THEN 0
+ ELSE 1.0 * ISNULL(TrustButtJoint.TrustButtJoint,0)/(1.0 * ButtJoint.ButtJoint) END) AS DECIMAL(19,3))
+ AS ButtJointCheckRate , ---ԽӺ
+
+ ISNULL(FilletJoint.FilletJoint,0) AS FilletJoint, --ѺǺ
+ ISNULL(TrustFilletJoint.TrustFilletJoint,0) AS TrustFilletJoint, --ίнǺ
+ CAST((CASE ISNULL(TrustFilletJoint.TrustFilletJoint,0) WHEN 0 THEN 0
+ ELSE 1.0 * ISNULL(TrustFilletJoint.TrustFilletJoint,0)/(1.0 * FilletJoint.FilletJoint) END) AS DECIMAL(19,3))
+ AS FilletJointCheckRate
+
+FROM dbo.Project_Welder AS welder
+LEFT JOIN Base_Project project on welder.ProjectId=project.ProjectId
+LEFT JOIN dbo.HJGL_BS_Welder wld on wld.WED_ID=welder.WED_ID
+ --Ѻ
+LEFT JOIN (SELECT COUNT(*) AS totalJoint,HJGL_pw_jointinfo.JOT_CellWelder,ProjectId
+ FROM HJGL_PW_JointInfo
+ WHERE HJGL_pw_jointinfo.DReportID is not null
+ GROUP BY HJGL_pw_jointinfo.JOT_CellWelder,ProjectId) AS totalJoint ON totalJoint.JOT_CellWelder = welder.WED_ID and totalJoint.ProjectId=welder.ProjectId
+
+ --Ѻ̶
+LEFT JOIN (SELECT COUNT(*) AS FixedJoint,JOT_CellWelder,ProjectId
+ FROM HJGL_PW_JointInfo
+ WHERE DReportID is not null AND JOT_JointAttribute='̶'
+ GROUP BY HJGL_pw_jointinfo.JOT_CellWelder,ProjectId) AS FixedJoint ON FixedJoint.JOT_CellWelder = welder.WED_ID and FixedJoint.ProjectId=welder.ProjectId
+
+
+ --ѺԽӺ
+LEFT JOIN (SELECT COUNT(*) AS ButtJoint,joint.JOT_CellWelder,ProjectId
+ FROM HJGL_PW_JointInfo joint
+ LEFT JOIN dbo.HJGL_BS_JointType jointType on jointType.JOTY_ID=joint.JOTY_ID
+ WHERE DReportID is not null AND jointType.JOTY_Group='1'
+ GROUP BY joint.JOT_CellWelder,ProjectId) AS ButtJoint ON ButtJoint.JOT_CellWelder = welder.WED_ID and ButtJoint.ProjectId=welder.ProjectId
+
+
+ --ѺǺ
+LEFT JOIN (SELECT COUNT(*) AS FilletJoint,joint.JOT_CellWelder,ProjectId
+ FROM HJGL_PW_JointInfo joint
+ LEFT JOIN dbo.HJGL_BS_JointType jointType on jointType.JOTY_ID=joint.JOTY_ID
+ WHERE DReportID is not null AND jointType.JOTY_Group='2'
+ GROUP BY joint.JOT_CellWelder,ProjectId) AS FilletJoint ON FilletJoint.JOT_CellWelder = welder.WED_ID and FilletJoint.ProjectId=welder.ProjectId
+
+
+--ίк
+ LEFT JOIN (SELECT COUNT(*) AS TrustJointNum,joint.JOT_CellWelder,ProjectId
+ FROM dbo.HJGL_BO_BatchDetail batchDetail
+ LEFT JOIN HJGL_pw_jointinfo joint ON joint.jot_id=batchDetail.jot_id
+ WHERE (batchDetail.NDT is not null OR batchDetail.NDT!='') and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
+ GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustJointNum ON TrustJointNum.JOT_CellWelder = welder.WED_ID and TrustJointNum.ProjectId=welder.ProjectId
+
+
+--ίй̶
+ LEFT JOIN (SELECT COUNT(*) AS TrustFixedJoint,joint.JOT_CellWelder,ProjectId
+ FROM dbo.HJGL_BO_BatchDetail batchDetail
+ LEFT JOIN HJGL_pw_jointinfo joint ON joint.jot_id=batchDetail.jot_id
+ WHERE (batchDetail.NDT is not null OR batchDetail.NDT!='')
+ AND joint.JOT_JointAttribute='̶' and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
+ GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustFixedJoint ON TrustFixedJoint.JOT_CellWelder = welder.WED_ID and TrustFixedJoint.ProjectId=welder.ProjectId
+
+
+--ίжԽӺ
+ LEFT JOIN (SELECT COUNT(*) AS TrustButtJoint,joint.JOT_CellWelder,ProjectId
+ FROM dbo.HJGL_BO_BatchDetail batchDetail
+ LEFT JOIN 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.NDT is not null OR batchDetail.NDT!='')
+ AND jointType.JOTY_Group='1' and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
+ GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustButtJoint ON TrustButtJoint.JOT_CellWelder = welder.WED_ID and TrustButtJoint.ProjectId=welder.ProjectId
+
+--ίнǺ
+ LEFT JOIN (SELECT COUNT(*) AS TrustFilletJoint,joint.JOT_CellWelder,ProjectId
+ FROM dbo.HJGL_BO_BatchDetail batchDetail
+ LEFT JOIN 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.NDT is not null OR batchDetail.NDT!='')
+ AND jointType.JOTY_Group='2' and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
+ GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustFilletJoint ON TrustFilletJoint.JOT_CellWelder = welder.WED_ID and TrustFilletJoint.ProjectId=welder.ProjectId
+
+
+WHERE (welder.ProjectId = @projectId OR @projectId IS NULL)
+AND (wld.WED_Unit=@unitcode OR @unitcode IS NULL)
+AND (wld.WED_ID=@WED_ID OR @WED_ID is null)
+order BY wld.WED_Code
+
+
+GO
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx
index 49340de..95c5a7b 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx
@@ -4,107 +4,109 @@
- 焊工焊接检测统计表
+ 焊工焊接检测统计表
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.cs
index 3f55b62..b9139b8 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.cs
@@ -86,7 +86,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderStatistics", parameter);
this.Grid1.RecordCount = tb.Rows.Count;
- tb = GetFilteredTable(Grid1.FilteredData, tb);
+ //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
@@ -151,6 +151,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊工焊接检测统计表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
+ this.Grid1.PageSize = 100000;
+ this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
@@ -181,7 +183,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
html = (row.FindControl("labNumber") as AspNet.Label).Text;
}
- sb.AppendFormat("| {0} | ", html);
+ if (column.ColumnID == "tfWelderCode")
+ {
+ html = (row.FindControl("lblWelderCode") as AspNet.Label).Text;
+ }
+ //sb.AppendFormat("{0} | ", html);
+ sb.AppendFormat("{0} | ", html);
}
sb.Append("");
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.designer.cs
index 20c059a..28ed700 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderCheckStatistic.aspx.designer.cs
@@ -2,16 +2,18 @@
// <自动生成>
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.HJGL.WeldingReport {
-
-
- public partial class WelderCheckStatistic {
-
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+
+
+ public partial class WelderCheckStatistic
+ {
+
///
/// form1 控件。
///
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// RegionPanel1 控件。
///
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RegionPanel RegionPanel1;
-
+
///
/// Region1 控件。
///
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Region Region1;
-
+
///
/// Form2 控件。
///
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Form Form2;
-
+
///
/// drpProject 控件。
///
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpProject;
-
+
///
/// drpUnit 控件。
///
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnit;
-
+
///
/// drpWloName 控件。
///
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpWloName;
-
+
///
/// BtnAnalyse 控件。
///
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button BtnAnalyse;
-
+
///
/// btnOut 控件。
///
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnOut;
-
+
///
/// Region2 控件。
///
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Region Region2;
-
+
///
/// Grid1 控件。
///
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Grid Grid1;
-
+
///
/// labNumber 控件。
///
@@ -128,7 +130,16 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.WebControls.Label labNumber;
-
+
+ ///
+ /// lblWelderCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblWelderCode;
+
///
/// ToolbarSeparator1 控件。
///
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-
+
///
/// ToolbarText1 控件。
///
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarText ToolbarText1;
-
+
///
/// ddlPageSize 控件。
///