From 6f289814e8f8b1dab0e15d470006a7677377f915 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 18 Nov 2025 10:52:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx | 11 ++++++----- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../HJGL/PreDesign/TrainNumberManager.aspx | 11 +++++------ .../HJGL/PreDesign/TrainNumberManager.aspx.cs | 3 ++- .../TrainNumberManager.aspx.designer.cs | 18 +++++++++--------- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx index 87887775..2abd8e8b 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -63,7 +63,7 @@ namespace FastReport - + @@ -116,7 +116,8 @@ namespace FastReport - + + @@ -137,6 +138,6 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 6aebfda8..7757fefe 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -16839,7 +16839,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx index 30291d97..e33da1c4 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx @@ -47,18 +47,17 @@ - - + - - - - + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs index 4607b2cc..635e3d9f 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs @@ -18,6 +18,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { this.GetButtonPower(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + Funs.FineUIPleaseSelect(ddlState); // 绑定表格 this.BindGrid(); } @@ -49,7 +50,7 @@ namespace FineUIPro.Web.HJGL.PreDesign table.TrainNumber = txtTrainNumber.Text.Trim(); } - if (!string.IsNullOrEmpty(ddlState.SelectedValue)) + if (!string.IsNullOrEmpty(ddlState.SelectedValue)&& ddlState.SelectedValue !=Const._Null) { table.State = Convert.ToInt32(ddlState.SelectedValue); } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs index 1e456a77..97dbebd6 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.DropDownList ddlState; + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + /// /// btnFilter 控件。 /// @@ -104,15 +113,6 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.Button btnFilter; - /// - /// btnClearFilter 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnClearFilter; - /// /// Toolbar2 控件。 /// From aaa00e8d2eba635c9fb0e6d6d2d0cb101590a20a Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 18 Nov 2025 11:10:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=95=E5=8E=8B=E5=8C=85=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs | 3 ++- .../File/Fastreport/JGZL/管道压力试验技术要求.frx | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs b/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs index 10d93ac4..983d6f3d 100644 --- a/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs +++ b/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs @@ -185,7 +185,8 @@ namespace BLL { Dictionary keyValuePairs = new Dictionary(); BLL.FastReportService.AddFastreportParameter(keyValuePairs); - + keyValuePairs.Add("Pressure", updateTestPackage.AdjustTestPressure); + BLL.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\管道压力试验技术要求.frx"; fastReportItem.ReportPath = initTemplatePath; fastReportItem.ParameterValues = keyValuePairs; diff --git a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx index 31b750af..2b6ac917 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx @@ -1,6 +1,8 @@  - - + + + + @@ -75,9 +77,9 @@ - - - + + +