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

feat(HJGL): 焊接任务打印功能支持多模板选择

Browse Source 
- 为组件打印新增60x162标签模板选项
  - 为焊口打印新增80x42标签模板选项
  - API接口返回数据增加焊口位置和焊点坐标字段
  - 优化打印模板选择逻辑，支持A4和标签模板切换
This commit is contained in:
李鹏飞
2026-03-11 16:20:22 +08:00
parent 24cbcc97f8
commit b9548a967d
9 changed files with 490 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+39 -26
View File
@@ -8,9 +8,9 @@
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<meta name="sourcefiles" content="~/HJGL/WeldingManage/GetWdldingDailyItem.ashx" />
<style type="text/css">
.Green {
.Green {
background-color: Green;
color:white;
color: white;
}
</style>
</head>
@@ -71,36 +71,49 @@
<f:HiddenField runat="server" ID="hdTaskWeldJoint"></f:HiddenField>
<f:Button runat="server" ID="CreatWeldableWeldJoint" Icon="ChartPie" Text="生成可焊焊工" OnClick="CreatWeldableWeldJoint_Click"></f:Button>
<f:RadioButtonList runat="server" ID="rbIsAudit" LabelAlign="Right" AutoColumnWidth="true" Label="状态" LabelWidth="80px" Width="420px" AutoPostBack="true" OnSelectedIndexChanged="rbIsAudit_SelectedIndexChanged">
<f:RadioItem Selected="true" Text="全部" Value="2" />
<f:RadioItem Text="未生成可焊焊工" Value="0" />
<f:RadioItem Text="已生成可焊焊工" Value="1" />
</f:RadioButtonList>
<f:RadioItem Selected="true" Text="全部" Value="2" />
<f:RadioItem Text="未生成可焊焊工" Value="0" />
<f:RadioItem Text="已生成可焊焊工" Value="1" />
</f:RadioButtonList>
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click" Hidden="True">
</f:Button>
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px" Hidden="True">
</f:DropDownList>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click" Hidden="True"></f:Button>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件" LabelAlign="Right"></f:TextBox>
<f:Button runat="server" ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Text="查询" OnClick="btnSearch_Click">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" >
</f:Button>
<f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick">
</f:Button>
<f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"
DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true">
</f:DatePicker>
<%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
<%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
</f:Button>--%>
<f:Button ID="btnGenOutPlanMaster" Text="生成出库申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click" >
<f:Button ID="btnGenOutPlanMaster" Text="生成出库申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click" Hidden="True">
</f:Button>
<f:Button ID="btnPrintJoint" Text="打印焊口贴纸" Icon="Printer" runat="server"
OnClick="btnPrintJoint_Click">
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
<f:DropDownList ID="ddlPrintTemplate" Label="预制组件打印模板" LabelWidth="140px" Width="270px" runat="server">
<f:ListItem Text="60MM*162MM" Value="60x162" Selected="true" />
<f:ListItem Text="A4" Value="A4" />
</f:DropDownList>
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
<f:DropDownList ID="ddlPrintJointTemplate" Label="焊口打印模板" LabelWidth="120px" Width="240px" runat="server">
<f:ListItem Text="80MM*42MM" Value="80x42" Selected="true" />
<f:ListItem Text="A4" Value="A4" />
</f:DropDownList>
<f:Button ID="btnPrintJoint" Text="打印焊口贴纸" Icon="Printer" runat="server"
OnClick="btnPrintJoint_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -148,15 +161,15 @@
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
</f:RenderField>
<f:RenderField HeaderText="公称直径" ColumnID="DNDia" Hidden="true"
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" Hidden="true"
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
@@ -195,7 +208,7 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" Hidden="True"
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" Hidden="True"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
<Editor>
@@ -242,11 +255,11 @@
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1300px" Height="650px" OnClose="Window1_Close">
</f:Window>
<f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1010px" Height="660px">
</f:Window>
<f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1010px" Height="660px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuAdd" EnablePostBack="true" runat="server" Text="新增" Hidden="true" Icon="Add" OnClick="btnMenuAdd_Click">
</f:MenuButton>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+33 -3
View File
@@ -1243,8 +1243,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
BLL.FastReportService.AddFastreportTable(tb);
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
initTemplatePath = "File\\Fastreport\\组件打印.frx";
// 根据选择的打印模板加载不同的模板文件
string templateValue = ddlPrintTemplate.SelectedValue;
if (templateValue == "60x162")
{
initTemplatePath = "File\\Fastreport\\组件打印_60x162.frx";
}
else if (templateValue == "A4")
{
initTemplatePath = "File\\Fastreport\\组件打印.frx";
}
else
{
// 默认使用60x162模板
initTemplatePath = "File\\Fastreport\\组件打印_60x162.frx";
}
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
@@ -1325,6 +1338,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
WeldJointId = x.WeldJointId,
Spec = x.Specification,
SortIndex = x.WeldJointCode.Replace(x.PipelineCode + "/", ""),
WeldJointPoint=x.WeldJointPoint
}).OrderBy(x => x.pipelineCode).ThenBy(x => x.SortIndex).ToList();
var tb = LINQToDataTable(result);
if (tb != null && tb.Rows.Count > 0)
@@ -1334,7 +1348,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
BLL.FastReportService.AddFastreportTable(tb);
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
initTemplatePath = "File\\Fastreport\\焊口打印.frx";
// 根据选择的打印模板加载不同的模板文件
string templateValue = ddlPrintJointTemplate.SelectedValue;
if (templateValue == "80x42")
{
initTemplatePath = "File\\Fastreport\\焊口打印_80x42.frx";
}
else if (templateValue == "A4")
{
initTemplatePath = "File\\Fastreport\\焊口打印.frx";
}
else
{
// 默认使用80x42模板
initTemplatePath = "File\\Fastreport\\焊口打印_80x42.frx";
}
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.designer.cs
Generated
+45 -18
View File
@@ -212,15 +212,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnPrint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint;
/// <summary>
/// btnPassMaster 控件。
/// </summary>
@@ -230,15 +221,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnPassMaster;
/// <summary>
/// btnPrintTask 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrintTask;
/// <summary>
/// txtTaskDate 控件。
/// </summary>
@@ -266,6 +248,51 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// btnPrintTask 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrintTask;
/// <summary>
/// ddlPrintTemplate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPrintTemplate;
/// <summary>
/// btnPrint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint;
/// <summary>
/// ddlPrintJointTemplate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPrintJointTemplate;
/// <summary>
/// btnPrintJoint 控件。
/// </summary>