From 2fd46d73fdff30dfdf552578f2ab9e1cae143270 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 30 Jul 2025 10:18:35 +0800
Subject: [PATCH] =?UTF-8?q?20250730=20=E5=AE=89=E8=A3=85=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FineUIPro.Web/HJGL/PreDesign/InstallList.aspx | 14 +++++++++-----
 .../HJGL/PreDesign/InstallList.aspx.cs            | 15 +++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx
index f0d30be4..62d2da0f 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx
@@ -59,7 +59,7 @@
                                 <f:ToolbarFill ID="ToolbarFill2" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" Text="查询"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                    runat="server" OnClick="btnSearch_Click">
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
                                     Icon="TableGo" EnableAjax="false" EnablePostBack="true">
@@ -69,9 +69,9 @@
                     </Toolbars>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息" ForceFit="false"
-                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true"
-                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode"
-                            AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="true"
+                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="id" AllowCellEditing="true"
+                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="id"
+                            AllowSorting="true" SortField="PipelineCode,PipelineComponentCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="true"
                             AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
                             <Columns>
                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@@ -80,7 +80,11 @@
                                     FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
                                     TextAlign="Left" Locked="true">
                                 </f:RenderField>
-                                <f:RenderField Width="220px" ColumnID="PipelineComponentCode" DataField="PipelineComponentCode" SortField="PipelineComponentCode"
+                                 <f:RenderField Width="100px" ColumnID="Stype" DataField="Stype" SortField="Stype"
+                                    FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
+                                    TextAlign="Left" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="PipelineComponentCode" DataField="PipelineComponentCode" SortField="PipelineComponentCode"
                                     FieldType="String" HeaderText="组件编号" HeaderTextAlign="Center"
                                     TextAlign="Left" Locked="true">
                                 </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
index a870f9a7..cc196643 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
@@ -228,8 +228,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// <returns></returns>
         private DataTable BindData()
         {
-            string strSql = @"WITH cte as (select pipeline.PipelineCode as PipelineCode,
+            string strSql = @"WITH cte as (select newid()as id,pipeline.PipelineCode as PipelineCode,
                                             comonent.PipelineComponentCode as PipelineComponentCode,
+											'预制组件' as Stype,
                                             '' as matdef,
                                             packdetail.Number as Number,
                                             pack.PackagingCode as PackagingCode,
@@ -244,8 +245,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
                                             left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id
                                             where (packdetail.PipelineComponentId is not null or packdetail.PipelineComponentId != '')
                                             union all
-                                            select pipeline.PipelineCode as PipelineCode,
+                                            select newid()as id,pipeline.PipelineCode as PipelineCode,
                                             packdetail.MaterialCode as PipelineComponentCode,
+											'预制散件' as Stype,
                                             matlib.MaterialDef as matdef,
                                             packdetail.Number as Number,
                                             pack.PackagingCode as PackagingCode,
@@ -356,10 +358,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void TextBox_TextChanged(object sender, EventArgs e)
-        {
-            this.BindGrid();
-        }
+        //protected void TextBox_TextChanged(object sender, EventArgs e)
+        //{
+        //    this.BindGrid();
+        //}
         protected void btnTreeFind_Click1(object sender, EventArgs e)
         {
             this.InitTreeMenu();
@@ -394,6 +396,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                          select new
                          {
                              管线号 = x.Field<string>("PipelineCode"),
+                             类型 = x.Field<string>("Stype"),
                              组件编号 = x.Field<string>("PipelineComponentCode"),
                              预制散件材料描述 = !string.IsNullOrWhiteSpace(x.Field<string>("matdef")) ? x.Field<string>("matdef") : "-",
                              数量 = x.Field<decimal?>("Number"),