From 3f34ab5da225e93b81f5b81e17274db3b117848c Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 2 Jul 2025 09:14:16 +0800
Subject: [PATCH] 1

---
 HJGL_DS/FineUIPro.Web/Web.config               |  2 +-
 .../WeldMat/UsingSentMat/UsingMat.aspx         |  8 ++++++++
 .../WeldMat/UsingSentMat/UsingMat.aspx.cs      | 13 +++++++++++++
 .../UsingSentMat/UsingMat.aspx.designer.cs     | 18 ++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index aa58035..bf404b8 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx
index a6b3b9b..1fe4378 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx
@@ -170,6 +170,9 @@
                             <f:RenderField Width="100px" ColumnID="WeldCode" DataField="WeldCode" FieldType="String"
                                 HeaderText="焊材型号" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
+                            <f:RenderField Width="90px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
+                                HeaderText="焊材规格" HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
                             <f:RenderField Width="140px" ColumnID="Amount" DataField="Amount" FieldType="Float"
                                 HeaderText="计划领用数量(根)" HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
@@ -224,6 +227,11 @@
                                     <asp:Label ID="Label4" runat="server" Text='<%# ConvertWeldCode(Eval("WeldId")) %>'></asp:Label>
                                 </ItemTemplate>
                             </f:TemplateField>
+                            <f:TemplateField ID="tfWeldSpec" HeaderText="焊材型号" HeaderTextAlign="Center" Width="150px">
+                                <ItemTemplate>
+                                    <asp:Label ID="Label5" runat="server" Text='<%# ConvertWeldSpec(Eval("WeldId")) %>'></asp:Label>
+                                </ItemTemplate>
+                            </f:TemplateField>
                             <f:RenderField Width="120px" ColumnID="Amount" DataField="Amount" FieldType="Float"
                                 HeaderText="领用(一次)" HeaderTextAlign="Center">
                             </f:RenderField>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
index 12ca7b7..cd9a1a3 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
@@ -1229,6 +1229,19 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             return null;
         }
 
+        protected string ConvertWeldSpec(object weldId)
+        {
+            if (weldId != null)
+            {
+                var weldInfo = BLL.WeldInfoService.GetWeldInfoById(weldId.ToString());
+                if (weldInfo != null)
+                {
+                    return weldInfo.WeldSpec;
+                }
+            }
+            return null;
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs
index fee6809..cc1f8ca 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs
@@ -228,6 +228,24 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label4;
         
+        /// <summary>
+        /// tfWeldSpec 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TemplateField tfWeldSpec;
+        
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+        
         /// <summary>
         /// tfUsingMan 控件。
         /// </summary>