From 771e32724a5f843d01a8ed611df6907c10e5e922 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 6 Dec 2023 14:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx    | 4 ++++
 SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs | 1 +
 2 files changed, 5 insertions(+)

diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
index 93ede0db..98f6c8ff 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
@@ -132,6 +132,10 @@
                                                             DataField="TotalYZSize" SortField="TotalYZSize" FieldType="Double" HeaderTextAlign="Center"
                                                             TextAlign="Center" Width="100px">
                                                         </f:RenderField>
+                                        <f:RenderField HeaderText="材质" ColumnID="MaterialCode"
+                                            DataField="MaterialCode" SortField="MaterialCode" FieldType="String" 
+                                            HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                        </f:RenderField>
                                         <f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
                                             DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String" 
                                             HeaderTextAlign="Center" TextAlign="Left" Width="150px">
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
index 8ea0f45c..cbcd8911 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
@@ -163,6 +163,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                       ,line.PlanStartDate
                                       ,line.PlanEndDate
                                       ,line.ActStartDate
+                                      ,mat.MaterialCode
                                       ,line.ActEndDate
                                       ,line.IsFinished
                                       ,line.FlowingSection