From b86b76efe950a0895396862e4545200618972e95 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Wed, 1 Jul 2026 15:43:00 +0800
Subject: [PATCH 1/2] 11

---
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index 67d3094..d347fbe 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -7010,7 +7010,7 @@
     </Compile>
     <Compile Include="JGZL\Cover.aspx.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="JGZL\Cover.aspx.designer.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
@@ -7080,7 +7080,7 @@
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.designer.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
@@ -7149,14 +7149,14 @@
       <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
+      <SubType>Component</SubType>
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.designer.cs">
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
+      <SubType>Component</SubType>
       <DependentUpon>ConcealedWorksInspectionRecordEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.designer.cs">

From c0a22da597a8ba6773e1445c21e93b449c991151 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Wed, 1 Jul 2026 20:23:43 +0800
Subject: [PATCH 2/2] 11

---
 HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
index 3ae6571..a72c770 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
@@ -346,7 +346,11 @@ namespace FineUIPro.Web.HJGL.DataIn
                                                     isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString()||x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();  
                                                     break;
                                                 case "介质":
-                                                    isoInfo.SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
+                                                     var SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
+                                                    if (!string.IsNullOrEmpty(SER_ID))
+                                                    {
+                                                        isoInfo.SER_ID = SER_ID;
+                                                    }
                                                     break;
                                                 case "管道类别":
                                                     isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();