From 159acc1d33e310f4e36a19f53e3accf8329e5389 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 22 Sep 2026 14:38:37 +0800
Subject: [PATCH] 1

---
 .../WeldMat/UsingSentMat/UsingtMatSelect.aspx            | 4 +++-
 HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx           | 6 ++++++
 HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs        | 6 +++++-
 .../FineUIPro.Web/Welder/WelderManage.aspx.designer.cs   | 9 +++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
index c659666..8aa8a03 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
@@ -88,7 +88,9 @@
                     <f:RenderField Width="120px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
                         HeaderText="施工号" HeaderTextAlign="Center" TextAlign="Center" SortField="ProjectCode">
                     </f:RenderField>
-                    
+                    <f:RenderField Width="120px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                        HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center" SortField="ProjectName">
+                    </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/Welder/WelderManage.aspx b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
index ed8da84..61116a9 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
@@ -57,6 +57,12 @@
                                 <f:TextBox ID="txtClassS" runat="server" Label="焊工等级" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
                                     Width="170px" LabelWidth="70px">
                                 </f:TextBox>
+                                <f:RadioButtonList runat="server" ID="rblIsSelfCreate" Width="260px" AutoPostBack="true" Label="焊工类型" LabelAlign="Right"
+                                        OnSelectedIndexChanged="TextBox_TextChanged">
+                                        <f:RadioItem Selected="true" Value="2" Text="全部" />
+                                        <f:RadioItem Value="1" Text="自建" />
+                                        <f:RadioItem Value="0" Text="外协" />
+                                    </f:RadioButtonList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnSync" Text="同步" Icon="PackageIn" runat="server" OnClick="btnSync_Click"  ToolTip="从OA同步焊工信息及焊工合格项目">
                                 </f:Button>
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
index 3404e18..ef5af77 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
@@ -119,7 +119,11 @@ namespace FineUIPro.Web.Welder
                 strSql += " AND Welder.WED_Class LIKE @WED_Class";
                 listStr.Add(new SqlParameter("@WED_Class", "%" + this.txtClassS.Text.Trim() + "%"));
             }
-
+            if (this.rblIsSelfCreate.SelectedValue != "2")
+            {
+                strSql += " AND Welder.IsSelfCreate = @IsSelfCreate";
+                listStr.Add(new SqlParameter("@IsSelfCreate", this.rblIsSelfCreate.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
index 205d790..5e51eef 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
@@ -147,6 +147,15 @@ namespace FineUIPro.Web.Welder {
         /// </remarks>
         protected global::FineUIPro.TextBox txtClassS;
         
+        /// <summary>
+        /// rblIsSelfCreate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsSelfCreate;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>