lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250730 安装清单

Browse Source
This commit is contained in:
毕文静
2025-07-30 10:18:35 +08:00
parent 4d00499b03
commit 2fd46d73fd
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx
+9 -5
View File
@@ -59,7 +59,7 @@
<f:ToolbarFill ID="ToolbarFill2" runat="server"> <f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnSearch" Icon="SystemSearch" Text="查询" <f:Button ID="btnSearch" Icon="SystemSearch" Text="查询"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click"> runat="server" OnClick="btnSearch_Click">
</f:Button> </f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
Icon="TableGo" EnableAjax="false" EnablePostBack="true"> Icon="TableGo" EnableAjax="false" EnablePostBack="true">
@@ -69,9 +69,9 @@
</Toolbars> </Toolbars>
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息" ForceFit="false" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息" ForceFit="false"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true" EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="id" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="id"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="true" AllowSorting="true" SortField="PipelineCode,PipelineComponentCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"> AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Columns> <Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@@ -80,7 +80,11 @@
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center" FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left" Locked="true"> TextAlign="Left" Locked="true">
</f:RenderField> </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" FieldType="String" HeaderText="组件编号" HeaderTextAlign="Center"
TextAlign="Left" Locked="true"> TextAlign="Left" Locked="true">
</f:RenderField> </f:RenderField>
SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
+9 -6
View File
@@ -228,8 +228,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// <returns></returns> /// <returns></returns>
private DataTable BindData() 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, comonent.PipelineComponentCode as PipelineComponentCode,
'预制组件' as Stype,
'' as matdef, '' as matdef,
packdetail.Number as Number, packdetail.Number as Number,
pack.PackagingCode as PackagingCode, pack.PackagingCode as PackagingCode,
@@ -244,8 +245,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id
where (packdetail.PipelineComponentId is not null or packdetail.PipelineComponentId != '') where (packdetail.PipelineComponentId is not null or packdetail.PipelineComponentId != '')
union all union all
select pipeline.PipelineCode as PipelineCode, select newid()as id,pipeline.PipelineCode as PipelineCode,
packdetail.MaterialCode as PipelineComponentCode, packdetail.MaterialCode as PipelineComponentCode,
'预制散件' as Stype,
matlib.MaterialDef as matdef, matlib.MaterialDef as matdef,
packdetail.Number as Number, packdetail.Number as Number,
pack.PackagingCode as PackagingCode, pack.PackagingCode as PackagingCode,
@@ -356,10 +358,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e) //protected void TextBox_TextChanged(object sender, EventArgs e)
{ //{
this.BindGrid(); // this.BindGrid();
} //}
protected void btnTreeFind_Click1(object sender, EventArgs e) protected void btnTreeFind_Click1(object sender, EventArgs e)
{ {
this.InitTreeMenu(); this.InitTreeMenu();
@@ -394,6 +396,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
select new select new
{ {
管线号 = x.Field<string>("PipelineCode"), 管线号 = x.Field<string>("PipelineCode"),
类型 = x.Field<string>("Stype"),
组件编号 = x.Field<string>("PipelineComponentCode"), 组件编号 = x.Field<string>("PipelineComponentCode"),
预制散件材料描述 = !string.IsNullOrWhiteSpace(x.Field<string>("matdef")) ? x.Field<string>("matdef") : "-", 预制散件材料描述 = !string.IsNullOrWhiteSpace(x.Field<string>("matdef")) ? x.Field<string>("matdef") : "-",
数量 = x.Field<decimal?>("Number"), 数量 = x.Field<decimal?>("Number"),