From 27388b55863802d7ab2d1f7bab782a66b04f4d7c Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 21 Apr 2026 09:49:57 +0800
Subject: [PATCH] 20260421

---
 .../BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs  | 11 +++++++++++
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj            |  1 -
 .../FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs  |  2 +-
 ...ressureTestOfPipelineSystemConfirmationRecord.aspx |  2 +-
 .../JGZL/PressureTestOfPipelineSystemRecord.aspx      |  2 +-
 .../JGZL/PressureTestOfPipelineSystemRecord.aspx.cs   |  7 +++++++
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
index 1b34141..287b9c4 100644
--- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
+++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
@@ -315,5 +315,16 @@ namespace BLL
                         select x.PipeLineLength).Sum();
             return PipeLineLength;
         }
+
+        public static string GetStrIsoNos(string projectId)
+        {
+            List<Model.HJGL_PW_IsoInfo> isoInfos = GetIsoInfoByProjectId(projectId);
+            string isoNos = string.Empty;
+            foreach (var iso in isoInfos)
+            {
+                isoNos += iso.ISO_IsoNo + ",";
+            }
+            return isoNos;
+        }
     }
 }
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index c7164e6..ce97e84 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -8270,7 +8270,6 @@
     <Folder Include="App_Themes\Default\Images\" />
     <Folder Include="common\ReportPrint\upload\" />
     <Folder Include="File\Image\" />
-    <Folder Include="HJGL\JoinMarking\" />
     <Folder Include="SeetaFaceDir\modelimages\" />
     <Folder Include="tmpupload\" />
     <Folder Include="WeldMat\res\js\vendor\" />
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
index a39d752..62c0cf9 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
@@ -163,7 +163,7 @@ namespace FineUIPro.Web.JGZL
         /// </summary>
         //private void BindGrid()
         //{
-        //    //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1");
+        //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1");
         //    string strSql = @"SELECT * from JGZL_AcceptanceCertificate where 1=1";
         //    List<SqlParameter> listStr = new List<SqlParameter>();
         //    if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx
index 4bc1a85..7071cd4 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx
@@ -37,7 +37,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
-                                <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList>
+                                <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px" EnableEdit="true"></f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="SystemSave" runat="server" OnClick="btnSave_Click"></f:Button>
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx
index 95559d3..e51d776 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx
@@ -37,7 +37,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
-                                <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px"></f:DropDownList>
+                                <f:DropDownList ID="drpIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoNoS_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true" AutoSelectFirstItem="false" Width="500px" EnableEdit="true"></f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
index 79520e9..36cbc48 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
@@ -310,6 +310,7 @@ namespace FineUIPro.Web.JGZL
         /// </summary>
         private void BindGrid()
         {
+            string isoNos = BLL.HJGL_PW_IsoInfoService.GetStrIsoNos(this.CurrUser.LoginProjectId);
             string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem where 1=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.RecordId))
@@ -317,6 +318,11 @@ namespace FineUIPro.Web.JGZL
                 strSql += " AND RecordId = @RecordId";
                 listStr.Add(new SqlParameter("@RecordId", this.RecordId));
             }
+            if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
+            {
+                strSql += " AND CHARINDEX(PipelineNo,@isoNos)>0 ";
+                listStr.Add(new SqlParameter("@isoNos", isoNos));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -736,6 +742,7 @@ namespace FineUIPro.Web.JGZL
 
                 ShowNotify("保存成功！", MessageBoxIcon.Success);
                 PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                BindGrid();
             }
             else
             {