From d014d00a81c296511648346e35078ba83bbdb98c Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Tue, 2 Dec 2025 16:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E8=A3=85=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj               | 2 +-
 SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a4dfcd34..ba58f7e9 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -16838,7 +16838,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
index cce52da0..fd2f6d18 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
@@ -371,7 +371,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                              管线号 = x.PipelineCode,
                              类型 = x.TypeStr,
                              编号 = x.Code,
-                             预制散件材料描述 = x.Matdef??"/",
+                             预制散件材料描述 = (x.Matdef=="" || x.Matdef==null)?"-":x.Matdef,
                              数量 = x.Number??1,
                              所在包装编号 = x.PackagingCode,
                              车次 = x.TrainNumber,