From 17a919d6edd9c53e0cf549a17521f64055c415ee Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 2 Jul 2026 09:59:44 +0800
Subject: [PATCH] 20260702
---
.../WeldingJointInspection.aspx.cs | 3 +-
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 8 +-
.../FineUIPro.Web/FineUIPro.Web.csproj.user | 4 +-
.../WeldInspectionCheckRecord.aspx.cs | 77 ++++++++++---------
HJGL_DS/FineUIPro.Web/Web.config | 4 +-
5 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
index 3f538ab..bb7b717 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
@@ -28,7 +28,8 @@ namespace FineUIPro.Web.ContinuousPrint
}
BindGrid();
this.Grid1.SelectedRowID = this.CurrUser.LoginProjectId;
- BindGrid1(this.CurrUser.LoginProjectId);
+ //BindGrid1(this.CurrUser.LoginProjectId);
+ Grid1_RowClick(sender, null);
}
}
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index d347fbe..67d3094 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -7010,7 +7010,7 @@
Cover.aspx
- Component
+ ASPXCodeBehind
Cover.aspx
@@ -7080,7 +7080,7 @@
PressureTestOfPipelineSystemRecord.aspx
- Component
+ ASPXCodeBehind
PressureTestOfPipelineSystemRecord.aspx
@@ -7149,14 +7149,14 @@
CommencementReportEdit.aspx
- Component
+ ASPXCodeBehind
ConcealedWorksInspectionRecord.aspx
ConcealedWorksInspectionRecord.aspx
- Component
+ ASPXCodeBehind
ConcealedWorksInspectionRecordEdit.aspx
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index abef49a..e3436b8 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,8 +1,8 @@
-
+
true
- Debug|Any CPU
+ Release|Any CPU
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
index 6feabe4..4932586 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpIsoId.DataBind();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
- this.txtEndDate.Text = DateTime.Now.ToShortDateString();
+ //this.txtEndDate.Text = DateTime.Now.ToShortDateString();
// 绑定表格
BindGrid();
@@ -51,41 +51,48 @@ namespace FineUIPro.Web.HJGL.WeldingReport
///
private void BindGrid()
{
- //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
- // (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝'
- // WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
- // v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
- // FROM
- // (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
- // FROM dbo.HJGL_BO_BatchDetail batchDetail
- // LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
- // LEFT JOIN dbo.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.VICheckDate IS NOT NULL
- // GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
- // LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
- // LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID
- // WHERE 1=1";
- string strSql = @"select distinct batch.BatchCode,
- batch.ProjectId,
- batch.NDTR_ID,
- project.ProjectCode,
- project.ProjectName,
- isoinfo.ISO_ID,
- isoinfo.ISO_IsoNo,
- batchDetail.VICheckDate,
- rate.NDTR_Name,
- jointType.JOTY_Group,
+ string strSql = @" select distinct batch.ProjectId,
+ Project.ProjectCode,
+ Project.ProjectName,
+ weldReport.JOT_WeldDate,
(CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝'
- WHEN jointType.JOTY_Group='2' THEN '角焊缝'
- WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
- from HJGL_BO_BatchDetail as batchDetail
- left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
- left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
- left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
- left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
- left join Base_Project as project on project.ProjectId = batch.ProjectId
- LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
+ WHEN jointType.JOTY_Group='2' THEN '角焊缝'
+ WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+ jointType.JOTY_Group,
+ rate.NDTR_ID,
+ rate.NDTR_Name,
+ isoInfo.ISO_ID,
+ isoInfo.ISO_IsoNo,
+ batch.BatchCode,
+ batchDetail.VICheckDate
+ from HJGL_BO_BatchDetail batchDetail
+ JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+ LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+ left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
+ LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+ left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
+ LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID
+ LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId and joint.DReportID IS NOT NULL ";
+ //string strSql = @"select distinct batch.BatchCode,
+ // batch.ProjectId,
+ // batch.NDTR_ID,
+ // project.ProjectCode,
+ // project.ProjectName,
+ // isoinfo.ISO_ID,
+ // isoinfo.ISO_IsoNo,
+ // batchDetail.VICheckDate,
+ // rate.NDTR_Name,
+ // jointType.JOTY_Group,
+ // (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝'
+ // WHEN jointType.JOTY_Group='2' THEN '角焊缝'
+ // WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
+ // from HJGL_BO_BatchDetail as batchDetail
+ // left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
+ // left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
+ // left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
+ // left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
+ // left join Base_Project as project on project.ProjectId = batch.ProjectId
+ // LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
List listStr = new List();
if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 1b40665..3c98f31 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
@@ -67,7 +67,7 @@
-
+