From c724eb117e80004c1b09281851346c1ed37a804c Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Sat, 7 Feb 2026 17:01:31 +0800 Subject: [PATCH] =?UTF-8?q?20260207=20=E4=BA=A4=E5=B7=A5=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-02-07_bwj.sql | 4 + .../BLL/JGZL/DocumentDescriptionService.cs | 6 ++ .../File/Fastreport/JGZL/交工技术文件目录.frx | 48 ++++++------ .../File/Fastreport/JGZL/交工技术文件说明.frx | 33 +++++---- .../File/Fastreport/JGZL/工程施工开工报告.frx | 2 +- .../JGZL/DocumentDescription.aspx | 17 ++++- .../JGZL/DocumentDescription.aspx.cs | 73 +++++++++++++------ .../JGZL/DocumentDescription.aspx.designer.cs | 31 +++++++- HJGL_DS/Model/Model.cs | 72 ++++++++++++++++++ 9 files changed, 221 insertions(+), 65 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql new file mode 100644 index 0000000..9d0422a --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-02-07_bwj.sql @@ -0,0 +1,4 @@ +alter table JGZL_DocumentDescription add CompilationBasis nvarchar(1000) +alter table JGZL_DocumentDescription add MainContent nvarchar(500) +alter table JGZL_DocumentDescription add CopiesNum nvarchar(500) +go \ No newline at end of file diff --git a/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs b/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs index b2d2cdf..2857f23 100644 --- a/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs +++ b/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs @@ -42,6 +42,9 @@ namespace BLL newDocumentDescription.CompileDate = documentDescription.CompileDate; newDocumentDescription.Reviewer = documentDescription.Reviewer; newDocumentDescription.ReviewDate = documentDescription.ReviewDate; + newDocumentDescription.CompilationBasis= documentDescription.CompilationBasis; + newDocumentDescription.MainContent = documentDescription.MainContent; + newDocumentDescription.CopiesNum = documentDescription.CopiesNum; db.JGZL_DocumentDescription.InsertOnSubmit(newDocumentDescription); db.SubmitChanges(); } @@ -61,6 +64,9 @@ namespace BLL newDocumentDescription.DesigningUnit = documentDescription.DesigningUnit; newDocumentDescription.TestingUnit = documentDescription.TestingUnit; newDocumentDescription.ConstructionCompany = documentDescription.ConstructionCompany; + newDocumentDescription.CompilationBasis = documentDescription.CompilationBasis; + newDocumentDescription.MainContent = documentDescription.MainContent; + newDocumentDescription.CopiesNum = documentDescription.CopiesNum; db.SubmitChanges(); } } diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx index d678abe..78667ee 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -37,12 +37,12 @@ namespace FastReport // go next data source row rowData.Next(); } - } - } + } + } } - + @@ -106,8 +106,24 @@ namespace FastReport - - + + + + + + + + + + + + + + + + + + @@ -118,27 +134,11 @@ namespace FastReport - + - - - - - - - - - - - - - - - - - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx index 4a39591..6eae90a 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx @@ -1,5 +1,5 @@  - + @@ -7,6 +7,9 @@ + + + @@ -17,13 +20,13 @@ - + - + @@ -36,16 +39,16 @@ - - + + - - + + - - + + @@ -72,15 +75,15 @@ - - + + - - + + - + @@ -88,7 +91,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx index b26a26f..db9d4cd 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx @@ -1,5 +1,5 @@  - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx index b62503e..19e82ea 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx @@ -51,6 +51,16 @@ + + + + + + + + + + @@ -65,7 +75,12 @@ - + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs index 6c31e39..0ae6796 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs @@ -9,6 +9,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using static System.Windows.Forms.VisualStyles.VisualStyleElement; using System.IO; +using Microsoft.SqlServer.Server; namespace FineUIPro.Web.JGZL { @@ -127,35 +128,57 @@ namespace FineUIPro.Web.JGZL { this.DocumentDescriptionId = report.DocumentDescriptionId; this.txtProjectOverview.Text = report.ProjectOverview; - this.txtConstructionUnit.Text = report.ConstructionUnit; + if(!string.IsNullOrEmpty(report.ConstructionUnit)) + { + this.txtConstructionUnit.Text = report.ConstructionUnit; + } + else + { + this.txtConstructionUnit.Text = "浙江石油化工有限公司"; + } + this.txtDesigningUnit.Text = report.DesigningUnit; this.txtTestingUnit.Text = report.TestingUnit; - this.txtConstructionCompany.Text = report.ConstructionCompany; + if (!string.IsNullOrEmpty(report.ConstructionCompany)) + { + this.txtConstructionCompany.Text = report.ConstructionCompany; + } + else + { + this.txtConstructionCompany.Text = "浙江鼎盛石化工程有限公司"; + } + if (!string.IsNullOrEmpty(report.CompilationBasis)) + { + this.txtCompilationBasis.Text = report.CompilationBasis; + } + else + { + this.txtCompilationBasis.Text = "1、《石油化工建设工程项目交工技术文件规定》(SH/T3503-2017)\r\n2、《国家重大建设项目文件归档要求与档案管理规范》(DA/T28-2018)\r\n3、《石油化工建设工程项目过程技术文件规定》(SH/T3543-2017)"; + } + if (!string.IsNullOrEmpty(report.MainContent)) + { + this.txtMainContent.Text = report.MainContent; + } + else + { + this.txtMainContent.Text = "1、交工技术文件，共2册，分别为:管道安装工程册、材料质量证明文件\r\n2、本册为管道安装工程册，册内内容包括:封面、交工技术目录、交工技术总目录、交工技术说明、交工技术文件移交证书等。"; + } + if (!string.IsNullOrEmpty(report.CopiesNum)) + { + this.txtCopiesNum.Text = report.CopiesNum; + } + else + { + this.txtCopiesNum.Text = "1、交工纸质文件归档2份，其中正本1份，副本1份。"; + } } else { - //var project = BLL.Base_ProjectService.GetProjectByProjectId(projectId); - //var isoLists = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(projectId); - //string isoInfos = string.Empty; - //foreach (var item in isoLists) - //{ - // int hdCount = 0; - // int gdCount = 0; - // var joitInfos = (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == item.ISO_ID select x); - // if (joitInfos.Count() > 0) - // { - // hdCount = joitInfos.Where(x => x.JOT_JointAttribute == "活动").Count(); - // gdCount = joitInfos.Where(x => x.JOT_JointAttribute == "固定").Count(); - // } - // isoInfos += "管线编号" + item.ISO_IsoNo + "，其中活动焊口" + hdCount + "道，固定焊口" + gdCount + "道；"; - //} - //if (!string.IsNullOrEmpty(isoInfos)) - //{ - // isoInfos = isoInfos.Substring(0, isoInfos.LastIndexOf('；')); - //} - //this.txtProjectOverview.Text = "本文件为" + project.ProjectName + "，" + string.Format("{0:yyyy年MM月dd日}", project.StartDate) + "开工，到" + string.Format("{0:yyyy年MM月dd日}", project.EndDate) + "施工结束，主要施工内容：" + isoInfos; + this.txtCompilationBasis.Text = "1、《石油化工建设工程项目交工技术文件规定》(SH/T3503-2017)\r\n2、《国家重大建设项目文件归档要求与档案管理规范》(DA/T28-2018)\r\n3、《石油化工建设工程项目过程技术文件规定》(SH/T3543-2017)"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtConstructionCompany.Text = "浙江鼎盛石化工程有限公司"; + this.txtMainContent.Text = "1、交工技术文件，共2册，分别为:管道安装工程册、材料质量证明文件\r\n2、本册为管道安装工程册，册内内容包括:封面、交工技术目录、交工技术总目录、交工技术说明、交工技术文件移交证书等。"; + this.txtCopiesNum.Text = "1、交工纸质文件归档2份，其中正本1份，副本1份。"; } } } @@ -176,6 +199,9 @@ namespace FineUIPro.Web.JGZL newDocumentDescription.DesigningUnit = this.txtDesigningUnit.Text; newDocumentDescription.TestingUnit = this.txtTestingUnit.Text; newDocumentDescription.ConstructionCompany = this.txtConstructionCompany.Text; + newDocumentDescription.CompilationBasis=this.txtCompilationBasis.Text; + newDocumentDescription.MainContent = this.txtMainContent.Text; + newDocumentDescription.CopiesNum = this.txtCopiesNum.Text; if (!string.IsNullOrEmpty(this.DocumentDescriptionId)) { newDocumentDescription.DocumentDescriptionId = this.DocumentDescriptionId; @@ -224,6 +250,9 @@ namespace FineUIPro.Web.JGZL keyValuePairs.Add("DesigningUnit", this.txtDesigningUnit.Text); keyValuePairs.Add("TestingUnit", this.txtTestingUnit.Text); keyValuePairs.Add("ConstructionCompany", this.txtConstructionCompany.Text); + keyValuePairs.Add("CompilationBasis", this.txtCompilationBasis.Text); + keyValuePairs.Add("MainContent", this.txtMainContent.Text); + keyValuePairs.Add("CopiesNum", this.txtCopiesNum.Text); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\交工技术文件说明.frx"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs index c24cc3e..3dae246 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs @@ -131,6 +131,24 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Form SimpleForm1; + /// + /// txtProjectOverview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectOverview; + + /// + /// txtCompilationBasis 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtCompilationBasis; + /// /// txtConstructionUnit 控件。 /// @@ -168,13 +186,22 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.TextBox txtConstructionCompany; /// - /// txtProjectOverview 控件。 + /// txtMainContent 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtProjectOverview; + protected global::FineUIPro.TextArea txtMainContent; + + /// + /// txtCopiesNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCopiesNum; /// /// WindowPrint 控件。 diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 04b4ba4..e6f74d9 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -83974,6 +83974,12 @@ namespace Model private System.Nullable _ReviewDate; + private string _CompilationBasis; + + private string _MainContent; + + private string _CopiesNum; + private EntityRef _Base_Project; private EntityRef _Sys_User; @@ -84006,6 +84012,12 @@ namespace Model partial void OnReviewerChanged(); partial void OnReviewDateChanging(System.Nullable value); partial void OnReviewDateChanged(); + partial void OnCompilationBasisChanging(string value); + partial void OnCompilationBasisChanged(); + partial void OnMainContentChanging(string value); + partial void OnMainContentChanged(); + partial void OnCopiesNumChanging(string value); + partial void OnCopiesNumChanged(); #endregion public JGZL_DocumentDescription() @@ -84248,6 +84260,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompilationBasis", DbType="NVarChar(1000)")] + public string CompilationBasis + { + get + { + return this._CompilationBasis; + } + set + { + if ((this._CompilationBasis != value)) + { + this.OnCompilationBasisChanging(value); + this.SendPropertyChanging(); + this._CompilationBasis = value; + this.SendPropertyChanged("CompilationBasis"); + this.OnCompilationBasisChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainContent", DbType="NVarChar(500)")] + public string MainContent + { + get + { + return this._MainContent; + } + set + { + if ((this._MainContent != value)) + { + this.OnMainContentChanging(value); + this.SendPropertyChanging(); + this._MainContent = value; + this.SendPropertyChanged("MainContent"); + this.OnMainContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CopiesNum", DbType="NVarChar(500)")] + public string CopiesNum + { + get + { + return this._CopiesNum; + } + set + { + if ((this._CopiesNum != value)) + { + this.OnCopiesNumChanging(value); + this.SendPropertyChanging(); + this._CopiesNum = value; + this.SendPropertyChanged("CopiesNum"); + this.OnCopiesNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project {