From c5b4260ee44d89b934cae8a21c712ebf275be56a Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Wed, 19 Aug 2026 18:15:05 +0800
Subject: [PATCH] 11

---
 .../HJGL/DataIn/DrawingRecognitionContent.aspx            | 8 ++++----
 .../HJGL/DataIn/DrawingRecognitionContent.aspx.cs         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
index 5af923c..04b5939 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
@@ -77,7 +77,7 @@
                                                         </f:RenderField>
                                                         
 
-                                                        <f:TemplateField ColumnID="Category" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
+                                                        <f:TemplateField ColumnID="Category1"   Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
                                                               <ItemTemplate>
                                                                   <asp:Label ID="lblCategory1" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
                                                               </ItemTemplate>
@@ -129,7 +129,7 @@
                                                          <f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
-                                                         <f:TemplateField ColumnID="Category" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
+                                                         <f:TemplateField ColumnID="Category2" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
                                                               <ItemTemplate>
                                                                   <asp:Label ID="lblCategory2" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
                                                               </ItemTemplate>
@@ -183,7 +183,7 @@
                                                          <f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
-                                                        <f:TemplateField ColumnID="Category" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
+                                                        <f:TemplateField ColumnID="Category3" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
                                                               <ItemTemplate>
                                                                   <asp:Label ID="lblCategory3" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
                                                               </ItemTemplate>
@@ -235,7 +235,7 @@
                                                         EnableTextSelection="True" AllowColumnLocking="true">
                                                         <Columns>
                                                             <f:RowNumberField EnablePagingNumber="true" ColumnID="SortIndex" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"/>
-                                                            <f:TemplateField ColumnID="Category" Width="300px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
+                                                            <f:TemplateField ColumnID="Category4" Width="300px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
                                                               <ItemTemplate>
                                                                   <asp:Label ID="lblCategory4" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
                                                               </ItemTemplate>
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
index d52e2fc..c2aacc3 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
@@ -744,22 +744,22 @@ namespace FineUIPro.Web.HJGL.DataIn
                     {
                         sb.AppendFormat("<td>{0}</td>", i.ToString());
                     }
-                    if (column.ColumnID == "Category" && (row.FindControl("lblCategory1") as AspNet.Label) != null)
+                    else if (column.ColumnID == "Category1" && (row.FindControl("lblCategory1") as AspNet.Label) != null)
                     {
                        string html = (row.FindControl("lblCategory1") as AspNet.Label).Text;
                         sb.AppendFormat("<td>{0}</td>", html);
                     }
-                    if (column.ColumnID == "Category" && (row.FindControl("lblCategory2") as AspNet.Label) != null)
+                    else if (column.ColumnID == "Category2" && (row.FindControl("lblCategory2") as AspNet.Label) != null)
                     {
                         string html = (row.FindControl("lblCategory2") as AspNet.Label).Text;
                         sb.AppendFormat("<td>{0}</td>", html);
                     }
-                    if (column.ColumnID == "Category" && (row.FindControl("lblCategory3") as AspNet.Label) != null)
+                    else if (column.ColumnID == "Category3" && (row.FindControl("lblCategory3") as AspNet.Label) != null)
                     {
                         string html = (row.FindControl("lblCategory3") as AspNet.Label).Text;
                         sb.AppendFormat("<td>{0}</td>", html);
                     }
-                    if (column.ColumnID == "Category" && (row.FindControl("lblCategory4") as AspNet.Label) != null)
+                    else if (column.ColumnID == "Category4" && (row.FindControl("lblCategory4") as AspNet.Label) != null)
                     {
                         string html = (row.FindControl("lblCategory4") as AspNet.Label).Text;
                         sb.AppendFormat("<td>{0}</td>", html);