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/BLL.csproj b/HJGL_DS/BLL/BLL.csproj
index 860e83e..2904cba 100644
--- a/HJGL_DS/BLL/BLL.csproj
+++ b/HJGL_DS/BLL/BLL.csproj
@@ -248,6 +248,7 @@
+
diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs
index 33b6004..cec10f2 100644
--- a/HJGL_DS/BLL/Common/Const.cs
+++ b/HJGL_DS/BLL/Common/Const.cs
@@ -1900,6 +1900,10 @@ namespace BLL
///
public const string JGZL_DocumentDescriptionMenuId = "81B9A521-A077-48C5-98A8-3A44C0B0D803";
+ ///
+ /// 交工技术文件目录
+ ///
+ public const string JGZL_FileDirectoryMenuId = "729387AD-488D-4451-AEB4-570306747351";
#endregion
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/BLL/JGZL/FileDirectoryService.cs b/HJGL_DS/BLL/JGZL/FileDirectoryService.cs
new file mode 100644
index 0000000..155f957
--- /dev/null
+++ b/HJGL_DS/BLL/JGZL/FileDirectoryService.cs
@@ -0,0 +1,41 @@
+using Model;
+using NPOI.SS.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 交工技术文件目录
+ ///
+ public class FileDirectoryService
+ {
+ ///
+ /// 根据主键获取交工技术文件目录
+ ///
+ ///
+ ///
+ public static Model.JGZL_FileDirectory GetFileDirectoryById(string fileDirectoryId)
+ {
+ return Funs.DB.JGZL_FileDirectory.FirstOrDefault(e => e.FileDirectoryId == fileDirectoryId);
+ }
+
+ ///
+ /// 根据主键删除交工技术文件目录
+ ///
+ ///
+ public static void DeleteFileDirectoryById(string fileDirectoryId)
+ {
+ SGGLDB db = Funs.DB;
+ var fileDirectory = db.JGZL_FileDirectory.FirstOrDefault(e => e.FileDirectoryId == fileDirectoryId);
+ if (fileDirectory != null)
+ {
+ db.JGZL_FileDirectory.DeleteOnSubmit(fileDirectory);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs b/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs
index fa905da..7f9e1cf 100644
--- a/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs
+++ b/HJGL_DS/BLL/JGZL/SpecialEquipmentMaintenanceService.cs
@@ -18,11 +18,21 @@ namespace BLL
return Funs.DB.JGZL_SpecialEquipmentMaintenance.FirstOrDefault(e => e.MaintenanceId == maintenanceId);
}
- ///
- /// 增加特种设备安装改造维修告知书
- ///
- ///
- public static void AddSpecialEquipmentMaintenance(Model.JGZL_SpecialEquipmentMaintenance maintenance)
+ ///
+ /// 根据项目Id获取设备安装改造维修告知书
+ ///
+ ///
+ ///
+ public static Model.JGZL_SpecialEquipmentMaintenance GetSpecialEquipmentMaintenanceByProjectId(string projectId)
+ {
+ return Funs.DB.JGZL_SpecialEquipmentMaintenance.FirstOrDefault(e => e.MaintenanceId == projectId);
+ }
+
+ ///
+ /// 增加特种设备安装改造维修告知书
+ ///
+ ///
+ public static void AddSpecialEquipmentMaintenance(Model.JGZL_SpecialEquipmentMaintenance maintenance)
{
SGGLDB db = Funs.DB;
Model.JGZL_SpecialEquipmentMaintenance newMaintenance = new Model.JGZL_SpecialEquipmentMaintenance();
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx
index bd271a6..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();
}
- }
- }
+ }
+ }
}
-
+
@@ -52,7 +52,7 @@ namespace FastReport
-
+
@@ -77,40 +77,22 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -124,21 +106,39 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx
index 4a39591..a730338 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx
@@ -1,5 +1,27 @@
-
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ }
+}
+
@@ -7,6 +29,9 @@
+
+
+
@@ -17,13 +42,13 @@
-
+
-
+
@@ -36,51 +61,51 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -88,7 +113,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
index 4eea0e5..b1918b7 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx
index c0a5a20..906fa91 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;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
@@ -54,22 +54,22 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -89,17 +89,17 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -111,18 +111,18 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -135,17 +135,17 @@ namespace FastReport
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx
index 0aa4dbe..26d315c 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx
@@ -1,5 +1,5 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx
index 2791e40..4f19a77 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程中间交接证书.frx
@@ -1,5 +1,5 @@
-
+
@@ -9,9 +9,9 @@
-
-
-
+
+
+
@@ -23,7 +23,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx
index ef6a0e1..cae5a7e 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;
@@ -32,7 +32,7 @@ namespace FastReport
-
+
@@ -43,7 +43,7 @@ namespace FastReport
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx
index 1f291c2..db9d4cd 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程施工开工报告.frx
@@ -1,5 +1,5 @@
-
+
@@ -11,9 +11,9 @@
-
-
-
+
+
+
@@ -86,9 +86,9 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx
index 59f1f65..59da180 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx
@@ -1,5 +1,5 @@
-
+
@@ -16,21 +16,21 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -91,7 +91,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -156,11 +156,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx
index d76a271..83b1684 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx
@@ -1,5 +1,5 @@
-
+
@@ -15,23 +15,23 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
+
+
@@ -74,7 +74,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -107,7 +107,7 @@
-
+
@@ -116,10 +116,10 @@
-
-
-
-
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx
index 100c33e..0f4ba82 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;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
@@ -54,15 +54,15 @@ namespace FastReport
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -73,70 +73,70 @@ namespace FastReport
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -148,7 +148,7 @@ namespace FastReport
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx
index 4cf7e25..977cc72 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx
index 9070009..eeade1f 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;
@@ -50,7 +50,7 @@ namespace FastReport
}
-
+
@@ -66,25 +66,25 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -97,7 +97,7 @@ namespace FastReport
-
+
@@ -127,20 +127,20 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -157,21 +157,21 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -189,37 +189,40 @@ namespace FastReport
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
index 4295614..e7c3d79 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs
@@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
index d92d1e8..a380f4d 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
@@ -175,7 +175,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
index f1669f5..ee39e1d 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
@@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs
index 2a74025..c9f1fb4 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs
@@ -166,7 +166,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs
index d9cec4b..332c838 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs
@@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs
index e2f51aa..3940e43 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs
@@ -164,8 +164,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
- this.BindGrid();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs
index daf3ea6..18fc44a 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/Contact.aspx.cs
@@ -164,7 +164,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
index 610baaa..85052b9 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
@@ -118,7 +118,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
#endregion
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..44a5f96 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
{
@@ -111,7 +112,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ PageData();
}
#endregion
@@ -127,35 +130,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 +201,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 +252,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/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs
index ed8a73f..a53b9f3 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrostaticGrounding.aspx.cs
@@ -188,7 +188,9 @@ namespace FineUIPro.Web.JGZL
///
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
this.InitTreeMenu();
+ BindGrid();
}
///
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx
index 4d1939f..5cfbb7c 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/FileDirectory.aspx
@@ -47,12 +47,16 @@
-
-
+ --%>
+
@@ -63,15 +67,47 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="350px">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+