diff --git a/SGGL/BLL/CQMS/DataBase/ConstructionStandardListProjectService.cs b/SGGL/BLL/CQMS/DataBase/ConstructionStandardListProjectService.cs
index 7d78157..4172350 100644
--- a/SGGL/BLL/CQMS/DataBase/ConstructionStandardListProjectService.cs
+++ b/SGGL/BLL/CQMS/DataBase/ConstructionStandardListProjectService.cs
@@ -120,6 +120,20 @@ namespace BLL
Funs.DB.SubmitChanges();
}
}
+ ///
+ /// 根据项目Id删除项目用户信息
+ ///
+ ///
+ public static void DeleteAllCQMS_Law_ConstructionStandardListByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.CQMS_Law_ConstructionStandardListProject where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.CQMS_Law_ConstructionStandardListProject.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
///
/// 根据项目ID删除所有标准规范
diff --git a/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs b/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs
index 80a9bcc..01c8e4d 100644
--- a/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs
+++ b/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs
@@ -9,7 +9,7 @@ namespace BLL
{
public class DataTypeProjectService
{
- public static Model.CNPCDB db = Funs.DB;
+ //public static Model.CNPCDB db = Funs.DB;
///
/// 记录数
@@ -23,7 +23,7 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable qq = from x in db.DataBase_DataTypeProject orderby x.SortIndex select x;
+ private static IQueryable qq = from x in Funs.DB.DataBase_DataTypeProject orderby x.SortIndex select x;
///
/// 获取项目列表
@@ -129,6 +129,20 @@ namespace BLL
db.DataBase_DataTypeProject.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
+ ///
+ /// 根据项目Id删除所有对应资料库类别信息
+ ///
+ ///
+ public static void DeleteAllDataTypeProjectByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.DataBase_DataTypeProject where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.DataBase_DataTypeProject.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
///
/// 获取施工资料库类别项
diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
index 0993258..a8e0752 100644
--- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
+++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
@@ -319,6 +319,19 @@ namespace BLL
db.SubmitChanges();
}
}
+ ///
+ /// 根据项目Id删除所有对应分项信息
+ ///
+ ///
+ public static void DeleteAllBreakdownByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.WBS_BreakdownProject where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.WBS_BreakdownProject.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
///
/// 根据一个单位工程信息删除所有对应分项信息
diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
index 138636e..7b3f84e 100644
--- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
+++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
@@ -128,6 +128,19 @@ namespace BLL
db.SubmitChanges();
}
}
+ ///
+ /// 根据项目Id删除所有分部/子分部信息
+ ///
+ ///
+ public static void DeleteAllDivisionProjectByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.WBS_DivisionProject where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.WBS_DivisionProject.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
///
/// 获取施工分部/子分部项
diff --git a/SGGL/BLL/ProjectData/ProjectUserService.cs b/SGGL/BLL/ProjectData/ProjectUserService.cs
index 474c977..2d9166d 100644
--- a/SGGL/BLL/ProjectData/ProjectUserService.cs
+++ b/SGGL/BLL/ProjectData/ProjectUserService.cs
@@ -119,6 +119,20 @@
db.SubmitChanges();
}
}
+ ///
+ /// 根据项目Id删除项目用户信息
+ ///
+ ///
+ public static void DeleteAllProjectUserByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.Project_ProjectUser where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.Project_ProjectUser.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
///
///根据项目id集合获取对应项目的所有项目用户
diff --git a/SGGL/BLL/ProjectData/Project_InstallationService.cs b/SGGL/BLL/ProjectData/Project_InstallationService.cs
index 0c88921..82ed2d5 100644
--- a/SGGL/BLL/ProjectData/Project_InstallationService.cs
+++ b/SGGL/BLL/ProjectData/Project_InstallationService.cs
@@ -142,6 +142,20 @@ namespace BLL
}
}
+ ///
+ /// 根据项目Id删除装置
+ ///
+ ///
+ public static void DeleteProjectInstallationByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.Project_Installation where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.Project_Installation.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
///
/// 获取装置/单元名称项
///
diff --git a/SGGL/BLL/ProjectData/TeamGroupService.cs b/SGGL/BLL/ProjectData/TeamGroupService.cs
index 4d70f40..26545cd 100644
--- a/SGGL/BLL/ProjectData/TeamGroupService.cs
+++ b/SGGL/BLL/ProjectData/TeamGroupService.cs
@@ -90,6 +90,20 @@ namespace BLL
db.SubmitChanges();
}
}
+ ///
+ /// 根据项目Id删除班组信息
+ ///
+ ///
+ public static void DeleteAllTeamGroupByProjectId(string projectId)
+ {
+ var dellist = from x in Funs.DB.ProjectData_TeamGroup where x.ProjectId == projectId select x;
+ if (dellist.Count() > 0)
+ {
+ Funs.DB.ProjectData_TeamGroup.DeleteAllOnSubmit(dellist);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
///
/// 获取班组人数
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
index 70d0c9e..316f0be 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
@@ -111,8 +111,15 @@ namespace FineUIPro.Web.ProjectData
if (project != null)
{
BLL.LogService.DeleteLog(rowID);
+ BLL.Project_InstallationService.DeleteProjectInstallationByProjectId(rowID);
+ BLL.DataTypeProjectService.DeleteAllDataTypeProjectByProjectId(rowID);
+ BLL.BreakdownProjectService.DeleteAllBreakdownByProjectId(rowID);
+ BLL.DivisionProjectService.DeleteAllDivisionProjectByProjectId(rowID);
//BLL.ReportRemindService.DeleteReportRemindByProjectId(rowID);
- //BLL.ProjectUnitService.DeleteProjectUnitByProjectId(rowID);
+ BLL.ProjectUnitService.DeleteProjectUnitByProjectId(rowID);
+ BLL.TeamGroupService.DeleteAllTeamGroupByProjectId(rowID);
+ BLL.ProjectUserService.DeleteAllProjectUserByProjectId(rowID);
+ BLL.ConstructionStandardListProjectService.DeleteAllCQMS_Law_ConstructionStandardListByProjectId(rowID);
BLL.ProjectService.DeleteProject(rowID);
}
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
index 4967af3..4d7d5f0 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
@@ -283,8 +283,8 @@ namespace FineUIPro.Web.ProjectData
this.ProjectId = project.ProjectId;
ProjectService.AddProject(project);
- // 初始化焊接环境变量设置
- BLL.Project_SysSetService.InsertHjglInit(project.ProjectId);
+ //// 初始化焊接环境变量设置
+ //BLL.Project_SysSetService.InsertHjglInit(project.ProjectId);
LogService.AddSys_Log(this.CurrUser, project.ProjectCode, project.ProjectId, BLL.Const.ProjectSetMenuId, BLL.Const.BtnAdd);
}
else
@@ -301,9 +301,9 @@ namespace FineUIPro.Web.ProjectData
this.SetProjectManager(project.ProjectId);/// 设置项目、施工、安全经理
this.InsertDataTypeToProject(project.ProjectId);////初始化资料类别数据
- this.InsertConstructionStandardListToProject(project.ProjectId); ////初始化项目标准规范清单
- this.InsertITPListProject(project.ProjectId); // 初始化ITP列表
- this.InsertZT(project); //初始化总图
+ //this.InsertConstructionStandardListToProject(project.ProjectId); ////初始化项目标准规范清单
+ //this.InsertITPListProject(project.ProjectId); // 初始化ITP列表
+ //this.InsertZT(project); //初始化总图
}
#region 根据项目id增加资料类别初始化数据