This commit is contained in:
高飞 2025-09-09 10:20:34 +08:00
commit a3bc97c37d
13 changed files with 1776 additions and 30 deletions

View File

@ -0,0 +1,31 @@
create table dbo.PTP_TestPackagePrint
(
Id varchar(50) not null
constraint PTP_TestPackagePrint_pk
primary key,
PTP_ID varchar(50),
TypeInt int,
PrintCount int
)
go
exec sp_addextendedproperty 'MS_Description', N'桿箕관댔丹깊', 'SCHEMA', 'dbo', 'TABLE', 'PTP_TestPackagePrint'
go
exec sp_addextendedproperty 'MS_Description', N'寮숩id', 'SCHEMA', 'dbo', 'TABLE', 'PTP_TestPackagePrint', 'COLUMN',
'Id'
go
exec sp_addextendedproperty 'MS_Description', N'桿箕관id', 'SCHEMA', 'dbo', 'TABLE', 'PTP_TestPackagePrint', 'COLUMN',
'PTP_ID'
go
exec sp_addextendedproperty 'MS_Description', N'잚깎', 'SCHEMA', 'dbo', 'TABLE', 'PTP_TestPackagePrint', 'COLUMN',
'TypeInt'
go
exec sp_addextendedproperty 'MS_Description', N'댔丹늴鑒', 'SCHEMA', 'dbo', 'TABLE', 'PTP_TestPackagePrint', 'COLUMN',
'PrintCount'
go

View File

@ -438,6 +438,7 @@
<Compile Include="HJGL\TestPackage\TestPackageApproveService.cs" />
<Compile Include="HJGL\TestPackage\TestPackageAuditService.cs" />
<Compile Include="HJGL\TestPackage\TestPackageEditService.cs" />
<Compile Include="HJGL\TestPackage\TestPackagePrintService.cs" />
<Compile Include="HJGL\WeldingManage\HJGL_ComponentJointService.cs" />
<Compile Include="HJGL\WeldingManage\HJGL_WeldingReportService.cs" />
<Compile Include="HJGL\WeldingManage\PipelineComponentService.cs" />

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="07/11/2025 10:45:19" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="09/01/2025 09:53:14" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -42,26 +42,11 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqM3/HbiZANEYP3Y6oNtE7mqsCE0NW5tkXiWL0RJsdm/BnXhHrIFd8DaTyqYvkCZwzxANNAMKR/4NYq8Hpgr74n03/lNGCep+NFhLBpywxcCJykGjY1hpi9XXIOAbXetC7CXLOSRSH8epZCbNSEsmvTn+6oa5Ga7wbTAiWTKBm7+K/ZyLsHdEDQE4HlsTkPVD6wWKWHbEMyGVCFdso8n5KsQ==">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREUCgaTVoqDNWrYFz8feIR/">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Accident_AccidentHandle" Enabled="true" TableName="Data">
<Column Name="PipelineCode" DataType="System.String" PropName="AccidentHandleId"/>
<Column Name="ManterialCode" DataType="System.String" PropName="ProjectId"/>
<Column Name="Specification" DataType="System.String" PropName="AccidentHandleCode"/>
<Column Name="AccidentHandleName" Enabled="false" DataType="System.String"/>
<Column Name="AccidentDate" Enabled="false" DataType="System.DateTime"/>
<Column Name="AccidentDef" Enabled="false" DataType="System.String"/>
<Column Name="Death" Enabled="false" DataType="System.String"/>
<Column Name="MoneyLoss" Enabled="false" DataType="System.Decimal"/>
<Column Name="AccidentHandle" Enabled="false" DataType="System.String"/>
<Column Name="Remark" Enabled="false" DataType="System.String"/>
<Column Name="States" Enabled="false" DataType="System.String"/>
<Column Name="CompileMan" Enabled="false" DataType="System.String"/>
<Column Name="CompileDate" Enabled="false" DataType="System.DateTime"/>
<Column Name="UnitId" Enabled="false" DataType="System.String"/>
<Column Name="DeathPersonNum" Enabled="false" DataType="System.Int32"/>
<Column Name="InjuriesPersonNum" Enabled="false" DataType="System.Int32"/>
<Column Name="MinorInjuriesPersonNum" Enabled="false" DataType="System.Int32"/>
<Column Name="WorkHoursLoss" Enabled="false" DataType="System.Decimal"/>
</TableDataSource>
</MsSqlDataConnection>
<Parameter Name="ProjectName" DataType="System.String"/>

View File

@ -1617,6 +1617,7 @@
<Content Include="HJGL\TestPackage\TestPackageComplete.aspx" />
<Content Include="HJGL\TestPackage\TestPackageCompleteEdit.aspx" />
<Content Include="HJGL\TestPackage\TestPackageData.aspx" />
<Content Include="HJGL\TestPackage\TestPackageDatePrint.aspx" />
<Content Include="HJGL\TestPackage\TestPackageEdit.aspx" />
<Content Include="HJGL\TestPackage\TestPackageImport.aspx" />
<Content Include="HJGL\TestPackage\TestPackageItemEdit.aspx" />
@ -11010,6 +11011,13 @@
<Compile Include="HJGL\TestPackage\TestPackageData.aspx.designer.cs">
<DependentUpon>TestPackageData.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\TestPackage\TestPackageDatePrint.aspx.cs">
<DependentUpon>TestPackageDatePrint.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\TestPackage\TestPackageDatePrint.aspx.designer.cs">
<DependentUpon>TestPackageDatePrint.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\TestPackage\TestPackageEdit.aspx.cs">
<DependentUpon>TestPackageEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

View File

@ -308,14 +308,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
var table = list.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
Grid1.DataSource = table;
Grid1.DataBind();
}
}
}
private void get3DParmeter_weldjoint(List<View_HJGL_WeldJoint> model)

View File

@ -30,7 +30,7 @@
runat="server" BoxFlex="1" DataKeyNames="PTP_ID" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PTP_ID" AllowSorting="true"
SortField="TestPackageNo" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableCheckBoxSelect="true">
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableCheckBoxSelect="true" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@ -41,7 +41,7 @@
<f:ListItem Value="2" Text="Word" />
</f:DropDownList>
<f:Button ID="btnPrint" Text="打印" ToolTip="打印" Icon="Printer" runat="server" OnClick="btnPrint_Click" EnablePostBack="true" EnableAjax="false">
</f:Button>
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@ -63,7 +63,8 @@
</f:RenderField>
<f:RenderField HeaderText="打印状态" ColumnID="PrintState" DataField="PrintState" SortField="PrintState"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" CommandName="typePrint" Text="分类打印" />
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@ -83,6 +84,10 @@
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1200px" Height="700px">
</f:Window>
</form>
<script type="text/javascript">
function reloadGrid() {

View File

@ -257,6 +257,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
foreach (var ptp_id in selectedRows)
{
var item = exportWord(ptp_id);
TestPackagePrintService.AddPrintCountByPTP_ID(ptp_id);//增加明细打印次数
printFiles.Add(item.FirstOrDefault().Key, item.FirstOrDefault().Value);
}
if (printFiles.Count>1)
@ -305,7 +306,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
}
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "typePrint")
{
object[] keys = Grid1.DataKeys[e.RowIndex];
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TestPackageDatePrint.aspx?PTP_ID={0}", keys[0], "编辑 - ")));
}
}
protected Dictionary<string,string> exportWord(string ptp_id)
{
Dictionary<string,string> keyValuePairs = new Dictionary<string,string>();
@ -470,8 +479,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
}
return keyValuePairs;
}
}
protected Model.FastReportItem GetFastReportItem(Model.PTP_TestPackage updateTestPackage, string printType, string ptp_id)
{

View File

@ -157,5 +157,14 @@ namespace FineUIPro.Web.HJGL.TestPackage
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}

View File

@ -0,0 +1,74 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageDatePrint.aspx.cs" Inherits="FineUIPro.Web.HJGL.TestPackage.TestPackageDatePrint" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>试压包打印表</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.yellow
{
background-color: YellowGreen;
background-image: none;
}
.f-grid-row.red
{
background-color: Yellow;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="试压包打印表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="TypeInt" AllowCellEditing="true" ForceFit="true"
DataIDField="TypeInt" AllowSorting="true" SortField="TypeInt"
SortDirection="DESC" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnPrint" Text="打印" ToolTip="打印" Icon="Printer" runat="server" OnClick="btnPrint_Click" EnablePostBack="true" EnableAjax="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="TypeName" DataField="TypeName" SortField="TypeName"
FieldType="String" HeaderText="类别" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PrintCount" DataField="PrintCount" SortField="PrintCount"
FieldType="String" HeaderText="打印次数" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window2" Title="打印" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1000px" Height="660px">
</f:Window>
</form>
<script type="text/javascript">
</script>
</body>
</html>

View File

@ -0,0 +1,83 @@
using BLL;
using NPOI.POIFS.Crypt.Dsig;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.HJGL.TestPackage
{
public partial class TestPackageDatePrint : PageBase
{
/// <summary>
/// 试压包主键
/// </summary>
public string PTP_ID
{
get
{
return (string)ViewState["PTP_ID"];
}
set
{
ViewState["PTP_ID"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
PTP_ID = Request.Params["PTP_ID"];
if (!string.IsNullOrEmpty(PTP_ID))
{
BindGrid();
}
}
}
private void BindGrid()
{
var list = BLL.TestPackagePrintService.GetListByPTP_ID(PTP_ID);
//根据 BLL.TestPackagePrintService.TypeIntMap 和 list 进行左连接,确保所有类型都显示,获取对应的 PrintCount没有的类型 PrintCount 为 0
var result = from type in BLL.TestPackagePrintService.TypeIntMap
join item in list on type.Key equals item.TypeInt into gj
from subitem in gj.DefaultIfEmpty()
select new
{
TypeInt = type.Key,
TypeName = type.Value,
PrintCount = subitem != null ? subitem.PrintCount : 0
};
Grid1.DataSource = result;
Grid1.DataBind();
}
protected void btnPrint_Click(object sender, EventArgs e)
{
Model.PTP_TestPackage updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == PTP_ID);
var fastReportItem = BLL.TestPackagePrintService.GetFastReportItem(updateTestPackage,Grid1.SelectedRowID,PTP_ID,this.CurrUser.LoginProjectId);
BLL.FastReportService.ResetData();
BLL.FastReportService.AddFastreportParameter(fastReportItem.ParameterValues);
if (fastReportItem.DataTables!=null)
{
foreach (var item in fastReportItem.DataTables)
{
BLL.FastReportService.AddFastreportTable(item);
}
}
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
initTemplatePath = fastReportItem.ReportPath;
if (File.Exists(rootPath + initTemplatePath))
{
TestPackagePrintService.AddPrintCountByTypeInt(PTP_ID, int.Parse( Grid1.SelectedRowID));
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
}
}
}

View File

@ -0,0 +1,89 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.TestPackage
{
public partial class TestPackageDatePrint
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// btnPrint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
}
}

View File

@ -1355,6 +1355,9 @@ namespace Model
partial void InsertPTP_TestPackageApprove(PTP_TestPackageApprove instance);
partial void UpdatePTP_TestPackageApprove(PTP_TestPackageApprove instance);
partial void DeletePTP_TestPackageApprove(PTP_TestPackageApprove instance);
partial void InsertPTP_TestPackagePrint(PTP_TestPackagePrint instance);
partial void UpdatePTP_TestPackagePrint(PTP_TestPackagePrint instance);
partial void DeletePTP_TestPackagePrint(PTP_TestPackagePrint instance);
partial void InsertQCManage_QCGroupRegistration(QCManage_QCGroupRegistration instance);
partial void UpdateQCManage_QCGroupRegistration(QCManage_QCGroupRegistration instance);
partial void DeleteQCManage_QCGroupRegistration(QCManage_QCGroupRegistration instance);
@ -5467,6 +5470,14 @@ namespace Model
}
}
public System.Data.Linq.Table<PTP_TestPackagePrint> PTP_TestPackagePrint
{
get
{
return this.GetTable<PTP_TestPackagePrint>();
}
}
public System.Data.Linq.Table<QCManage_QCGroupRegistration> QCManage_QCGroupRegistration
{
get
@ -219561,6 +219572,140 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PTP_TestPackagePrint")]
public partial class PTP_TestPackagePrint : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _PTP_ID;
private System.Nullable<int> _TypeInt;
private System.Nullable<int> _PrintCount;
#region
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnPTP_IDChanging(string value);
partial void OnPTP_IDChanged();
partial void OnTypeIntChanging(System.Nullable<int> value);
partial void OnTypeIntChanged();
partial void OnPrintCountChanging(System.Nullable<int> value);
partial void OnPrintCountChanged();
#endregion
public PTP_TestPackagePrint()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PTP_ID", DbType="VarChar(50)")]
public string PTP_ID
{
get
{
return this._PTP_ID;
}
set
{
if ((this._PTP_ID != value))
{
this.OnPTP_IDChanging(value);
this.SendPropertyChanging();
this._PTP_ID = value;
this.SendPropertyChanged("PTP_ID");
this.OnPTP_IDChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
public System.Nullable<int> TypeInt
{
get
{
return this._TypeInt;
}
set
{
if ((this._TypeInt != value))
{
this.OnTypeIntChanging(value);
this.SendPropertyChanging();
this._TypeInt = value;
this.SendPropertyChanged("TypeInt");
this.OnTypeIntChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PrintCount", DbType="Int")]
public System.Nullable<int> PrintCount
{
get
{
return this._PrintCount;
}
set
{
if ((this._PrintCount != value))
{
this.OnPrintCountChanging(value);
this.SendPropertyChanging();
this._PrintCount = value;
this.SendPropertyChanged("PrintCount");
this.OnPrintCountChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.QCManage_QCGroupRegistration")]
public partial class QCManage_QCGroupRegistration : INotifyPropertyChanging, INotifyPropertyChanged
{