危险源管理模块接入真实数据库：新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理（含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档）

排除 CreateModel.bat（含明文sa密码与本地服务器名，未入库）

.gitignore

@@ -46,3 +46,6 @@
 /SGGL/FineUIPro.Web/HJGL/MaterialManage/StockInEdit.aspx.cs
 /SGGL/FineUIPro.Web/HJGL/MaterialManage/StockInEdit.aspx.designer.cs
 /SGGLPackFile1
+
+# 运行时错误日志（不应入库）
+/SGGL/FineUIPro.Web/ErrLog.txt

AGENTS.md

@@ -0,0 +1,38 @@
+# SGGL_HBAZ — 智慧施工管理信息系统（河北安装）
+
+施工管理信息系统（WebForms + Web API），.NET Framework 4.8，SQL Server，LINQ to SQL。解决方案在 `SGGL/SGGL.sln`（仓库根即本目录，与解决方案目录不同级）。
+
+## Commands
+
+- 构建（msbuild 不在 PATH，用 VS2022 的 MSBuild）：
+  `& 'D:\Development Kit\MVStudio\2022\MSBuild\Current\Bin\MSBuild.exe' 'SGGL\SGGL.sln' /p:Configuration=Debug`（Release 同理，已验证可构建）
+- 打发布包：`ReleasePacker.bat`（aspnet_compiler 预编译 + aspnet_merge 合并 → `SGGLPackFile/`；脚本引用 %VS100COMNTOOLS%，旧环境）
+- 重新生成 Model：`CreateModel.bat`（SqlMetal 从 SQL2022 实例 / SGGLDB_HBAZ 库生成 `SGGL/Model/Model.cs`）
+- 无测试项目 / 无测试命令（项目内没有单元测试）。
+
+## Architecture
+
+- `SGGL/FineUIPro.Web/` — WebForms 主站。入口 `Login.aspx`、`index*.aspx`、`indexProject*.aspx`；基类 `common/PageBase.cs`（Session["CurrUser"] 鉴权）；业务模块按文件夹组织（BaseInfo、CQMS、HSSE、HJGL、JDGL、PZHGL、SHIYE、SYHSE、SysManage、TaskScheduling、ZHGL 等）。
+- `SGGL/BLL/` — 业务逻辑层。`Common/Funs.cs`（全局配置 + LINQ-to-SQL 上下文 Funs.DB）；`SQLHelper.cs` 原始 ADO.NET；`API/` 外部接口；`TaskScheduling/` Quartz 定时任务。业务类为 `public static class XxxService`。
+- `SGGL/Model/` — LINQ to SQL 实体，`Model.cs` 由 SqlMetal 生成（约 14MB，勿手改）；实体前缀 `Sys_`（Sys_User、Sys_Role、Sys_ErrLogInfo）。
+- `SGGL/WebAPI/` — 经典 ASP.NET Web API（System.Web.Http），`Controllers/` 供移动端/第三方调用（材料、人员、人脸、身份证、视频、车辆、用户等）。
+- `SGGL/SgManager.AI/` — AI 辅助库：百度 OCR/人脸（IDCardRecognition、FaceClass）、地图、邮件。被 BLL 与 FineUIPro.Web 引用。
+- `SGGL/FineUIPro/` — 商业 UI 框架 FineUIPro v6.3.0 的 DLL（非源码，勿改）。
+- `DataBase/版本日志/` — 数据库增量变更脚本，命名 `SGGLDB_V<yyyy-MM-dd>-<序号>-<作者>.sql`；`script/script.sql` 为库整体脚本；`SGGLPackFile/` 为发布包输出目录（ReleasePacker 产物）。
+
+## Conventions
+
+- 中文注释，公共方法用 `/// <summary>` XML 注释。
+- 数据访问优先 `Funs.DB`（LINQ to SQL，InsertOnSubmit/SubmitChanges），复杂 SQL 用 `SQLHelper`。
+- 错误记录走 `ErrLogInfo.WriteLog(...)`；Global.asax 的 Application_Error 落库 `Sys_ErrLogInfo`。
+- 连接字符串与第三方密钥（含明文密码/API Key）在 `FineUIPro.Web/Web.config` 的 AppSettings 中，`Application_Start` 赋值给 `Funs.*`——勿把凭据写进提交内容。
+- WebAPI 响应统一包装 `Model.ResponeData`，action 常用 `[HttpPost]` + `[FromBody]`。
+- `SGGL/Backup*` 是开发备份目录，不要在其中改代码；`packages/` 被 gitignore（NuGet 还原）。
+
+## Notes
+
+- 构建警告基线（2026-02 优化后）：845 → 40，剩余 40 条均为 CS0618（Aspose.Words/Office Interop 过时 API，有意使用，勿自动改）。
+- `FineUIPro.Web/ErrLog.txt` 为运行时日志，已加入 .gitignore（git rm --cached 后本地保留）。
+- Web.config 含明文数据库密码与第三方 API Key，注意勿泄露/勿提交外发。
+- 测试 WebAPI 时注意：PowerShell 调用 `curl.exe -d '{"..."}'` 会剥掉 JSON 双引号导致反序列化失败，须用 `--data-binary '@body.json'`（文件方式）发 JSON body。
+- 本地运行验证：`iisexpress.exe /path:"SGGL\FineUIPro.Web" /port:4528`（WebForms）与 `/path:"SGGL\WebAPI" /port:7143`（WebAPI），数据库 SGGLDB_HBAZ 在本机 SQL Server 可用。

DataBase/版本日志/SGGLDB_V2026-08-13-001-zones.sql

@@ -0,0 +1,94 @@
+-- 危大、超危工程清单表
+CREATE TABLE [dbo].[HSSE_HazardProject] (
+  [HazardProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProjectCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [ProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [WorkContent] nvarchar(1000) COLLATE Chinese_PRC_CI_AS  NULL,
+  [RiskLevel] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [StartDate] datetime  NULL,
+  [EndDate] datetime  NULL,
+  [ManagerMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_HSSE_HazardProject] PRIMARY KEY CLUSTERED ([HazardProjectId])
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[HSSE_HazardProject] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'危大、超危工程清单',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'HazardProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'项目',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'ProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编号',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'ProjectCode'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'分部分项工程',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'ProjectName'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'施工内容',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'WorkContent'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'风险等级（危大工程/超危工程）',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'RiskLevel'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'开工时间',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'StartDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'结束时间',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'EndDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'现场负责人',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'ManagerMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'备注',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_HazardProject',
+'COLUMN', N'Remark'
+GO

DataBase/版本日志/SGGLDB_V2026-08-13-002-zones.sql

@@ -0,0 +1,78 @@
+-- 专项施工方案表
+CREATE TABLE [dbo].[HSSE_SpecialPlan] (
+  [PlanId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [HazardProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [PlanName] nvarchar(200) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileDate] datetime  NULL,
+  [UploadFile] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_HSSE_SpecialPlan] PRIMARY KEY CLUSTERED ([PlanId])
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[HSSE_SpecialPlan] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'专项施工方案',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'PlanId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'项目',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'ProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'工程名称',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'HazardProjectName'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'方案名称',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'PlanName'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制人',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'CompileMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制日期',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'CompileDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'附件',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'UploadFile'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'备注',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SpecialPlan',
+'COLUMN', N'Remark'
+GO

DataBase/版本日志/SGGLDB_V2026-08-15-002-zones.sql

@@ -0,0 +1,94 @@
+-- 风险分级管控清单表
+CREATE TABLE [dbo].[HSSE_RiskControlList] (
+  [RiskId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [RiskName] nvarchar(200) COLLATE Chinese_PRC_CI_AS  NULL,
+  [RiskLevel] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [RiskType] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [ControlMeasure] nvarchar(1000) COLLATE Chinese_PRC_CI_AS  NULL,
+  [ManagerUnit] nvarchar(200) COLLATE Chinese_PRC_CI_AS  NULL,
+  [ManagerMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [UploadFile] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_HSSE_RiskControlList] PRIMARY KEY CLUSTERED ([RiskId])
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[HSSE_RiskControlList] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'风险分级管控清单',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'RiskId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'项目',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'ProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'风险点',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'RiskName'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'风险等级',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'RiskLevel'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'风险类别',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'RiskType'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'管控措施',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'ControlMeasure'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'责任单位',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'ManagerUnit'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'责任人',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'ManagerMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'备注',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'Remark'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'附件',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_RiskControlList',
+'COLUMN', N'UploadFile'
+GO

DataBase/版本日志/SGGLDB_V2026-08-18-001-zones.sql

@@ -0,0 +1,78 @@
+-- 安全防护验收表
+CREATE TABLE [dbo].[HSSE_SafetyAcceptance] (
+  [AcceptanceId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [HazardProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [HazardProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AcceptanceResult] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AcceptanceMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AcceptanceDate] datetime  NULL,
+  [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_HSSE_SafetyAcceptance] PRIMARY KEY CLUSTERED ([AcceptanceId])
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[HSSE_SafetyAcceptance] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'安全防护验收',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'AcceptanceId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'项目',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'ProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'危大、超危工程',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'HazardProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'工程名称',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'HazardProjectName'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'验收结果',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'AcceptanceResult'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'验收人',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'AcceptanceMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'验收时间',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'AcceptanceDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'情况说明',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyAcceptance',
+'COLUMN', N'Remark'
+GO

DataBase/版本日志/SGGLDB_V2026-08-19-001-zones.sql

@@ -0,0 +1,78 @@
+-- 安全巡检记录表
+CREATE TABLE [dbo].[HSSE_SafetyPatrol] (
+  [PatrolId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [HazardProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [HazardProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [PatrolDate] datetime  NULL,
+  [PatrolMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [PatrolStatus] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [Content] nvarchar(1000) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_HSSE_SafetyPatrol] PRIMARY KEY CLUSTERED ([PatrolId])
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[HSSE_SafetyPatrol] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'安全巡检记录',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'PatrolId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'项目',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'ProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'危大、超危工程',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'HazardProjectId'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'工程名称',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'HazardProjectName'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'巡检日期',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'PatrolDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'巡检人',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'PatrolMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'巡检状态（正常/待整改）',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'PatrolStatus'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'巡检内容',
+'SCHEMA', N'dbo',
+'TABLE', N'HSSE_SafetyPatrol',
+'COLUMN', N'Content'
+GO

DataBase/菜单初始化脚本/危大、超危清单.sql

@@ -0,0 +1,8 @@
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0', N'危大工程管控', NULL, NULL, 1, N'0', N'Menu_HSSE', '0', '0', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'危大工程管控', NULL, NULL, 1, N'0', N'Menu_CQMS', '0', '0', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'0F166DE2-6DF7-49A9-8E4A-93F5AE476F28', N'专项施工方案', NULL, N'HSSE/HazardousMG/SpecialPlan.aspx', 0, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'1C0D9228-1548-47A8-9BC2-801CFED45915', N'安全技术交底', NULL, N'HSSE/HazardousMG/SafetyDisclosure.aspx', 0, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'44A8CF73-7F23-40CB-9D64-FD05AB48522D', N'危大、超危清单', NULL, N'HSSE/HazardousMG/HazardProject.aspx', 1, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'39C36EF6-A11E-4EA1-B78C-E0F59AAA6EB7', N'风险分级管控清单', NULL, N'HSSE/HazardousMG/RiskControlList.aspx', 2, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'7962CE8E-C17C-4C50-962D-85687E2A2FC9', N'安全防护验收', NULL, N'HSSE/HazardousMG/SafetyAcceptance.aspx', 0, N'81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0', N'Menu_HSSE', '0', '1', '1', NULL);
+INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'3EE924B8-DFB2-47DA-ADC1-FF8190E214F1', N'安全巡检', NULL, N'HSSE/HazardousMG/SafetyPatrol.aspx', 0, N'81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0', N'Menu_HSSE', '0', '1', '1', NULL);

SGGL/BLL/API/APIBaseInfoService.cs

@@ -860,7 +860,7 @@ namespace BLL
 
 					res = tb.Rows[0][0].ToString();
 				}
-				catch (Exception e) { }
+				catch (Exception) { }
 			}
 			return res;
 		}

SGGL/BLL/API/APIUnitService.cs

@@ -116,7 +116,6 @@ namespace BLL
                                   SL_ScanUrl = x.SL_ScanUrl.Replace("\\", "/")
                               };
                 return getData.ToList();
-                return null;
             }
         }
     }

SGGL/BLL/API/APIUpLoadFileService.cs

@@ -69,7 +69,7 @@ namespace BLL
                     readStream.Close();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 returnValue = "";
             }
@@ -97,7 +97,7 @@ namespace BLL
             {
                 mywebclient.DownloadFile(url, filepath);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 filepath = "";
             }

SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs

@@ -119,7 +119,7 @@ namespace BLL
                 {
                     newEquipmentQuality.EquipmentCount = int.Parse(newItem.EquipmentCount);
                 }
-                catch (Exception e) { }
+                catch (Exception) { }
             }
             var updateEquipmentQuality = db.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(x => x.GeneralEquipmentQualityId == newItem.EquipmentQualityId);
             if (updateEquipmentQuality == null)

SGGL/BLL/API/HSSE/APIHazardProjectService.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 危大、超危工程清单API服务
+    /// </summary>
+    public static class APIHazardProjectService
+    {
+        /// <summary>
+        /// 根据项目获取危大、超危工程清单列表（按分部分项工程搜索）
+        /// </summary>
+        /// <param name="projectId">项目主键</param>
+        /// <param name="keyword">分部分项工程关键字</param>
+        /// <returns></returns>
+        public static List<Model.HazardProjectItem> getHazardProjectList(string projectId, string keyword)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                IQueryable<Model.HSSE_HazardProject> query = db.HSSE_HazardProject.Where(x => x.ProjectId == projectId);
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    query = query.Where(x => x.ProjectName.Contains(keyword));
+                }
+                var list = from x in query
+                           orderby x.ProjectCode
+                           select new Model.HazardProjectItem
+                           {
+                               HazardProjectId = x.HazardProjectId,
+                               ProjectId = x.ProjectId,
+                               ProjectCode = x.ProjectCode,
+                               ProjectName = x.ProjectName,
+                               WorkContent = x.WorkContent,
+                               RiskLevel = x.RiskLevel,
+                               StartDate = x.StartDate,
+                               EndDate = x.EndDate,
+                               ManagerMan = x.ManagerMan,
+                               Remark = x.Remark
+                           };
+                return list.ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键获取危大、超危工程详情
+        /// </summary>
+        /// <param name="hazardProjectId">主键</param>
+        /// <returns></returns>
+        public static Model.HazardProjectItem getHazardProjectById(string hazardProjectId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var x = db.HSSE_HazardProject.FirstOrDefault(e => e.HazardProjectId == hazardProjectId);
+                if (x == null)
+                {
+                    return null;
+                }
+                return new Model.HazardProjectItem
+                {
+                    HazardProjectId = x.HazardProjectId,
+                    ProjectId = x.ProjectId,
+                    ProjectCode = x.ProjectCode,
+                    ProjectName = x.ProjectName,
+                    WorkContent = x.WorkContent,
+                    RiskLevel = x.RiskLevel,
+                    StartDate = x.StartDate,
+                    EndDate = x.EndDate,
+                    ManagerMan = x.ManagerMan,
+                    Remark = x.Remark
+                };
+            }
+        }
+    }
+}

SGGL/BLL/API/HSSE/APIMeetingService.cs

@@ -202,17 +202,28 @@ namespace BLL
         /// <param name="projectId"></param>
         /// <param name="meetingType">会议类型(C-班前会；W-周例会；M-例会；S-专题例会；A-其他会议)</param>
         /// <param name="states">状态（0-待提交；1-已提交）</param>
+        /// <param name="startDate">编制日期开始日期（yyyy-MM-dd，为空不限制）</param>
+        /// <param name="endDate">编制日期结束日期（yyyy-MM-dd，包含当天，为空不限制）</param>
         /// <returns></returns>
-        public static List<Model.MeetingItem> getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex)
+        public static List<Model.MeetingItem> getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex, string startDate, string endDate)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 List<Model.MeetingItem> getMeetItem = new List<Model.MeetingItem>();
+                // 编制日期(CompileDate)范围过滤：startDate/endDate为空时不限制；endDate取整天（包含endDate当天）
+                DateTime? dStart = Funs.GetNewDateTime(startDate);
+                DateTime? dEnd = Funs.GetNewDateTime(endDate);
+                if (dEnd.HasValue)
+                {
+                    dEnd = dEnd.Value.Date.AddDays(1);
+                }
                 if (meetingType == "C")
                 {
                     getMeetItem = (from x in db.Meeting_ClassMeeting
                                    where x.ProjectId == projectId
                                    && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
+                                   && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
+                                   && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
                                    orderby x.ClassMeetingDate descending
                                    select new Model.MeetingItem
                                    {
@@ -247,6 +258,8 @@ namespace BLL
                     getMeetItem = (from x in db.Meeting_WeekMeeting
                                    where x.ProjectId == projectId
                                    && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
+                                   && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
+                                   && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
                                    orderby x.WeekMeetingDate descending
                                    select new Model.MeetingItem
                                    {
@@ -278,6 +291,8 @@ namespace BLL
                     getMeetItem = (from x in db.Meeting_MonthMeeting
                                    where x.ProjectId == projectId
                                    && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
+                                   && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
+                                   && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
                                    orderby x.MonthMeetingDate descending
                                    select new Model.MeetingItem
                                    {
@@ -310,6 +325,8 @@ namespace BLL
                     getMeetItem = (from x in db.Meeting_SpecialMeeting
                                    where x.ProjectId == projectId
                                    && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
+                                   && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
+                                   && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
                                    orderby x.SpecialMeetingDate descending
                                    select new Model.MeetingItem
                                    {
@@ -342,6 +359,8 @@ namespace BLL
                     getMeetItem = (from x in db.Meeting_AttendMeeting
                                    where x.ProjectId == projectId
                                    && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
+                                   && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
+                                   && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
                                    orderby x.AttendMeetingDate descending
                                    select new Model.MeetingItem
                                    {

SGGL/BLL/API/HSSE/APISafetyAcceptanceService.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 安全防护验收API服务
+    /// </summary>
+    public static class APISafetyAcceptanceService
+    {
+        /// <summary>
+        /// 根据项目获取安全防护验收列表（按工程名称搜索）
+        /// </summary>
+        /// <param name="projectId">项目主键</param>
+        /// <param name="keyword">工程名称关键字</param>
+        /// <returns></returns>
+        public static List<Model.SafetyAcceptanceItem> getSafetyAcceptanceList(string projectId, string keyword)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                IQueryable<Model.HSSE_SafetyAcceptance> query = db.HSSE_SafetyAcceptance.Where(x => x.ProjectId == projectId);
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    query = query.Where(x => x.HazardProjectName.Contains(keyword));
+                }
+                var list = from x in query
+                           orderby x.AcceptanceDate descending
+                           select new Model.SafetyAcceptanceItem
+                           {
+                               AcceptanceId = x.AcceptanceId,
+                               ProjectId = x.ProjectId,
+                               HazardProjectId = x.HazardProjectId,
+                               HazardProjectName = x.HazardProjectName,
+                               AcceptanceResult = x.AcceptanceResult,
+                               AcceptanceMan = x.AcceptanceMan,
+                               AcceptanceDate = x.AcceptanceDate,
+                               Remark = x.Remark
+                           };
+                return list.ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键获取安全防护验收详情
+        /// </summary>
+        /// <param name="acceptanceId">主键</param>
+        /// <returns></returns>
+        public static Model.SafetyAcceptanceItem getSafetyAcceptanceById(string acceptanceId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var x = db.HSSE_SafetyAcceptance.FirstOrDefault(e => e.AcceptanceId == acceptanceId);
+                if (x == null)
+                {
+                    return null;
+                }
+                return new Model.SafetyAcceptanceItem
+                {
+                    AcceptanceId = x.AcceptanceId,
+                    ProjectId = x.ProjectId,
+                    HazardProjectId = x.HazardProjectId,
+                    HazardProjectName = x.HazardProjectName,
+                    AcceptanceResult = x.AcceptanceResult,
+                    AcceptanceMan = x.AcceptanceMan,
+                    AcceptanceDate = x.AcceptanceDate,
+                    Remark = x.Remark
+                };
+            }
+        }
+
+        /// <summary>
+        /// 新增安全防护验收（返回主键）
+        /// </summary>
+        /// <param name="item">验收项</param>
+        /// <returns></returns>
+        public static string addSafetyAcceptance(Model.SafetyAcceptanceItem item)
+        {
+            if (string.IsNullOrEmpty(item.AcceptanceId))
+            {
+                item.AcceptanceId = Guid.NewGuid().ToString();
+            }
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.HSSE_SafetyAcceptance newItem = new Model.HSSE_SafetyAcceptance
+                {
+                    AcceptanceId = item.AcceptanceId,
+                    ProjectId = item.ProjectId,
+                    HazardProjectId = item.HazardProjectId,
+                    HazardProjectName = item.HazardProjectName,
+                    AcceptanceResult = item.AcceptanceResult,
+                    AcceptanceMan = item.AcceptanceMan,
+                    AcceptanceDate = item.AcceptanceDate,
+                    Remark = item.Remark
+                };
+                db.HSSE_SafetyAcceptance.InsertOnSubmit(newItem);
+                db.SubmitChanges();
+            }
+            return item.AcceptanceId;
+        }
+
+        /// <summary>
+        /// 更新安全防护验收
+        /// </summary>
+        /// <param name="item">验收项</param>
+        /// <returns>是否更新成功</returns>
+        public static bool updateSafetyAcceptance(Model.SafetyAcceptanceItem item)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.HSSE_SafetyAcceptance newItem = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == item.AcceptanceId);
+                if (newItem == null)
+                {
+                    return false;
+                }
+                newItem.ProjectId = item.ProjectId;
+                newItem.HazardProjectId = item.HazardProjectId;
+                newItem.HazardProjectName = item.HazardProjectName;
+                newItem.AcceptanceResult = item.AcceptanceResult;
+                newItem.AcceptanceMan = item.AcceptanceMan;
+                newItem.AcceptanceDate = item.AcceptanceDate;
+                newItem.Remark = item.Remark;
+                db.SubmitChanges();
+                return true;
+            }
+        }
+    }
+}

SGGL/BLL/API/HSSE/APISafetyPatrolService.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 安全巡检API服务
+    /// </summary>
+    public static class APISafetyPatrolService
+    {
+        /// <summary>
+        /// 根据项目获取安全巡检列表（按工程名称搜索）
+        /// </summary>
+        /// <param name="projectId">项目主键</param>
+        /// <param name="keyword">工程名称关键字</param>
+        /// <returns></returns>
+        public static List<Model.SafetyPatrolItem> getSafetyPatrolList(string projectId, string keyword)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                IQueryable<Model.HSSE_SafetyPatrol> query = db.HSSE_SafetyPatrol.Where(x => x.ProjectId == projectId);
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    query = query.Where(x => x.HazardProjectName.Contains(keyword));
+                }
+                var list = from x in query
+                           orderby x.PatrolDate descending
+                           select new Model.SafetyPatrolItem
+                           {
+                               PatrolId = x.PatrolId,
+                               ProjectId = x.ProjectId,
+                               HazardProjectId = x.HazardProjectId,
+                               HazardProjectName = x.HazardProjectName,
+                               PatrolDate = x.PatrolDate,
+                               PatrolMan = x.PatrolMan,
+                               PatrolStatus = x.PatrolStatus,
+                               Content = x.Content
+                           };
+                return list.ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键获取安全巡检详情
+        /// </summary>
+        /// <param name="patrolId">主键</param>
+        /// <returns></returns>
+        public static Model.SafetyPatrolItem getSafetyPatrolById(string patrolId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var x = db.HSSE_SafetyPatrol.FirstOrDefault(e => e.PatrolId == patrolId);
+                if (x == null)
+                {
+                    return null;
+                }
+                return new Model.SafetyPatrolItem
+                {
+                    PatrolId = x.PatrolId,
+                    ProjectId = x.ProjectId,
+                    HazardProjectId = x.HazardProjectId,
+                    HazardProjectName = x.HazardProjectName,
+                    PatrolDate = x.PatrolDate,
+                    PatrolMan = x.PatrolMan,
+                    PatrolStatus = x.PatrolStatus,
+                    Content = x.Content
+                };
+            }
+        }
+
+        /// <summary>
+        /// 新增安全巡检（返回主键）
+        /// </summary>
+        /// <param name="item">巡检项</param>
+        /// <returns></returns>
+        public static string addSafetyPatrol(Model.SafetyPatrolItem item)
+        {
+            if (string.IsNullOrEmpty(item.PatrolId))
+            {
+                item.PatrolId = Guid.NewGuid().ToString();
+            }
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.HSSE_SafetyPatrol newItem = new Model.HSSE_SafetyPatrol
+                {
+                    PatrolId = item.PatrolId,
+                    ProjectId = item.ProjectId,
+                    HazardProjectId = item.HazardProjectId,
+                    HazardProjectName = item.HazardProjectName,
+                    PatrolDate = item.PatrolDate,
+                    PatrolMan = item.PatrolMan,
+                    PatrolStatus = item.PatrolStatus,
+                    Content = item.Content
+                };
+                db.HSSE_SafetyPatrol.InsertOnSubmit(newItem);
+                db.SubmitChanges();
+            }
+            ////保存巡检图片附件
+            if (!string.IsNullOrEmpty(item.AttachUrl))
+            {
+                APIUpLoadFileService.SaveAttachUrl(Const.SafetyPatrolMenuId, item.PatrolId, item.AttachUrl, "0");
+            }
+            return item.PatrolId;
+        }
+
+        /// <summary>
+        /// 更新安全巡检
+        /// </summary>
+        /// <param name="item">巡检项</param>
+        /// <returns>是否更新成功</returns>
+        public static bool updateSafetyPatrol(Model.SafetyPatrolItem item)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.HSSE_SafetyPatrol newItem = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == item.PatrolId);
+                if (newItem == null)
+                {
+                    return false;
+                }
+                newItem.ProjectId = item.ProjectId;
+                newItem.HazardProjectId = item.HazardProjectId;
+                newItem.HazardProjectName = item.HazardProjectName;
+                newItem.PatrolDate = item.PatrolDate;
+                newItem.PatrolMan = item.PatrolMan;
+                newItem.PatrolStatus = item.PatrolStatus;
+                newItem.Content = item.Content;
+                db.SubmitChanges();
+            }
+            ////保存巡检图片附件
+            if (!string.IsNullOrEmpty(item.AttachUrl))
+            {
+                APIUpLoadFileService.SaveAttachUrl(Const.SafetyPatrolMenuId, item.PatrolId, item.AttachUrl, "0");
+            }
+            return true;
+        }
+    }
+}

SGGL/BLL/BLL.csproj

@@ -192,6 +192,7 @@
     <Compile Include="API\HSSE\APIEmergencyService.cs" />
     <Compile Include="API\HSSE\APIEquipmentQualityService.cs" />
     <Compile Include="API\HSSE\APIHazardListService.cs" />
+    <Compile Include="API\HSSE\APIHazardProjectService.cs" />
     <Compile Include="API\HSSE\APIHazardRegisterService.cs" />
     <Compile Include="API\HSSE\APIHSEDiaryService.cs" />
     <Compile Include="API\HSSE\APIIncentiveNoticeService.cs" />
@@ -205,6 +206,8 @@
     <Compile Include="API\HSSE\APIReceiveFileManagerService.cs" />
     <Compile Include="API\HSSE\APIRectifyNoticesService.cs" />
     <Compile Include="API\HSSE\APIResourcesService.cs" />
+    <Compile Include="API\HSSE\APISafetyAcceptanceService.cs" />
+    <Compile Include="API\HSSE\APISafetyPatrolService.cs" />
     <Compile Include="API\HSSE\APISeDinMonthReportService.cs" />
     <Compile Include="API\HSSE\APIServerTestPlanService.cs" />
     <Compile Include="API\HSSE\APIServerTestRecordService.cs" />
@@ -569,7 +572,10 @@
     <Compile Include="HSSE\Hazard\Hazard_PatrolPlanService.cs" />
     <Compile Include="HSSE\Hazard\Hazard_RoutingInspectionService.cs" />
     <Compile Include="HSSE\Hazard\HazardProjectService.cs" />
+    <Compile Include="HSSE\Hazard\RiskControlListService.cs" />
+    <Compile Include="HSSE\Hazard\SafetyAcceptanceService.cs" />
     <Compile Include="HSSE\Hazard\SafetyDisclosureService.cs" />
+    <Compile Include="HSSE\Hazard\SafetyPatrolService.cs" />
     <Compile Include="HSSE\Hazard\SpecialPlanService.cs" />
     <Compile Include="HSSE\HiddenInspection\HSSE_Hazard_HazardRegisterService.cs" />
     <Compile Include="HSSE\HSSESystem\HSSEMainDutyService.cs" />

SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs

@@ -10,7 +10,7 @@ namespace BLL
     {
         public static string ConvertAuditDate(object ConstructSolutionId)
         {
-            var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate != null select x.ApproveDate).FirstOrDefault();
+            var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate != null select x.ApproveDate).FirstOrDefault();
             if (approve != null)
             {
                 return approve.Value.ToString("yyyy-MM-dd");
@@ -20,7 +20,7 @@ namespace BLL
         public static string ConvertToDo(object ConstructSolutionId)
         {
             string res = "";
-            var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate == null select x);
+            var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate == null select x);
             if (approve != null)
             {
                 foreach (var item in approve)
@@ -33,14 +33,14 @@ namespace BLL
         public static Model.Solution_CQMSConstructSolutionApprove GetSee(string ConstructSolutionId, string userId)
         {
             Model.SGGLDB db = Funs.DB;
-            return db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
+            return db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
         }
 
         public static void See(string ConstructSolutionId, string userId)
         {
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
-                var res = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
+                var res = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
                 if (res != null)
                 {
                     res.ApproveDate = DateTime.Now;
@@ -56,7 +56,7 @@ namespace BLL
         public static List<string> GetUserIdsApprovesBySignType(string ConstructSolutionId, string signType)
         {
             var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId);
-            return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
+            return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
         }
 
         public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId)
@@ -113,14 +113,14 @@ namespace BLL
         public static List<Model.Solution_CQMSConstructSolutionApprove> GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state)
         {
             Model.SGGLDB db = Funs.DB;
-            var reDate = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
+            var reDate = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
             if (reDate == null)
             {
-                return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state select x).ToList();
+                return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state select x).ToList();
             }
             else
             {
-                return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
+                return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
             }
         }
 
@@ -134,7 +134,7 @@ namespace BLL
         {
             Model.SGGLDB db = Funs.DB;
             var res = from x in db.Solution_CQMSConstructSolutionApprove
-                      where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S"
+                      where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S"
                       orderby x.ApproveDate
                       select x;
 
@@ -156,7 +156,7 @@ namespace BLL
         {
             Model.SGGLDB db = Funs.DB;
             var res = from x in db.Solution_CQMSConstructSolutionApprove
-                      where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
+                      where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
                       orderby x.ApproveType, x.Edition
                       select x;
 
@@ -236,7 +236,7 @@ namespace BLL
         public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId)
         {
             Model.SGGLDB db = Funs.DB;
-            var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
+            var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId select x).ToList();
             db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
             db.SubmitChanges();
         }
@@ -248,17 +248,17 @@ namespace BLL
         public static Model.Solution_CQMSConstructSolutionApprove GetConstructSolutionApproveByApproveMan(string ConstructSolutionId, string approveMan)
         {
 
-            return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+            return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
         }
         public static Model.Solution_CQMSConstructSolutionApprove GetConstructSoluAppByApproveMan(string ConstructSolutionId, string approveMan, int edtion)
         {
 
-            return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+            return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
         }
 
         public static Model.Solution_CQMSConstructSolutionApprove GetConstructSolApproveByApproveMan(string ConstructSolutionId, string approveMan)
         {
-            return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+            return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
         }
 
 
@@ -325,7 +325,7 @@ namespace BLL
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
                 var q = from x in db.Solution_CQMSConstructSolutionApprove
-                        where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
+                        where x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
                         orderby x.ApproveDate
                         select new
                         {
@@ -363,7 +363,7 @@ namespace BLL
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
                 var q = from x in db.Solution_CQMSConstructSolutionApprove
-                        where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
+                        where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
                         orderby x.ApproveDate
                         select new
                         {

SGGL/BLL/CQMS/WBS/ProjectQualityService.cs

@@ -76,7 +76,7 @@ namespace BLL
 
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 isok = false;
             }
@@ -102,7 +102,7 @@ namespace BLL
                     db.SubmitChanges();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 isok = false;
             }

SGGL/BLL/Common/AttachFileService.cs

@@ -115,7 +115,7 @@ namespace BLL
                     return res.Replace('\\', '/');
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return "";
             }
@@ -140,7 +140,7 @@ namespace BLL
                     return res.Replace('\\', '/');
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return "";
             }
@@ -277,7 +277,6 @@ namespace BLL
                     return true;
                 }
             }
-            return false;
         }
 
         /// <summary>
@@ -292,7 +291,6 @@ namespace BLL
             string res = "";
             foreach (var item in urls)
             {
-                string size = "0";
                 int strInt = item.LastIndexOf("~");
                 if (strInt < 0)
                 {
@@ -317,7 +315,6 @@ namespace BLL
         /// <returns></returns>
         public static string getAttachSource(string url, string fileDir)
         {
-            string res = "";
             string attachSource = string.Empty;
             if (!string.IsNullOrEmpty(url))
             {
@@ -392,7 +389,7 @@ namespace BLL
                 }
                 return file;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return "";
 

SGGL/BLL/Common/CommonService.cs

@@ -249,7 +249,7 @@ namespace BLL
                 }
 
             }
-            catch (Exception e) { }
+            catch (Exception) { }
             return buttonList;
         }
         #endregion

SGGL/BLL/Common/Const.cs

@@ -2597,7 +2597,15 @@ namespace BLL
         /// <summary>
         /// 安全技术交底
         /// </summary>
-        public const string ProjectHSETechnicalMenuId = "49485F7E-8E71-4EED-87B4-BF6CC180C69C"; 
+        public const string ProjectHSETechnicalMenuId = "49485F7E-8E71-4EED-87B4-BF6CC180C69C";
+        /// <summary>
+        /// 安全防护验收
+        /// </summary>
+        public const string SafetyAcceptanceMenuId = "7962CE8E-C17C-4C50-962D-85687E2A2FC9";
+        /// <summary>
+        /// 安全巡检
+        /// </summary>
+        public const string SafetyPatrolMenuId = "3EE924B8-DFB2-47DA-ADC1-FF8190E214F1";
         /// <summary>
         /// 作业票申请
         /// </summary>

SGGL/BLL/Common/NPOIExcel.cs

@@ -378,7 +378,6 @@ namespace BLL.Common
             // 第三步：创建画部
             IDrawing patriarch = ActiveSheet.CreateDrawingPatriarch();
             // 第四步：设置锚点
-            int rowline = 1; // y方向
             // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
             IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, columnIndex, rowIndex, columnIndex+1, rowIndex + 1);
             // 第五步：把图片插到相应的位置+1

SGGL/BLL/Common/NPOIHelper.cs

@@ -159,7 +159,7 @@ namespace BLL.Common
                                         break;
                                 }
                             }
-                            catch (Exception ex)
+                            catch (Exception)
                             {
                             }
                         }

SGGL/BLL/Common/UpLoadImageService.cs

@@ -118,7 +118,7 @@ namespace BLL
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 //出错则删除 
                 File.Delete(localRoot + sFilename);

SGGL/BLL/Common/UploadAttachmentService.cs

@@ -190,7 +190,7 @@ namespace BLL
                         string fileName = subUrl[subUrl.Count() - 1];
                         string newFileName = fileName.Substring(fileName.IndexOf("~") + 1);
 
-                        htmlStr += "<img width='60' height='60' style=\"margin-right:6px;margin-bottom:6px;\" src='" + url + "'></img>";
+                        htmlStr += "<a href='" + url + "' target='_blank'><img width='60' height='60' style=\"margin-right:6px;margin-bottom:6px;\" src='" + url + "'></img></a>";
                     }
                 }
 
@@ -458,7 +458,7 @@ namespace BLL
                         string fileName = subUrl[subUrl.Count() - 1];
                         string newFileName = fileName.Substring(fileName.IndexOf("~") + 1);
 
-                        htmlStr += "<tr><td style=\"width: 100%\" align=\"left\"><img width='" + width + "' height='" + height + "' src='" + url + "'></img></td>";
+                        htmlStr += "<tr><td style=\"width: 100%\" align=\"left\"><a href='" + url + "' target='_blank'><img width='" + width + "' height='" + height + "' src='" + url + "'></img></a></td>";
                     }
                 }
 

SGGL/BLL/Common/WordHelp.cs

@@ -440,7 +440,7 @@ namespace BLL
                 sw.Write(html);
                 sw.Close();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
               
             }

SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs

@@ -4,10 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Collections;
 
 namespace BLL

SGGL/BLL/HJGL/WeldingManage/PMI_MaterialTemplateService.cs

@@ -140,7 +140,7 @@ namespace BLL
                 {
                     db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict);
                 }
-                catch (System.Data.Linq.ChangeConflictException ex)
+                catch (System.Data.Linq.ChangeConflictException)
                 {
                     foreach (System.Data.Linq.ObjectChangeConflict occ in db.ChangeConflicts)
                     {

SGGL/BLL/HJGL/WeldingManage/PipelineService.cs

@@ -127,7 +127,7 @@ namespace BLL
                 {
                     db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict);
                 }
-                catch (System.Data.Linq.ChangeConflictException ex)
+                catch (System.Data.Linq.ChangeConflictException)
                 {
                     foreach (System.Data.Linq.ObjectChangeConflict occ in db.ChangeConflicts)
                     {

SGGL/BLL/HSSE/Hazard/HazardProjectService.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 危大、超危工程清单服务
+    /// </summary>
+    public static class HazardProjectService
+    {
+        /// <summary>
+        /// 获取危大、超危工程清单列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.HSSE_HazardProject> GetList(string projectId)
+        {
+            return Funs.DB.HSSE_HazardProject.Where(x => x.ProjectId == projectId).ToList();
+        }
+
+        /// <summary>
+        /// 根据主键获取危大、超危工程
+        /// </summary>
+        /// <param name="hazardProjectId">主键</param>
+        /// <returns></returns>
+        public static Model.HSSE_HazardProject GetById(string hazardProjectId)
+        {
+            return Funs.DB.HSSE_HazardProject.FirstOrDefault(x => x.HazardProjectId == hazardProjectId);
+        }
+
+        /// <summary>
+        /// 新增危大、超危工程
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Add(Model.HSSE_HazardProject item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_HazardProject newItem = new Model.HSSE_HazardProject
+            {
+                HazardProjectId = item.HazardProjectId,
+                ProjectId = item.ProjectId,
+                ProjectCode = item.ProjectCode,
+                ProjectName = item.ProjectName,
+                WorkContent = item.WorkContent,
+                RiskLevel = item.RiskLevel,
+                StartDate = item.StartDate,
+                EndDate = item.EndDate,
+                ManagerMan = item.ManagerMan,
+                Remark = item.Remark
+            };
+            db.HSSE_HazardProject.InsertOnSubmit(newItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新危大、超危工程
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Update(Model.HSSE_HazardProject item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_HazardProject newItem = db.HSSE_HazardProject.FirstOrDefault(x => x.HazardProjectId == item.HazardProjectId);
+            if (newItem != null)
+            {
+                newItem.ProjectCode = item.ProjectCode;
+                newItem.ProjectName = item.ProjectName;
+                newItem.WorkContent = item.WorkContent;
+                newItem.RiskLevel = item.RiskLevel;
+                newItem.StartDate = item.StartDate;
+                newItem.EndDate = item.EndDate;
+                newItem.ManagerMan = item.ManagerMan;
+                newItem.Remark = item.Remark;
+                db.SubmitChanges();
+            }
+            else
+            {
+                Add(item);
+            }
+        }
+
+        /// <summary>
+        /// 删除危大、超危工程
+        /// </summary>
+        /// <param name="hazardProjectId">主键</param>
+        public static void Delete(string hazardProjectId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_HazardProject item = db.HSSE_HazardProject.FirstOrDefault(x => x.HazardProjectId == hazardProjectId);
+            if (item != null)
+            {
+                db.HSSE_HazardProject.DeleteOnSubmit(item);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 自动生成工程编号（HD-XXX，取现有最大序号加1）
+        /// </summary>
+        /// <returns></returns>
+        public static string GetNewCode()
+        {
+            int max = 0;
+            foreach (Model.HSSE_HazardProject item in Funs.DB.HSSE_HazardProject.ToList())
+            {
+                string code = item.ProjectCode;
+                if (!string.IsNullOrEmpty(code) && code.StartsWith("HD-"))
+                {
+                    int num = 0;
+                    if (int.TryParse(code.Substring(3), out num) && num > max)
+                    {
+                        max = num;
+                    }
+                }
+            }
+            return string.Format("HD-{0:D3}", max + 1);
+        }
+    }
+}

SGGL/BLL/HSSE/Hazard/RiskControlListService.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 风险分级管控清单服务
+    /// </summary>
+    public static class RiskControlListService
+    {
+        /// <summary>
+        /// 获取风险分级管控清单列表
+        /// </summary>
+        /// <param name="projectId">项目主键</param>
+        /// <returns></returns>
+        public static List<Model.HSSE_RiskControlList> GetList(string projectId)
+        {
+            return Funs.DB.HSSE_RiskControlList.Where(x => x.ProjectId == projectId).ToList();
+        }
+
+        /// <summary>
+        /// 根据主键获取风险分级管控清单
+        /// </summary>
+        /// <param name="riskId">主键</param>
+        /// <returns></returns>
+        public static Model.HSSE_RiskControlList GetById(string riskId)
+        {
+            return Funs.DB.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == riskId);
+        }
+
+        /// <summary>
+        /// 新增风险分级管控清单
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Add(Model.HSSE_RiskControlList item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_RiskControlList newItem = new Model.HSSE_RiskControlList
+            {
+                RiskId = item.RiskId,
+                ProjectId = item.ProjectId,
+                RiskName = item.RiskName,
+                RiskLevel = item.RiskLevel,
+                RiskType = item.RiskType,
+                ControlMeasure = item.ControlMeasure,
+                ManagerUnit = item.ManagerUnit,
+                ManagerMan = item.ManagerMan,
+                UploadFile = item.UploadFile,
+                Remark = item.Remark
+            };
+            db.HSSE_RiskControlList.InsertOnSubmit(newItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新风险分级管控清单
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Update(Model.HSSE_RiskControlList item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_RiskControlList newItem = db.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == item.RiskId);
+            if (newItem != null)
+            {
+                newItem.RiskName = item.RiskName;
+                newItem.RiskLevel = item.RiskLevel;
+                newItem.RiskType = item.RiskType;
+                newItem.ControlMeasure = item.ControlMeasure;
+                newItem.ManagerUnit = item.ManagerUnit;
+                newItem.ManagerMan = item.ManagerMan;
+                newItem.UploadFile = item.UploadFile;
+                newItem.Remark = item.Remark;
+                db.SubmitChanges();
+            }
+            else
+            {
+                Add(item);
+            }
+        }
+
+        /// <summary>
+        /// 删除风险分级管控清单
+        /// </summary>
+        /// <param name="riskId">主键</param>
+        public static void Delete(string riskId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_RiskControlList item = db.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == riskId);
+            if (item != null)
+            {
+                db.HSSE_RiskControlList.DeleteOnSubmit(item);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/HSSE/Hazard/SafetyAcceptanceService.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 安全防护验收服务
+    /// </summary>
+    public static class SafetyAcceptanceService
+    {
+        /// <summary>
+        /// 获取安全防护验收列表
+        /// </summary>
+        /// <param name="projectId">项目主键</param>
+        /// <returns></returns>
+        public static List<Model.HSSE_SafetyAcceptance> GetList(string projectId)
+        {
+            return Funs.DB.HSSE_SafetyAcceptance.Where(x => x.ProjectId == projectId).ToList();
+        }
+
+        /// <summary>
+        /// 根据主键获取安全防护验收
+        /// </summary>
+        /// <param name="acceptanceId">主键</param>
+        /// <returns></returns>
+        public static Model.HSSE_SafetyAcceptance GetById(string acceptanceId)
+        {
+            return Funs.DB.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == acceptanceId);
+        }
+
+        /// <summary>
+        /// 新增安全防护验收
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Add(Model.HSSE_SafetyAcceptance item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SafetyAcceptance newItem = new Model.HSSE_SafetyAcceptance
+            {
+                AcceptanceId = item.AcceptanceId,
+                ProjectId = item.ProjectId,
+                HazardProjectId = item.HazardProjectId,
+                HazardProjectName = item.HazardProjectName,
+                AcceptanceResult = item.AcceptanceResult,
+                AcceptanceMan = item.AcceptanceMan,
+                AcceptanceDate = item.AcceptanceDate,
+                Remark = item.Remark
+            };
+            db.HSSE_SafetyAcceptance.InsertOnSubmit(newItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新安全防护验收
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Update(Model.HSSE_SafetyAcceptance item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SafetyAcceptance newItem = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == item.AcceptanceId);
+            if (newItem != null)
+            {
+                newItem.HazardProjectId = item.HazardProjectId;
+                newItem.HazardProjectName = item.HazardProjectName;
+                newItem.AcceptanceResult = item.AcceptanceResult;
+                newItem.AcceptanceMan = item.AcceptanceMan;
+                newItem.AcceptanceDate = item.AcceptanceDate;
+                newItem.Remark = item.Remark;
+                db.SubmitChanges();
+            }
+            else
+            {
+                Add(item);
+            }
+        }
+
+        /// <summary>
+        /// 删除安全防护验收
+        /// </summary>
+        /// <param name="acceptanceId">主键</param>
+        public static void Delete(string acceptanceId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SafetyAcceptance item = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == acceptanceId);
+            if (item != null)
+            {
+                db.HSSE_SafetyAcceptance.DeleteOnSubmit(item);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/HSSE/Hazard/SafetyPatrolService.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 安全巡检记录服务
+    /// </summary>
+    public static class SafetyPatrolService
+    {
+        /// <summary>
+        /// 获取安全巡检记录列表
+        /// </summary>
+        /// <param name="projectId">项目主键</param>
+        /// <returns></returns>
+        public static List<Model.HSSE_SafetyPatrol> GetList(string projectId)
+        {
+            return Funs.DB.HSSE_SafetyPatrol.Where(x => x.ProjectId == projectId).ToList();
+        }
+
+        /// <summary>
+        /// 根据主键获取安全巡检记录
+        /// </summary>
+        /// <param name="patrolId">主键</param>
+        /// <returns></returns>
+        public static Model.HSSE_SafetyPatrol GetById(string patrolId)
+        {
+            return Funs.DB.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == patrolId);
+        }
+
+        /// <summary>
+        /// 新增安全巡检记录
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Add(Model.HSSE_SafetyPatrol item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SafetyPatrol newItem = new Model.HSSE_SafetyPatrol
+            {
+                PatrolId = item.PatrolId,
+                ProjectId = item.ProjectId,
+                HazardProjectId = item.HazardProjectId,
+                HazardProjectName = item.HazardProjectName,
+                PatrolDate = item.PatrolDate,
+                PatrolMan = item.PatrolMan,
+                PatrolStatus = item.PatrolStatus,
+                Content = item.Content
+            };
+            db.HSSE_SafetyPatrol.InsertOnSubmit(newItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新安全巡检记录
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Update(Model.HSSE_SafetyPatrol item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SafetyPatrol newItem = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == item.PatrolId);
+            if (newItem != null)
+            {
+                newItem.HazardProjectId = item.HazardProjectId;
+                newItem.HazardProjectName = item.HazardProjectName;
+                newItem.PatrolDate = item.PatrolDate;
+                newItem.PatrolMan = item.PatrolMan;
+                newItem.PatrolStatus = item.PatrolStatus;
+                newItem.Content = item.Content;
+                db.SubmitChanges();
+            }
+            else
+            {
+                Add(item);
+            }
+        }
+
+        /// <summary>
+        /// 删除安全巡检记录
+        /// </summary>
+        /// <param name="patrolId">主键</param>
+        public static void Delete(string patrolId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SafetyPatrol item = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == patrolId);
+            if (item != null)
+            {
+                db.HSSE_SafetyPatrol.DeleteOnSubmit(item);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/HSSE/Hazard/SpecialPlanService.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 专项施工方案服务
+    /// </summary>
+    public static class SpecialPlanService
+    {
+        /// <summary>
+        /// 获取专项施工方案列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.HSSE_SpecialPlan> GetList(string projectId)
+        {
+            return Funs.DB.HSSE_SpecialPlan.Where(x => x.ProjectId == projectId).ToList();
+        }
+
+        /// <summary>
+        /// 根据主键获取专项施工方案
+        /// </summary>
+        /// <param name="planId">主键</param>
+        /// <returns></returns>
+        public static Model.HSSE_SpecialPlan GetById(string planId)
+        {
+            return Funs.DB.HSSE_SpecialPlan.FirstOrDefault(x => x.PlanId == planId);
+        }
+
+        /// <summary>
+        /// 新增专项施工方案
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Add(Model.HSSE_SpecialPlan item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SpecialPlan newItem = new Model.HSSE_SpecialPlan
+            {
+                PlanId = item.PlanId,
+                ProjectId = item.ProjectId,
+                HazardProjectName = item.HazardProjectName,
+                PlanName = item.PlanName,
+                CompileMan = item.CompileMan,
+                CompileDate = item.CompileDate,
+                UploadFile = item.UploadFile,
+                Remark = item.Remark
+            };
+            db.HSSE_SpecialPlan.InsertOnSubmit(newItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新专项施工方案
+        /// </summary>
+        /// <param name="item">实体</param>
+        public static void Update(Model.HSSE_SpecialPlan item)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SpecialPlan newItem = db.HSSE_SpecialPlan.FirstOrDefault(x => x.PlanId == item.PlanId);
+            if (newItem != null)
+            {
+                newItem.HazardProjectName = item.HazardProjectName;
+                newItem.PlanName = item.PlanName;
+                newItem.CompileMan = item.CompileMan;
+                newItem.CompileDate = item.CompileDate;
+                newItem.UploadFile = item.UploadFile;
+                newItem.Remark = item.Remark;
+                db.SubmitChanges();
+            }
+            else
+            {
+                Add(item);
+            }
+        }
+
+        /// <summary>
+        /// 删除专项施工方案
+        /// </summary>
+        /// <param name="planId">主键</param>
+        public static void Delete(string planId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HSSE_SpecialPlan item = db.HSSE_SpecialPlan.FirstOrDefault(x => x.PlanId == planId);
+            if (item != null)
+            {
+                db.HSSE_SpecialPlan.DeleteOnSubmit(item);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs

@@ -10,7 +10,7 @@ namespace BLL
     {
         public static string ConvertAuditDate(object ConstructSolutionId)
         {
-             var approve=  (from x in Funs.DB.Solution_HSSEConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate !=null   select x.ApproveDate ).FirstOrDefault();
+             var approve=  (from x in Funs.DB.Solution_HSSEConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate !=null   select x.ApproveDate ).FirstOrDefault();
             if (approve != null)
             {
                 return approve.Value.ToString("yyyy-MM-dd");
@@ -20,14 +20,14 @@ namespace BLL
         public static Model.Solution_HSSEConstructSolutionApprove GetSee(string ConstructSolutionId, string userId)
         {
             Model.SGGLDB db = Funs.DB;
-            return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
+            return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
         }
 
         public static void See(string ConstructSolutionId, string userId)
         {
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
-                var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
+                var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
                 if (res != null)
                 {
                     res.ApproveDate = DateTime.Now;
@@ -43,7 +43,7 @@ namespace BLL
         public static List<string> GetUserIdsApprovesBySignType(string ConstructSolutionId, string signType)
         {
             var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId);
-            return (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
+            return (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
         }
 
         public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId)
@@ -100,14 +100,14 @@ namespace BLL
         public static List<Model.Solution_HSSEConstructSolutionApprove> GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state)
         {
             Model.SGGLDB db = Funs.DB;
-            var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
+            var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
             if (reDate == null)
             {
-                return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state select x).ToList();
+                return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state select x).ToList();
             }
             else
             {
-                return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
+                return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
             }
         }
 
@@ -121,7 +121,7 @@ namespace BLL
         {
             Model.SGGLDB db = Funs.DB;
             var res = from x in db.Solution_HSSEConstructSolutionApprove
-                      where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
+                      where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
                       orderby x.ApproveDate
                       select x;
 
@@ -143,7 +143,7 @@ namespace BLL
         {
             Model.SGGLDB db = Funs.DB;
             var res = from x in db.Solution_HSSEConstructSolutionApprove
-                      where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
+                      where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
                       orderby x.ApproveType,x.Edition
                       select x;
 
@@ -223,7 +223,7 @@ namespace BLL
         public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId)
         {
             Model.SGGLDB db = Funs.DB;
-            var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
+            var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId select x).ToList();
             db.Solution_HSSEConstructSolutionApprove.DeleteAllOnSubmit(q);
             db.SubmitChanges();
         }
@@ -235,17 +235,17 @@ namespace BLL
         public static Model.Solution_HSSEConstructSolutionApprove GetConstructSolutionApproveByApproveMan(string ConstructSolutionId, string approveMan)
         {
 
-            return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+            return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
         }
         public static Model.Solution_HSSEConstructSolutionApprove GetConstructSoluAppByApproveMan(string ConstructSolutionId, string approveMan, int edtion)
         {
 
-            return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+            return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
         }
 
         public static Model.Solution_HSSEConstructSolutionApprove GetConstructSolApproveByApproveMan(string ConstructSolutionId, string approveMan)
         {
-            return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+            return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
         }
 
 
@@ -312,7 +312,7 @@ namespace BLL
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
                 var q = from x in db.Solution_HSSEConstructSolutionApprove
-                        where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
+                        where x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
                         orderby x.ApproveDate
                         select new
                         {
@@ -350,7 +350,7 @@ namespace BLL
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
                 var q = from x in db.Solution_HSSEConstructSolutionApprove
-                        where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
+                        where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
                         orderby x.ApproveDate
                         select new
                         {

SGGL/BLL/OpenService/GetDataService.cs

@@ -323,7 +323,7 @@ namespace BLL
 					}
 				}
 			}
-			catch (Exception ex)
+			catch (Exception)
 			{ }
 		}
 
@@ -706,7 +706,7 @@ namespace BLL
 			try
 			{
 				Thread.Sleep(sleepTime);
-            }catch(Exception ex) { }
+            }catch(Exception) { }
 
             //古雷 环境数据
             returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=pcbpa2024&password=pcbpa2024", "GET", "application/json;charset=utf-8");
@@ -798,7 +798,7 @@ namespace BLL
             {
                 Thread.Sleep(sleepTime);
             }
-            catch (Exception ex) { }
+            catch (Exception) { }
             //古雷焚烧 环境数据
             returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=gufs2024&password=gufs2024", "GET", "application/json;charset=utf-8");
             if (!string.IsNullOrEmpty(returndata))
@@ -890,7 +890,7 @@ namespace BLL
             {
                 Thread.Sleep(sleepTime);
             }
-            catch (Exception ex) { }
+            catch (Exception) { }
 
             //天津南港LNG冷能利用 环境数据
             returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=tjng2024&password=tjng2024", "GET", "application/json;charset=utf-8");
@@ -982,7 +982,7 @@ namespace BLL
             {
                 Thread.Sleep(sleepTime);
             }
-            catch (Exception ex) { }
+            catch (Exception) { }
 
             //中煤气化、新增输煤栈桥项目  环境数据
             returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=yltcqh2024&password=yltcqh2024", "GET", "application/json;charset=utf-8");
@@ -1074,7 +1074,7 @@ namespace BLL
             {
                 Thread.Sleep(sleepTime);
             }
-            catch (Exception ex) { }
+            catch (Exception) { }
 
             //中煤全场系统工程  环境数据
             returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=yltcxt2024&password=yltcxt2024", "GET", "application/json;charset=utf-8");
@@ -1167,7 +1167,7 @@ namespace BLL
             {
                 Thread.Sleep(sleepTime);
             }
-            catch (Exception ex) { }
+            catch (Exception) { }
 
 
             //中沙古雷厂前区  环境数据

SGGL/BLL/OpenService/MonitorService.cs

@@ -162,7 +162,7 @@ namespace BLL
                 }
             }
 
-            catch (Exception ex)
+            catch (Exception)
             {
                 ErrLogInfo.WriteLog("出入同步出错!");
             }
@@ -198,7 +198,7 @@ namespace BLL
             {
                 GetDataService.SyncEnvironment();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 ErrLogInfo.WriteLog("环境同步出错!");
             }
@@ -254,7 +254,7 @@ namespace BLL
             try
             {
                 DoSynchData();
-            }catch(Exception ex)
+            }catch(Exception)
             {
 
             }
@@ -342,7 +342,7 @@ namespace BLL
                             weather.WeaNight = j2.wea_night;
                             list.Add(weather);
                         }
-                        catch (Exception ex)
+                        catch (Exception)
                         {
 
                         }
@@ -351,7 +351,7 @@ namespace BLL
                     db.SubmitChanges();
                 }
             }
-            catch (Exception ex) { 
+            catch (Exception) { 
                 }
         }
         #endregion

SGGL/BLL/ProjectData/TeamGroupService.cs

@@ -93,7 +93,7 @@ namespace BLL
                         db.SubmitChanges();
                     }
                 }
-            }catch(System.Exception ex)
+            }catch(System.Exception)
             {
 
             }

SGGL/BLL/SysManage/UserService.cs

@@ -295,7 +295,7 @@ namespace BLL
                     db.SubmitChanges();
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
             }
         }

SGGL/BLL/ZHGL/DataSync/MainSevice.cs

@@ -319,7 +319,7 @@ public class MainSevice
         _hsseData = table;
         return _hsseData;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
                 throw;

SGGL/BLL/ZHGL/DataSync/ServerService.cs

@@ -53,7 +53,7 @@ namespace BLL
                 }
 
             }
-            catch (Exception e)
+            catch (Exception)
             {
             }
 
@@ -95,7 +95,7 @@ namespace BLL
                 responeData.message = returnData.message;
                 return responeData;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
                 throw;

SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs

@@ -173,7 +173,7 @@ namespace BLL
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 if (BLL.Funs.DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
                 {

SGGL/CLAUDE.md

@@ -0,0 +1,40 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+智慧施工管理信息系统（河北安装）：WebForms + ASP.NET Web API，.NET Framework 4.8，SQL Server，LINQ to SQL。解决方案 `SGGL.sln` 在本目录；仓库根是上一级 `SGGL_HBAZ/`，其中的 `AGENTS.md` 记录了更多运维细节，与本文件会同时被加载。
+
+## Commands
+
+构建（`msbuild` 不在 PATH，用 VS2022 的 MSBuild）：
+```
+& 'D:\Development Kit\MVStudio\2022\MSBuild\Current\Bin\MSBuild.exe' 'SGGL.sln' /p:Configuration=Debug
+```
+`/p:Configuration=Release` 同理。
+
+- 打发布包：仓库根 `ReleasePackerALL2022.bat`（aspnet_compiler 预编译 + aspnet_merge 合并 → `SGGLPackFile/`）。
+- 重新生成实体：仓库根 `CreateModel.bat`（SqlMetal 从 SQL2022 实例 / `SGGLDB_HBAZ` 库生成 `Model/Model.cs`）。
+- 无测试项目，无测试命令。
+
+## Architecture
+
+- `FineUIPro.Web/` — WebForms 主站。入口 `Login.aspx`、`index*.aspx`；基类 `common/PageBase.cs`（`Session["CurrUser"]` 鉴权）。业务模块按文件夹组织：BaseInfo、CQMS、HSSE、HJGL、JDGL、PZHGL、SHIYE、SYHSE、SysManage、TaskScheduling、ZHGL、DigData、Door、Notice、OfficeCheck、Person、PersonManage、ProjectData、SubPackManage、Video 等。
+- `BLL/` — 业务逻辑层，业务类为 `public static class XxxService`。核心：`Common/Funs.cs`（全局配置 + LINQ-to-SQL 上下文 `Funs.DB`，类型 `Model.SGGLDB`，按线程 `ManagedThreadId` 缓存实例）；`SQLHelper.cs`（原始 ADO.NET）；`API/` 外部接口；`TaskScheduling/` Quartz 定时任务；`ErrLogInfo.cs`（错误落库）。
+- `Model/` — LINQ to SQL 实体。`Model.cs` 由 SqlMetal 生成（约 14MB，勿手改）；实体前缀 `Sys_`（`Sys_User`、`Sys_Role`、`Sys_ErrLogInfo`）。
+- `WebAPI/` — 经典 ASP.NET Web API（`System.Web.Http`），`Controllers/` 供移动端/第三方调用（材料、人员、人脸、身份证、视频、车辆、用户等）。
+- `SgManager.AI/` — AI 辅助库：百度 OCR/人脸（`IDCardRecognition`、`FaceClass`）、地图、邮件；被 BLL 与 FineUIPro.Web 引用。
+- `FineUIPro/` — 商业 UI 框架 FineUIPro v6.3.0 的 DLL（非源码，勿改）。
+
+## Conventions
+
+- 中文注释；公共方法用 `/// <summary>` XML 注释。
+- 数据访问优先 `Funs.DB`（LINQ to SQL，`InsertOnSubmit`/`SubmitChanges`），复杂 SQL 用 `SQLHelper`。
+- 错误记录走 `ErrLogInfo.WriteLog(...)`；`Global.asax` 的 `Application_Error` 落库 `Sys_ErrLogInfo`。
+- 连接字符串与第三方密钥（含明文密码/API Key）在 `FineUIPro.Web/Web.config` 的 AppSettings 中，`Application_Start` 赋值给 `Funs.*` —— 勿把凭据写进提交内容。
+- WebAPI 响应统一包装 `Model.ResponeData`，action 常用 `[HttpPost]` + `[FromBody]`。
+- `Backup*` 是开发备份目录，不要在其中改代码；`packages/` 被 gitignore（NuGet 还原）。
+
+## 本地运行 / 联调注意
+
+- WebForms 站点：`iisexpress.exe /path:"SGGL\FineUIPro.Web" /port:4528`；WebAPI：`/path:"SGGL\WebAPI" /port:7143`（数据库 `SGGLDB_HBAZ` 在本机 SQL Server）。
+- PowerShell 下用 `curl.exe -d '{"..."}'` 会把 JSON 双引号剥掉导致反序列化失败，须改用 `--data-binary '@body.json'` 文件方式发 JSON body。

SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs

@@ -150,7 +150,15 @@ namespace FineUIPro.Web.AttachFile
             {
                 Grid1.DataSource = GetSourceData();
             }
-            Grid1.DataBind();
+            try
+            {
+
+                Grid1.DataBind();
+            }
+            catch (Exception ex)
+            {
+
+            }
         }
 
         #endregion
@@ -483,44 +491,61 @@ namespace FineUIPro.Web.AttachFile
         /// <returns></returns>
         private JArray GetSourceData()
         {
-            if (Session[sessionName] == null && !string.IsNullOrEmpty(ToKeyId))
+            try
             {
-                Session[sessionName] = new JArray();
-                Model.AttachFile sour = new Model.AttachFile();
-                if (this.MenuId == Const.ProjectPunishNoticeMenuId || this.MenuId == Const.ProjectPunishNoticeStatisticsMenuId)
+                if (Session[sessionName] == null && !string.IsNullOrEmpty(ToKeyId))
                 {
-                    sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId && x.MenuId == this.MenuId);
-                }
-                else
-                {
-                    sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId);
-                }
-
-                if (sour != null)
-                {
-                    string url = sour.AttachUrl.Replace('\\', '/');
-                    List<string> list = Funs.GetStrListByStr(url, ',');
-                    if (list.Count() > 0)
+                    Session[sessionName] = new JArray();
+                    Model.AttachFile sour = new Model.AttachFile();
+                    if (this.MenuId == Const.ProjectPunishNoticeMenuId || this.MenuId == Const.ProjectPunishNoticeStatisticsMenuId)
                     {
-                        int i = 0;
-                        foreach (var item in list)
+                        sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId && x.MenuId == this.MenuId);
+                    }
+                    else
+                    {
+                        sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId);
+                    }
+
+                    if (sour != null && !string.IsNullOrEmpty(sour.AttachUrl))
+                    {
+                        string url = sour.AttachUrl.Replace('\\', '/');
+                        List<string> list = Funs.GetStrListByStr(url, ',');
+                        if (list.Count() > 0)
                         {
-                            string atturl = Funs.RootPath + item.Replace(';', ' ').Trim();
-                            if (File.Exists(atturl))
+                            int i = 0;
+                            foreach (var item in list)
                             {
-                                i += 1;
-                                break;
+                                string relative = item.Replace(';', ' ').Trim();
+                                string atturl = Funs.RootPath + relative;
+                                if (!File.Exists(atturl))
+                                {
+                                    string localRoot = System.Configuration.ConfigurationManager.AppSettings["localRoot"];
+                                    if (!string.IsNullOrEmpty(localRoot))
+                                    {
+                                        atturl = localRoot + relative;
+                                    }
+                                }
+                                if (File.Exists(atturl))
+                                {
+                                    i += 1;
+                                    break;
+                                }
+                            }
+                            if (i > 0 && !string.IsNullOrEmpty(sour.AttachSource))
+                            {
+                                Session[sessionName] = JArray.Parse(sour.AttachSource);
                             }
-                        }
-                        if (i > 0)
-                        {
-                            Session[sessionName] = JArray.Parse(sour.AttachSource);
                         }
                     }
                 }
-            }
 
-            return (JArray)Session[sessionName];
+                return (JArray)Session[sessionName];
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog("webuploader GetSourceData 异常!", ex);
+                throw;
+            }
         }
 
         /// <summary>

SGGL/FineUIPro.Web/BaseInfo/BaseFactory.aspx.cs

@@ -213,7 +213,7 @@ namespace FineUIPro.Web.BaseInfo
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs

@@ -466,7 +466,6 @@ namespace FineUIPro.Web.CQMS.Check
             Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
             if (bookmarkWorkArea != null)
             {
-                string option = "";
                 var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checkControl.UnitWorkId);
                 if (unitWork != null)
                 {
@@ -724,7 +723,7 @@ namespace FineUIPro.Web.CQMS.Check
                 if (bookmarkSendDate != null)
                 {
                    
-                    if (checks.CheckDate.HasValue != null)
+                    if (checks.CheckDate.HasValue)
                     {
                         bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
 
@@ -751,7 +750,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"];
                 if (bookmarkWorkArea != null)
                 {
-                    string option = "";
                     var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
                     if (unitWork != null)
                     {
@@ -761,7 +759,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"];
                 if (bookmarkProblemType != null)
                 {
-                    string option = "";
                     var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
                     if (questionType != null)
                     {
@@ -792,7 +789,7 @@ namespace FineUIPro.Web.CQMS.Check
                 if (bookmarkCheckDate != null)
                 {
 
-                    if (checks.CheckDate.HasValue != null)
+                    if (checks.CheckDate.HasValue)
                     {
                         bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
 

SGGL/FineUIPro.Web/CQMS/Check/CheckFineListEdit.aspx.cs

@@ -279,7 +279,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
                 if (bookmarkWorkArea != null)
                 {
-                    string option = "";
                     var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checkControl.UnitWorkId);
                     if (unitWork != null)
                     {

SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs

@@ -244,7 +244,7 @@ namespace FineUIPro.Web.CQMS.Check
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        public static string GetGridTableHtml(Grid grid)
+        public new static string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
@@ -793,7 +793,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
                 if (bookmarkWorkArea != null)
                 {
-                    string option = "";
                     var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
                     if (unitWork != null)
                     {
@@ -803,7 +802,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkProblemType = doc.Range.Bookmarks["ProblemType"];
                 if (bookmarkProblemType != null)
                 {
-                    string option = "";
                     var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
                     if (questionType != null)
                     {
@@ -1066,7 +1064,7 @@ namespace FineUIPro.Web.CQMS.Check
                 if (bookmarkSendDate != null)
                 {
                    
-                    if (checks.CheckDate.HasValue != null)
+                    if (checks.CheckDate.HasValue)
                     {
                         bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
 
@@ -1095,7 +1093,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"];
                 if (bookmarkWorkArea != null)
                 {
-                    string option = "";
                     var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
                     if (unitWork != null)
                     {
@@ -1105,7 +1102,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"];
                 if (bookmarkProblemType != null)
                 {
-                    string option = "";
                     var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
                     if (questionType != null)
                     {
@@ -1136,7 +1132,7 @@ namespace FineUIPro.Web.CQMS.Check
                 if (bookmarkCheckDate != null)
                 {
 
-                    if (checks.CheckDate.HasValue != null)
+                    if (checks.CheckDate.HasValue)
                     {
                         bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
 

SGGL/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs

@@ -132,7 +132,7 @@ namespace FineUIPro.Web.CQMS.Check {
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckIn.aspx.cs

@@ -200,7 +200,7 @@ namespace FineUIPro.Web.CQMS.WBS
                         specialDataIn.CheckTime =  DateTime.Parse(pds.Rows[i][2].ToString().Trim());
 
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             result += "第" + (i + 2).ToString() + "行," + "检查日期" + "," + "格式错误！" + "|";
                         }
@@ -304,7 +304,7 @@ namespace FineUIPro.Web.CQMS.WBS
                             specialDataIn.LimitedTime = DateTime.Parse(pds.Rows[i][15].ToString().Trim());
 
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             result += "第" + (i + 2).ToString() + "行," + "现时日期" + "," + "格式错误！" + "|";
                         }

SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs

@@ -682,7 +682,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
                 if (bookmarkWorkArea != null)
                 {
-                    string option = "";
                     var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
                     if (unitWork != null)
                     {
@@ -692,7 +691,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkProblemType = doc.Range.Bookmarks["ProblemType"];
                 if (bookmarkProblemType != null)
                 {
-                    string option = "";
                     var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
                     if (questionType != null)
                     {
@@ -955,7 +953,7 @@ namespace FineUIPro.Web.CQMS.Check
                 if (bookmarkSendDate != null)
                 {
                    
-                    if (checks.CheckDate.HasValue != null)
+                    if (checks.CheckDate.HasValue)
                     {
                         bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
 
@@ -984,7 +982,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"];
                 if (bookmarkWorkArea != null)
                 {
-                    string option = "";
                     var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
                     if (unitWork != null)
                     {
@@ -994,7 +991,6 @@ namespace FineUIPro.Web.CQMS.Check
                 Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"];
                 if (bookmarkProblemType != null)
                 {
-                    string option = "";
                     var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
                     if (questionType != null)
                     {
@@ -1025,7 +1021,7 @@ namespace FineUIPro.Web.CQMS.Check
                 if (bookmarkCheckDate != null)
                 {
 
-                    if (checks.CheckDate.HasValue != null)
+                    if (checks.CheckDate.HasValue)
                     {
                         bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
 

SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs

@@ -1604,7 +1604,7 @@ namespace FineUIPro.Web.CQMS.ConstructionLog
                     picture.Resize();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }

SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs

@@ -268,7 +268,7 @@ namespace FineUIPro.Web.CQMS.Foreign
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Foreign/ForeignWBSOut.aspx.cs

@@ -75,7 +75,7 @@ namespace FineUIPro.Web.CQMS.Foreign
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Foreign/ITPList.aspx.cs

@@ -237,7 +237,7 @@ namespace FineUIPro.Web.CQMS.Foreign
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Foreign/ITPListProject.aspx.cs

@@ -285,7 +285,7 @@ namespace FineUIPro.Web.CQMS.Foreign
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Information/CostReportEdit.aspx.cs

@@ -214,7 +214,6 @@ namespace FineUIPro.Web.CQMS.Information
         private void OutputSummaryData()
         {
             decimal totalPlanCost = 0;
-            int i = 0;
             JArray mergedData = Grid1.GetMergedData();
             if (mergedData.Count > 0)
             {

SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs

@@ -412,7 +412,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs

@@ -214,7 +214,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs

@@ -161,7 +161,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs

@@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs

@@ -187,7 +187,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         }
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
-            bool changeAudit = true;
             if (this.drpUnit.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("请先选择施工分包商！", MessageBoxIcon.Warning);
@@ -262,7 +261,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 }
                 if (oldInspectionManagement.AuditMan != inspectionManagement.AuditMan)
                 {
-                    changeAudit = true;
                     inspectionManagement.Status = "2";
                 }
 

SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs

@@ -748,7 +748,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        public static string GetGridTableHtml(Grid grid)
+        public new static string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs

@@ -1595,7 +1595,7 @@ namespace FineUIPro.Web.CQMS.Solution
 
             var ID = gvApprove.DataKeys[rowIndex][0];
 
-            var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == ID).FirstOrDefault();
+            var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == (string)ID).FirstOrDefault();
             if (approve != null)
             {
                 approve.ApproveDate = null;

SGGL/FineUIPro.Web/CQMS/WBS/ProjectQuality.aspx.cs

@@ -14,10 +14,6 @@ namespace FineUIPro.Web.CQMS.WBS
     public partial class ProjectQuality : PageBase
     {
         #region 定义变量
-        /// <summary>
-        /// 上传预设的虚拟路径
-        /// </summary>
-        private string initPath = Const.ExcelUrl;
 
         #endregion
         protected void Page_Load(object sender, EventArgs e)

SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs

@@ -117,7 +117,6 @@ namespace FineUIPro.Web.CQMS.WBS
                     // 第二步：创建新数据行
                     NPOI.SS.UserModel.ISheet sheet = workbook.GetSheet("Sheet1");
                     NPOI.SS.UserModel.IRow row1 = sheet.CreateRow(1);
-                    NPOI.SS.UserModel.ICell cell2;
                     // 添加测试数据
                     //cell2 = row1.CreateCell(14);
                     //cell2.CellStyle = cellStyle0;

SGGL/FineUIPro.Web/ErrLog.txt

@@ -1,249 +0,0 @@
-
-错误信息开始=====>
-错误类型:FileLoadException
-错误信息:未能加载文件或程序集“FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040)
-错误堆栈:
-   在 System.Signature.GetSignature(Void* pCorSig, Int32 cCorSig, RuntimeFieldHandleInternal fieldHandle, IRuntimeMethodInfo methodHandle, RuntimeType declaringType)
-   在 System.Signature..ctor(IRuntimeFieldInfo fieldHandle, RuntimeType declaringType)
-   在 System.Reflection.RtFieldInfo.get_FieldType()
-   在 System.Web.UI.Util.GetNonPrivateFieldType(Type classType, String fieldName)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
-   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
-   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
-   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
-   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
-   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
-出错时间:05/12/2026 17:51:15
-出错文件:http://localhost:4528/indexProject.aspx
-IP地址:::1
-
-出错时间:05/12/2026 17:51:16
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 17:52:59
-出错文件:http://localhost:4528/indexProject.aspx
-IP地址:::1
-
-出错时间:05/12/2026 17:52:59
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 17:53:36
-出错文件:http://localhost:4528/indexProject.aspx
-IP地址:::1
-
-出错时间:05/12/2026 17:53:36
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 17:54:25
-出错文件:http://localhost:4528/indexProject.aspx
-IP地址:::1
-
-出错时间:05/12/2026 17:54:25
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:04:03
-出错文件:http://localhost:4528/indexProject.aspx?projectId=fe0f4acf-c173-4ee9-bed2-4fa05a700a96
-IP地址:::1
-
-出错时间:05/12/2026 18:04:03
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:05:08
-出错文件:http://localhost:4528/indexProject.aspx
-IP地址:::1
-
-出错时间:05/12/2026 18:05:08
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:07:59
-出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=aa38733a-68e3-4f81-be8b-36c4b2c17d0e
-IP地址:::1
-操作人员:JT
-
-出错时间:05/12/2026 18:07:59
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:08:14
-出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=aa38733a-68e3-4f81-be8b-36c4b2c17d0e
-IP地址:::1
-操作人员:JT
-
-出错时间:05/12/2026 18:08:14
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:09:02
-出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=aa38733a-68e3-4f81-be8b-36c4b2c17d0e
-IP地址:::1
-操作人员:JT
-
-出错时间:05/12/2026 18:09:02
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:10:33
-出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=3049dcc7-0557-48c5-a0c4-77967c50bc19
-IP地址:::1
-操作人员:JT
-
-出错时间:05/12/2026 18:10:33
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:10:58
-出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=3049dcc7-0557-48c5-a0c4-77967c50bc19
-IP地址:::1
-操作人员:JT
-
-出错时间:05/12/2026 18:10:58
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/12/2026 18:13:39
-出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=3049dcc7-0557-48c5-a0c4-77967c50bc19
-IP地址:::1
-操作人员:JT
-
-出错时间:05/12/2026 18:13:39
-

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1969,6 +1969,19 @@
     <Content Include="HSSE\FinalFileManage\OwnerFinalFile.aspx" />
     <Content Include="HSSE\FinalFileManage\OwnerFinalFileEdit.aspx" />
     <Content Include="HSSE\FinalFileManage\OwnerFinalFileView.aspx" />
+    <Content Include="HSSE\HazardousMG\HazardProject.aspx" />
+    <Content Include="HSSE\HazardousMG\HazardProjectEdit.aspx" />
+    <Content Include="HSSE\HazardousMG\HazardProjectDataIn.aspx" />
+    <Content Include="HSSE\HazardousMG\RiskControlList.aspx" />
+    <Content Include="HSSE\HazardousMG\RiskControlListEdit.aspx" />
+    <Content Include="HSSE\HazardousMG\SafetyAcceptance.aspx" />
+    <Content Include="HSSE\HazardousMG\SafetyAcceptanceEdit.aspx" />
+    <Content Include="HSSE\HazardousMG\SafetyDisclosure.aspx" />
+    <Content Include="HSSE\HazardousMG\SafetyDisclosureEdit.aspx" />
+    <Content Include="HSSE\HazardousMG\SafetyPatrol.aspx" />
+    <Content Include="HSSE\HazardousMG\SafetyPatrolEdit.aspx" />
+    <Content Include="HSSE\HazardousMG\SpecialPlan.aspx" />
+    <Content Include="HSSE\HazardousMG\SpecialPlanEdit.aspx" />
     <Content Include="HSSE\Hazard\ConstructionRisk.aspx" />
     <Content Include="HSSE\Hazard\ConstructionRiskCheckSee.aspx" />
     <Content Include="HSSE\Hazard\ConstructionRiskControlCheck.aspx" />
@@ -2216,6 +2229,8 @@
     <Content Include="HSSE\Perfomance\PersonPerfomance.aspx" />
     <Content Include="HSSE\Perfomance\PersonPerfomanceEdit.aspx" />
     <Content Include="HSSE\Perfomance\PersonPerfomanceView.aspx" />
+    <Content Include="HSSE\PowerMG\PowerBox.aspx" />
+    <Content Include="HSSE\PowerMG\PowerBoxEdit.aspx" />
     <Content Include="HSSE\QualityAudit\EquipmentPersonQuality.aspx" />
     <Content Include="HSSE\QualityAudit\EquipmentPersonQualityEdit.aspx" />
     <Content Include="HSSE\QualityAudit\EquipmentQuality.aspx" />
@@ -13398,6 +13413,97 @@
     <Compile Include="HSSE\FinalFileManage\OwnerFinalFileView.aspx.designer.cs">
       <DependentUpon>OwnerFinalFileView.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\HazardousMG\HazardProject.aspx.cs">
+      <DependentUpon>HazardProject.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\HazardProject.aspx.designer.cs">
+      <DependentUpon>HazardProject.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\HazardProjectEdit.aspx.cs">
+      <DependentUpon>HazardProjectEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\HazardProjectEdit.aspx.designer.cs">
+      <DependentUpon>HazardProjectEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\HazardProjectDataIn.aspx.cs">
+      <DependentUpon>HazardProjectDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\HazardProjectDataIn.aspx.designer.cs">
+      <DependentUpon>HazardProjectDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\RiskControlList.aspx.cs">
+      <DependentUpon>RiskControlList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\RiskControlList.aspx.designer.cs">
+      <DependentUpon>RiskControlList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\RiskControlListEdit.aspx.cs">
+      <DependentUpon>RiskControlListEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\RiskControlListEdit.aspx.designer.cs">
+      <DependentUpon>RiskControlListEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyAcceptance.aspx.cs">
+      <DependentUpon>SafetyAcceptance.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyAcceptance.aspx.designer.cs">
+      <DependentUpon>SafetyAcceptance.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyAcceptanceEdit.aspx.cs">
+      <DependentUpon>SafetyAcceptanceEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyAcceptanceEdit.aspx.designer.cs">
+      <DependentUpon>SafetyAcceptanceEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyDisclosure.aspx.cs">
+      <DependentUpon>SafetyDisclosure.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyDisclosure.aspx.designer.cs">
+      <DependentUpon>SafetyDisclosure.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyDisclosureEdit.aspx.cs">
+      <DependentUpon>SafetyDisclosureEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyDisclosureEdit.aspx.designer.cs">
+      <DependentUpon>SafetyDisclosureEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyPatrol.aspx.cs">
+      <DependentUpon>SafetyPatrol.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyPatrol.aspx.designer.cs">
+      <DependentUpon>SafetyPatrol.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyPatrolEdit.aspx.cs">
+      <DependentUpon>SafetyPatrolEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SafetyPatrolEdit.aspx.designer.cs">
+      <DependentUpon>SafetyPatrolEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SpecialPlan.aspx.cs">
+      <DependentUpon>SpecialPlan.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SpecialPlan.aspx.designer.cs">
+      <DependentUpon>SpecialPlan.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SpecialPlanEdit.aspx.cs">
+      <DependentUpon>SpecialPlanEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\HazardousMG\SpecialPlanEdit.aspx.designer.cs">
+      <DependentUpon>SpecialPlanEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\Hazard\ConstructionRisk.aspx.cs">
       <DependentUpon>ConstructionRisk.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15127,6 +15233,19 @@
     <Compile Include="HSSE\Perfomance\PersonPerfomanceView.aspx.designer.cs">
       <DependentUpon>PersonPerfomanceView.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\PowerMG\PowerBox.aspx.cs">
+      <DependentUpon>PowerBox.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\PowerMG\PowerBox.aspx.designer.cs">
+      <DependentUpon>PowerBox.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\PowerMG\PowerBoxEdit.aspx.cs">
+      <DependentUpon>PowerBoxEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\PowerMG\PowerBoxEdit.aspx.designer.cs">
+      <DependentUpon>PowerBoxEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\QualityAudit\EquipmentPersonQuality.aspx.cs">
       <DependentUpon>EquipmentPersonQuality.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;

SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;

SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx.cs

@@ -397,7 +397,6 @@ namespace FineUIPro.Web.HJGL.CheckManage
             var dataInTemp = from x in Funs.DB.HJGL_CheckImportTemp
                              where x.ProjectId == LoginProjectId && x.UserId == UserId
                              select x;
-            int okCount = 0;
 
             int ir = dataInTemp.Count();
             string erreMessage = "";
@@ -846,7 +845,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                                     {
                                         checkitem.CHT_TotalFilm = int.Parse(allCheck.Value14);
                                     }
-                                    catch (Exception e) { }
+                                    catch (Exception) { }
                                 }
                                 if (!string.IsNullOrEmpty(allCheck.Value15))
                                 {
@@ -854,7 +853,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                                     {
                                         checkitem.CHT_PassFilm = int.Parse(allCheck.Value15);
                                     }
-                                    catch (Exception e) { }
+                                    catch (Exception) { }
                                 }
                                 checkitem.CHT_CheckResult = allCheck.Value16;
                                 //checkitem.CHT_CheckNo = allCheck.Value8; 
@@ -873,7 +872,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                                     {
                                         checkitem.DefectLength = decimal.Parse(allCheck.Value19);
                                     }
-                                    catch (Exception e) { }
+                                    catch (Exception) { }
                                 }
                                 if (!string.IsNullOrEmpty(joint.Extend_Length))
                                 {
@@ -921,7 +920,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 this.BindGrid();
 
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 ErrLogInfo.WriteLog("新增检测记录错误");
             }
@@ -949,7 +948,6 @@ namespace FineUIPro.Web.HJGL.CheckManage
             var dataInTemp = from x in Funs.DB.HJGL_CheckImportTemp
                              where x.ProjectId == LoginProjectId && x.UserId == UserId
                              select x;
-            int okCount = 0;
 
             int ir = dataInTemp.Count();
             string erreMessage = "";
@@ -1232,7 +1230,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
 								{
 									checkitem.CHT_TotalFilm = int.Parse(allCheck.Value14);
 								}
-								catch (Exception e) { }
+								catch (Exception) { }
 							}
 							if (!string.IsNullOrEmpty(allCheck.Value15))
 							{
@@ -1240,7 +1238,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
 								{
 									checkitem.CHT_PassFilm = int.Parse(allCheck.Value15);
 								}
-								catch (Exception e) { }
+								catch (Exception) { }
 							}
 							checkitem.CHT_CheckResult = allCheck.Value16;
 							//checkitem.CHT_CheckNo = allCheck.Value8; 
@@ -1259,7 +1257,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
 								{
 									checkitem.DefectLength = decimal.Parse(allCheck.Value19);
 								}
-								catch (Exception e) { }
+								catch (Exception) { }
 							}
 							if (!string.IsNullOrEmpty(joint.Extend_Length))
 							{
@@ -1267,7 +1265,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
 								{
 									checkitem.ExtendingRice = Decimal.Parse(joint.Extend_Length);
 								}
-								catch (Exception e) { }
+								catch (Exception) { }
 							}
 							checkitem.Defects_Definition = allCheck.Value17;
 							if (!hasitem)

SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageList.aspx.cs

@@ -176,7 +176,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             grid.PageSize = this.Grid1.RecordCount;

SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegistEditNew.aspx.cs

@@ -26,7 +26,6 @@ namespace FineUIPro.Web.HJGL.MaterialManage
                 ViewState["EMaterialRegistId"] = value;
             }
         }
-        private bool AppendToEnd = false;
         #endregion
 
         #region 加载页面

SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBackRecovery.aspx.cs

@@ -398,7 +398,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             this.Grid1.PageSize = 10000;
             BindGrid();

SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordEditNew.aspx.cs

@@ -38,7 +38,6 @@ namespace FineUIPro.Web.HJGL.MaterialManage
             }
         }
 
-        private bool AppendToEnd = false;
         #endregion
 
         #region 加载页面

SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx.cs

@@ -396,7 +396,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             this.Grid1.PageSize = 10000;
             BindGrid();

SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs

@@ -396,7 +396,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             this.Grid1.PageSize = 10000;
             BindGrid();

SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeSecondaryBakeRecordEditNew.aspx.cs

@@ -38,7 +38,6 @@ namespace FineUIPro.Web.HJGL.MaterialManage
             }
         }
 
-        private bool AppendToEnd = false;
         #endregion
 
         #region 加载页面

SGGL/FineUIPro.Web/HJGL/MaterialManage/StockSelect.aspx.cs

@@ -198,7 +198,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldMatStatistics.aspx.cs

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldUseAmount.aspx.cs

@@ -149,7 +149,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs

@@ -381,7 +381,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
 
             if (idcard != null)
             {
-                var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == idcard );
+                var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == (string)idcard );
                 if (p != null&& p.InTime.HasValue)
                 {
                     inTime= p.InTime.Value.ToString("yyyy-MM-dd");
@@ -395,7 +395,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
 
             if (idcard != null)
             {
-                var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == idcard);
+                var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == (string)idcard);
                 if (p != null && p.OutTime.HasValue)
                 {
                     inTime = p.OutTime.Value.ToString("yyyy-MM-dd");
@@ -470,7 +470,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageIn.aspx.cs

@@ -266,7 +266,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                         try
                         {
                             DateTime dateValue = DateTime.Parse(col6);
-                        } catch (Exception e)
+                        } catch (Exception)
                         {
                             result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col6 + "]错误！" + "|";
                         }
@@ -282,7 +282,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                         {
                             DateTime dateValue = DateTime.Parse(col7);
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             result += "第" + (i + 2).ToString() + "行," + "有效日期" + "," + "[" + col7 + "]错误！" + "|";
                         }

SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs

@@ -355,7 +355,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             grid.PageSize = this.Grid1.RecordCount;

SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageAudit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;

SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
@@ -863,7 +862,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
                                 this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code) + "K";
                             }
                         }
-                        catch (Exception ee) { }
+                        catch (Exception) { }
                     }
                 }
                 else
@@ -881,7 +880,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
                             string code = trustUnit.UnitCode + "-" + iso.ISO_IsoNo + "-" + NDTMethod.DetectionTypeCode + "-";
                             this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code) + "K";
                         }
-                        catch (Exception ee) { }
+                        catch (Exception) { }
                     }
                 }
             }
@@ -2454,7 +2453,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
 
                                 }
                             }
-                            catch (Exception ee) { }
+                            catch (Exception) { }
                         }
                     }
                     else
@@ -2484,7 +2483,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
                                     }
                                 }
                             }
-                            catch (Exception ee) { }
+                            catch (Exception) { }
                         }
                     }
                 }

SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageImport.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
@@ -1190,7 +1189,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                 {
                                     row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                                 }
-                                catch (Exception ex)
+                                catch (Exception)
                                 {
                                     row["index"] = 0;
                                 }
@@ -1348,24 +1347,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot1 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic1 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot3 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1381,24 +1380,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot2 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic2 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot4 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1469,24 +1468,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot1 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic1 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot3 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1502,24 +1501,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot2 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic2 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot4 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1589,24 +1588,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot1 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic1 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot3 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1622,24 +1621,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot2 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic2 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot4 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1707,24 +1706,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot1 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic1 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot3 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1740,24 +1739,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot2 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic2 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot4 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1825,24 +1824,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot1 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic1 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot3 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 
@@ -1858,24 +1857,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                     {
                                                         jot2 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic2 += int.Parse(row["PassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                                 case "不合格":
                                                     try
                                                     {
                                                         jot4 += int.Parse(row["jotNum"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     try
                                                     {
                                                         pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                     }
-                                                    catch (Exception ee) { }
+                                                    catch (Exception) { }
                                                     break;
                                             }
 

SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs

@@ -753,24 +753,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot1 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic1 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot3 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -786,24 +786,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot2 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic2 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot4 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -874,24 +874,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot1 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic1 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot3 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -907,24 +907,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot2 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic2 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot4 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -994,24 +994,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot1 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic1 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot3 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1027,24 +1027,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot2 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic2 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot4 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1112,24 +1112,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot1 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic1 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot3 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1145,24 +1145,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot2 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic2 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot4 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1230,24 +1230,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot1 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic1 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot3 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1263,24 +1263,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot2 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic2 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot4 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1348,24 +1348,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot1 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic1 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot3 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic3 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 
@@ -1381,24 +1381,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
                                                                 {
                                                                     jot2 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic2 += int.Parse(row["PassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                             case "不合格":
                                                                 try
                                                                 {
                                                                     jot4 += int.Parse(row["jotNum"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 try
                                                                 {
                                                                     pic4 += int.Parse(row["NoPassFilm"].ToString());
                                                                 }
-                                                                catch (Exception ee) { }
+                                                                catch (Exception) { }
                                                                 break;
                                                         }
 

SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs

@@ -221,7 +221,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
                     {
                         row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
 
                     }

SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageAudit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;

SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;

SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageSet.aspx.cs

@@ -141,7 +141,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
                                     this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code);
                                 }
                             }
-                            catch (Exception ee) { }
+                            catch (Exception) { }
                         }
                     }
                     else
@@ -201,7 +201,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
                                           this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code);
                                     }
                             }
-                            catch (Exception ee) { }
+                            catch (Exception) { }
                         }
                     }
 
@@ -257,7 +257,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
             {
                 trust.CH_TrustUnit = this.drpCH_TrustUnit.SelectedValue;
             }
-            if (this.drpCH_NDTMethod.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCH_NDTMethod.SelectedValue)) ;
+            if (this.drpCH_NDTMethod.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCH_NDTMethod.SelectedValue))
             {
                 trust.CH_NDTMethod = this.drpCH_NDTMethod.SelectedValue;
             }

SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
@@ -376,7 +375,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 {
                     row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     row["index"] = 0;
                 }
@@ -704,7 +703,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         {
                             row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                         }
-                        catch (Exception ex)
+                        catch (Exception)
                         {
                             row["index"] = 0;
                         }

SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx.cs

@@ -110,7 +110,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     {
                         row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
                         row["index"] = 0;
                     }
@@ -185,7 +185,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </summary>
         /// <param name="grid"></param>
         /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
+        private new string GetGridTableHtml(Grid grid)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.cs

@@ -738,10 +738,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (isoId != null)
             {
                 var jotCount = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == isoId.ToString() select x).Count();
-                if (jotCount != null)
-                {
-                    return jotCount.ToString();
-                }
+                return jotCount.ToString();
             }
             return null;
         }

SGGL/FineUIPro.Web/HJGL/WeldingManage/PmiMaterialTemplate.aspx.cs

@@ -409,11 +409,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     return;
                 }
 
-                bool isShow = true;
-                if (Grid1.SelectedRowIndexArray.Length > 1)
-                {
-                    isShow = false;
-                }
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();

SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         this.txtPointID.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3ByProjectPrefix", "dbo.BO_Point", "PW_PointNo", this.CurrUser.LoginProjectId, date + "-");
 
                     }
-                    catch (Exception ee) { }
+                    catch (Exception) { }
                 }
                 else
                 {
@@ -421,7 +421,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         this.txtPointID.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3ByProjectPrefix", "dbo.BO_Point", "PW_PointNo", this.CurrUser.LoginProjectId, date + "-");
 
                     }
-                    catch (Exception ee) { }
+                    catch (Exception) { }
                 }
                 else
                 {

SGGL/FineUIPro.Web/HJGL/WeldingManage/PointShowSearch.aspx.cs

@@ -260,7 +260,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 {
                     cbJOTDia.Checked = false;
                 }
-            } catch (Exception ex)  { }
+            } catch (Exception)  { }
 
             BindGrid(isoId);
             //未点口的焊工
@@ -325,7 +325,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     {
                         row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
                         
                     }

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs

@@ -322,7 +322,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         {
                             row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", ""));
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             row["index"] = 0;
                         }