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

1

This commit is contained in:
高飞 2025-11-18 12:05:13 +08:00
parent 3a1cef0ae6 aaa00e8d2e
commit 5183809d42
7 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs
View File

@ -185,7 +185,8 @@ namespace BLL
{
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
BLL.FastReportService.AddFastreportParameter(keyValuePairs);
keyValuePairs.Add("Pressure", updateTestPackage.AdjustTestPressure);
BLL.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\管道压力试验技术要求.frx";
fastReportItem.ReportPath = initTemplatePath;
fastReportItem.ParameterValues = keyValuePairs;

12
SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 10:54:01" ReportInfo.Modified="10/20/2025 18:54:19" ReportInfo.CreatorVersion="2017.1.16.0">
<Dictionary/>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 10:54:01" ReportInfo.Modified="11/18/2025 11:02:15" ReportInfo.CreatorVersion="2017.1.16.0">
<Dictionary>
<Parameter Name="Pressure" DataType="System.String"/>
</Dictionary>
<ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="20" FirstPageSource="4" OtherPagesSource="4" Guides="0,964.11,84.21,65.31,74.76,169.26,103.11,486.36,794.85,187.32,271.53,336.84,411.6,570.57,654.78,720.09">
<PageHeaderBand Name="PageHeader1" Width="971.46" Height="604.93" Guides="0,604.93,30.08,90.24,60.16,129.77,169.3,208.83,248.36,287.89,327.42,366.95,237.98">
<TableObject Name="Table1" Width="964.11" Height="604.93" Border.Lines="Right, Bottom">
@ -75,9 +77,9 @@
<TableCell Name="Cell25" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell50" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell51" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell52" Border.Lines="All" Text="[Pressure]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell53" Border.Lines="All" Text="475" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell54" Border.Lines="All" Text="10/30" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell55" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row6" Height="39.53">

11
SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
View File

File diff suppressed because one or more lines are too long

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -16839,7 +16839,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

11
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx
View File

@ -47,18 +47,17 @@
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText3" runat="server" Text="状态：">
</f:ToolbarText>
<f:DropDownList ID="ddlState" runat="server" Width="100px">
<f:ListItem Text="" Value="" Selected="true" />
<f:DropDownList ID="ddlState" runat="server" Width="100px">
<f:ListItem Text="未发货" Value="0" />
<f:ListItem Text="已发货" Value="1" />
<f:ListItem Text="已验收" Value="2" />
</f:DropDownList>
<f:ToolbarSeparator runat="server">
</f:ToolbarSeparator>
<f:Button ID="btnFilter" runat="server" Text="筛选" Icon="Magnifier" OnClick="btnFilter_Click">
</f:Button>
<f:Button ID="btnClearFilter" runat="server" Text="取消筛选" Icon="Cancel" OnClick="btnClearFilter_Click">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnFilter" runat="server" Text="查询" Icon="Magnifier" OnClick="btnFilter_Click">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">

3
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs
View File

@ -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);
}

18
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.DropDownList ddlState;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnFilter 控件。
/// </summary>
@ -104,15 +113,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.Button btnFilter;
/// <summary>
/// btnClearFilter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClearFilter;
/// <summary>
/// Toolbar2 控件。
/// </summary>