diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 5c46a5b..e233efb 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/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
index aa5ff29..1856b0d 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
@@ -85,6 +85,9 @@
                     <f:RenderField Width="120px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
                         HeaderText="施工号" HeaderTextAlign="Center" TextAlign="Center" SortField="ProjectCode">
                     </f:RenderField>
+                    <f:RenderField Width="100px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
+                        HeaderText="焊材类型" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldTypeName">
+                    </f:RenderField>
                     <f:RenderField Width="150px" ColumnID="WeldName" DataField="WeldName" FieldType="String"
                         HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldName">
                     </f:RenderField>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
index 9d14d67..a333dd2 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition, 
+            string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition, WeldType.WeldTypeName,
                                      UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount, 
                                      ISNULL(UsingMat.TwoAmount,0) AS TwoAmount,UsingMat.UsingMan, UsingMat.UsingDate,
                                      CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime,RecycleMat.RecycleDate,RecycleMat.ReturnMatTop,RecycleMat.RecycleAmount,
@@ -50,6 +50,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                                FROM dbo.Weld_UsingMat AS UsingMat
                                LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = UsingMat.ProjectId
                                LEFT JOIN dbo.Weld_WeldInfo AS WeldInfo ON WeldInfo.WeldId = UsingMat.WeldId
+                               LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = WeldInfo.WeldTypeId
                                LEFT JOIN HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingMat.UsingMan
                                LEFT JOIN dbo.Weld_UsingPlan AS UsingPlan ON UsingPlan.UsingPlanId = UsingMat.UsingPlanId
                                LEFT JOIN dbo.Weld_StockIn AS stockIn ON stockIn.StockInId = UsingMat.StockInId 
@@ -342,7 +343,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             BindGrid();
             foreach (GridColumn column in grid.Columns)
             {
-                if (column.ColumnIndex < 23)
+                if (column.ColumnIndex < 24)
                 {
                     sb.AppendFormat("<td>{0}</td>", column.HeaderText);
                 }
@@ -354,7 +355,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                 sb.Append("<tr>");
                 foreach (GridColumn column in grid.Columns)
                 {
-                    if (column.ColumnIndex < 23)
+                    if (column.ColumnIndex < 24)
                     {
                         string html = row.Values[column.ColumnIndex].ToString();
                         if (column.ColumnID == "tfNumber")