From b53e552cfa08ef7f1b360d480edbe4602c2afaa3 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 5 Sep 2023 15:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E5=8C=85=E5=90=88?= =?UTF-8?q?=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-09-05.sql | 14 ++ .../FineUIPro.Web/ZHGL/Plan/MainContract.aspx | 4 +- .../ZHGL/Plan/MainContract.aspx.cs | 6 +- .../ZHGL/Plan/MainContractEdit.aspx | 12 +- .../ZHGL/Plan/MainContractEdit.aspx.cs | 44 +----- .../Plan/MainContractEdit.aspx.designer.cs | 8 +- .../ZHGL/Plan/MainContractView.aspx | 12 +- .../ZHGL/Plan/MainContractView.aspx.cs | 15 +- .../Plan/MainContractView.aspx.designer.cs | 8 +- SGGL/Model/Model.cs | 138 ------------------ 10 files changed, 48 insertions(+), 213 deletions(-) diff --git a/DataBase/版本日志/SGGLDB_V2023-09-05.sql b/DataBase/版本日志/SGGLDB_V2023-09-05.sql index 875cccf9..da174d0d 100644 --- a/DataBase/版本日志/SGGLDB_V2023-09-05.sql +++ b/DataBase/版本日志/SGGLDB_V2023-09-05.sql @@ -48,4 +48,18 @@ delete from Sys_Menu where MenuId='0B17549C-2749-4255-BFF4-574902E878FA' GO alter table WBS_ControlItemAndCycle add PlanCost decimal(9,2) null +GO + + +alter table dbo.ActionPlan_MainContract drop constraint FK_ActionPlan_MainContract_Base_Project +alter table dbo.ActionPlan_MainContract drop constraint FK_ActionPlan_MainContract_Person_Persons_CompileMan +GO + +alter table dbo.ActionPlan_MainContract alter column ProjectId nvarchar(500) null +GO + +update dbo.ActionPlan_MainContract set ProjectId=b.ProjectName from ActionPlan_MainContract a, Base_Project b +where a.ProjectId=b.ProjectId +update dbo.ActionPlan_MainContract set CompileMan=b.PersonName from ActionPlan_MainContract a, Person_Persons b +where a.CompileMan=b.PersonId GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx index 181c9904..1d3d4706 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx @@ -61,8 +61,8 @@ SortField="MainContractName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left"> - private void BindGrid() { - string strSql = "SELECT MainContract.MainContractId,MainContract.ProjectId,Project.ProjectName,MainContractCode,MainContract.MainContractName,MainContract.VersionNo,(CASE MainContract.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,MainContract.MainContractContents,MainContract.CompileMan,Users.PersonName AS CompileManName, MainContract.CompileDate,MainContract.States" + string strSql = "SELECT MainContract.MainContractId,MainContract.ProjectId,MainContractCode,MainContract.MainContractName,MainContract.VersionNo,(CASE MainContract.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,MainContract.MainContractContents,MainContract.CompileMan, MainContract.CompileDate,MainContract.States" + @" FROM ActionPlan_MainContract AS MainContract " - + @" LEFT JOIN Base_Project AS Project ON MainContract.ProjectId=Project.ProjectId " + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON MainContract.MainContractId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1" + @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId " - + @" LEFT JOIN Person_Persons AS Users ON Users.PersonId = MainContract.CompileMan " + @" WHERE 1=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != BLL.Const._Null) @@ -344,7 +342,7 @@ namespace FineUIPro.Web.ZHGL.Plan Model.ActionPlan_MainContract MainContract = MainContractService.GetMainContractById(id); if (MainContract != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(MainContract.ProjectId); + string projectName = MainContract.ProjectId; newUrl = uploadfilepath.Replace(".xlsx", MainContract.MainContractCode + "(" + MainContract.MainContractName + ")" + ".xlsx"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx index 9ea167f7..ef276841 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx @@ -26,9 +26,9 @@ - - + + @@ -46,9 +46,9 @@ - - + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs index 787f909c..d50fb0f1 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs @@ -68,7 +68,6 @@ namespace FineUIPro.Web.ZHGL.Plan this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.ProjectId = this.CurrUser.LoginProjectId; this.MainContractId = Request.Params["MainContractId"]; - ProjectService.InitAllProjectDropDownList(this.drpProject, true); var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId); if (MainContract != null) @@ -79,11 +78,6 @@ namespace FineUIPro.Web.ZHGL.Plan q.Add(compileMan); } } - this.drpCompileMan.DataTextField = "PersonName"; - this.drpCompileMan.DataValueField = "PersonId"; - this.drpCompileMan.DataSource = q; - this.drpCompileMan.DataBind(); - Funs.FineUIPleaseSelect(this.drpCompileMan); this.drpPerson.DataTextField = "PersonName"; this.drpPerson.DataValueField = "PersonId"; this.drpPerson.DataSource = q; @@ -100,7 +94,7 @@ namespace FineUIPro.Web.ZHGL.Plan { txtEdition.Text = MainContract.Edition.ToString(); } - this.drpProject.SelectedValue = MainContract.ProjectId; + this.txtProjectId.Text = MainContract.ProjectId; ///读取编号 this.txtMainContractCode.Text = MainContract.MainContractCode; this.txtMainContractName.Text = MainContract.MainContractName; @@ -113,10 +107,7 @@ namespace FineUIPro.Web.ZHGL.Plan { this.drpProjectType.Hidden = true; } - if (!string.IsNullOrEmpty(MainContract.CompileMan)) - { - this.drpCompileMan.SelectedValue = MainContract.CompileMan; - } + this.txtCompileMan.Text = MainContract.CompileMan; if (MainContract.CompileDate != null) { this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", MainContract.CompileDate); @@ -137,8 +128,8 @@ namespace FineUIPro.Web.ZHGL.Plan txtMainContractName.Readonly = true; txtVersionNo.Readonly = true; drpProjectType.Readonly = true; - drpProject.Readonly = true; - drpCompileMan.Readonly = true; + txtProjectId.Readonly = true; + txtCompileMan.Readonly = true; txtCompileDate.Readonly = true; drpPerson.Readonly = true; ContactImg = -1; @@ -148,7 +139,7 @@ namespace FineUIPro.Web.ZHGL.Plan } else { - this.drpCompileMan.SelectedValue = this.CurrUser.PersonId; + this.txtCompileMan.Text = this.CurrUser.PersonName; this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.trAtt.Hidden = true; txtEdition.Text = "0"; @@ -181,11 +172,6 @@ namespace FineUIPro.Web.ZHGL.Plan /// protected void btnSave_Click(object sender, EventArgs e) { - if (this.drpCompileMan.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning); - return; - } this.SaveData(BLL.Const.BtnSave); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } @@ -197,16 +183,6 @@ namespace FineUIPro.Web.ZHGL.Plan /// protected void btnSubmit_Click(object sender, EventArgs e) { - if (this.drpProject.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择项目!", MessageBoxIcon.Warning); - return; - } - if (this.drpCompileMan.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning); - return; - } if (string.IsNullOrEmpty(HFMainContractId.Text)) { Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning); @@ -234,14 +210,8 @@ namespace FineUIPro.Web.ZHGL.Plan VersionNo = this.txtVersionNo.Text.Trim(), ProjectType = this.drpProjectType.SelectedValue, }; - if (this.drpProject.SelectedValue != BLL.Const._Null) - { - MainContract.ProjectId = this.drpProject.SelectedValue; - } - if (this.drpCompileMan.SelectedValue != BLL.Const._Null) - { - MainContract.CompileMan = this.drpCompileMan.SelectedValue; - } + MainContract.ProjectId = this.txtProjectId.Text; + MainContract.CompileMan = this.txtCompileMan.Text; if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim())) { MainContract.CompileDate = Convert.ToDateTime(this.txtCompileDate.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs index 8789b035..6bad3abf 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs @@ -58,13 +58,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.TextBox txtMainContractName; /// - /// drpProject 控件。 + /// txtProjectId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpProject; + protected global::FineUIPro.TextBox txtProjectId; /// /// txtVersionNo 控件。 @@ -85,13 +85,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.DropDownList drpProjectType; /// - /// drpCompileMan 控件。 + /// txtCompileMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpCompileMan; + protected global::FineUIPro.TextBox txtCompileMan; /// /// txtCompileDate 控件。 diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx index 81cc46ad..e78eda66 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx @@ -26,9 +26,9 @@ - - + + @@ -46,9 +46,9 @@ - - + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs index 4752e69f..3c3c2650 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs @@ -56,7 +56,6 @@ namespace FineUIPro.Web.ZHGL.Plan this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.ProjectId = this.CurrUser.LoginProjectId; this.MainContractId = Request.Params["MainContractId"]; - ProjectService.InitAllProjectDropDownList(this.drpProject, true); var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId); if (MainContract != null) @@ -67,11 +66,6 @@ namespace FineUIPro.Web.ZHGL.Plan q.Add(compileMan); } } - this.drpCompileMan.DataTextField = "PersonName"; - this.drpCompileMan.DataValueField = "PersonId"; - this.drpCompileMan.DataSource = q; - this.drpCompileMan.DataBind(); - Funs.FineUIPleaseSelect(this.drpCompileMan); this.drpPerson.DataTextField = "PersonName"; this.drpPerson.DataValueField = "PersonId"; this.drpPerson.DataSource = q; @@ -90,7 +84,7 @@ namespace FineUIPro.Web.ZHGL.Plan ///读取编号 this.txtMainContractCode.Text = MainContract.MainContractCode; this.txtMainContractName.Text = MainContract.MainContractName; - this.drpProject.SelectedValue = MainContract.ProjectId; + this.txtProjectId.Text = MainContract.ProjectId; this.txtVersionNo.Text = MainContract.VersionNo; if (!string.IsNullOrEmpty(MainContract.ProjectType)) { @@ -100,10 +94,7 @@ namespace FineUIPro.Web.ZHGL.Plan { this.drpProjectType.Hidden = true; } - if (!string.IsNullOrEmpty(MainContract.CompileMan)) - { - this.drpCompileMan.SelectedValue = MainContract.CompileMan; - } + this.txtCompileMan.Text = MainContract.CompileMan; if (MainContract.CompileDate != null) { this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", MainContract.CompileDate); @@ -119,7 +110,7 @@ namespace FineUIPro.Web.ZHGL.Plan } else { - this.drpCompileMan.SelectedValue = this.CurrUser.PersonId; + this.txtCompileMan.Text = this.CurrUser.PersonName; this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.trAtt.Hidden = true; txtEdition.Text = "0"; diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs index 8aa1064b..aefe939d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs @@ -58,13 +58,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.TextBox txtMainContractName; /// - /// drpProject 控件。 + /// txtProjectId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpProject; + protected global::FineUIPro.TextBox txtProjectId; /// /// txtVersionNo 控件。 @@ -85,13 +85,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.DropDownList drpProjectType; /// - /// drpCompileMan 控件。 + /// txtCompileMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpCompileMan; + protected global::FineUIPro.TextBox txtCompileMan; /// /// txtCompileDate 控件。 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 123eed46..60b0c919 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -12320,10 +12320,6 @@ namespace Model private System.Nullable _IsCompanyReview; - private EntityRef _Base_Project; - - private EntityRef _Person_Persons; - private EntitySet _ActionPlan_MainContractApprove; private EntitySet _ActionPlan_MainContractOpinion; @@ -12364,8 +12360,6 @@ namespace Model public ActionPlan_MainContract() { - this._Base_Project = default(EntityRef); - this._Person_Persons = default(EntityRef); this._ActionPlan_MainContractApprove = new EntitySet(new Action(this.attach_ActionPlan_MainContractApprove), new Action(this.detach_ActionPlan_MainContractApprove)); this._ActionPlan_MainContractOpinion = new EntitySet(new Action(this.attach_ActionPlan_MainContractOpinion), new Action(this.detach_ActionPlan_MainContractOpinion)); OnCreated(); @@ -12402,10 +12396,6 @@ namespace Model { if ((this._ProjectId != value)) { - if (this._Base_Project.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -12526,10 +12516,6 @@ namespace Model { if ((this._CompileMan != value)) { - if (this._Person_Persons.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCompileManChanging(value); this.SendPropertyChanging(); this._CompileMan = value; @@ -12659,74 +12645,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] - public Base_Project Base_Project - { - get - { - return this._Base_Project.Entity; - } - set - { - Base_Project previousValue = this._Base_Project.Entity; - if (((previousValue != value) - || (this._Base_Project.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_Project.Entity = null; - previousValue.ActionPlan_MainContract.Remove(this); - } - this._Base_Project.Entity = value; - if ((value != null)) - { - value.ActionPlan_MainContract.Add(this); - this._ProjectId = value.ProjectId; - } - else - { - this._ProjectId = default(string); - } - this.SendPropertyChanged("Base_Project"); - } - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Person_Persons_CompileMan", Storage="_Person_Persons", ThisKey="CompileMan", OtherKey="PersonId", IsForeignKey=true)] - public Person_Persons Person_Persons - { - get - { - return this._Person_Persons.Entity; - } - set - { - Person_Persons previousValue = this._Person_Persons.Entity; - if (((previousValue != value) - || (this._Person_Persons.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Person_Persons.Entity = null; - previousValue.ActionPlan_MainContract.Remove(this); - } - this._Person_Persons.Entity = value; - if ((value != null)) - { - value.ActionPlan_MainContract.Add(this); - this._CompileMan = value.PersonId; - } - else - { - this._CompileMan = default(string); - } - this.SendPropertyChanged("Person_Persons"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContractApprove_ActionPlan_MainContract", Storage="_ActionPlan_MainContractApprove", ThisKey="MainContractId", OtherKey="MainContractId", DeleteRule="NO ACTION")] public EntitySet ActionPlan_MainContractApprove { @@ -23728,8 +23646,6 @@ namespace Model private EntitySet _ActionPlan_CompanyManagerRule; - private EntitySet _ActionPlan_MainContract; - private EntitySet _ActionPlan_ManagerRule; private EntitySet _ActionPlan_ProjectManagerRule; @@ -24135,7 +24051,6 @@ namespace Model this._Accident_NoFourLetoff = new EntitySet(new Action(this.attach_Accident_NoFourLetoff), new Action(this.detach_Accident_NoFourLetoff)); this._ActionPlan_ActionPlanList = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanList), new Action(this.detach_ActionPlan_ActionPlanList)); this._ActionPlan_CompanyManagerRule = new EntitySet(new Action(this.attach_ActionPlan_CompanyManagerRule), new Action(this.detach_ActionPlan_CompanyManagerRule)); - this._ActionPlan_MainContract = new EntitySet(new Action(this.attach_ActionPlan_MainContract), new Action(this.detach_ActionPlan_MainContract)); this._ActionPlan_ManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ManagerRule), new Action(this.detach_ActionPlan_ManagerRule)); this._ActionPlan_ProjectManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ProjectManagerRule), new Action(this.detach_ActionPlan_ProjectManagerRule)); this._ActionPlan_ProjectPlan = new EntitySet(new Action(this.attach_ActionPlan_ProjectPlan), new Action(this.detach_ActionPlan_ProjectPlan)); @@ -24965,19 +24880,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Base_Project", Storage="_ActionPlan_MainContract", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] - public EntitySet ActionPlan_MainContract - { - get - { - return this._ActionPlan_MainContract; - } - set - { - this._ActionPlan_MainContract.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ManagerRule_Base_Project", Storage="_ActionPlan_ManagerRule", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet ActionPlan_ManagerRule { @@ -27295,18 +27197,6 @@ namespace Model entity.Base_Project = null; } - private void attach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Base_Project = this; - } - - private void detach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Base_Project = null; - } - private void attach_ActionPlan_ManagerRule(ActionPlan_ManagerRule entity) { this.SendPropertyChanging(); @@ -154753,8 +154643,6 @@ namespace Model private EntitySet _ActionPlan_CompanyManagerRule; - private EntitySet _ActionPlan_MainContract; - private EntitySet _ActionPlan_MainContractApprove; private EntitySet _ActionPlan_ManagerRule; @@ -155357,7 +155245,6 @@ namespace Model this._ActionPlan_ActionPlanList = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanList), new Action(this.detach_ActionPlan_ActionPlanList)); this._ActionPlan_ActionPlanListApprove = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanListApprove), new Action(this.detach_ActionPlan_ActionPlanListApprove)); this._ActionPlan_CompanyManagerRule = new EntitySet(new Action(this.attach_ActionPlan_CompanyManagerRule), new Action(this.detach_ActionPlan_CompanyManagerRule)); - this._ActionPlan_MainContract = new EntitySet(new Action(this.attach_ActionPlan_MainContract), new Action(this.detach_ActionPlan_MainContract)); this._ActionPlan_MainContractApprove = new EntitySet(new Action(this.attach_ActionPlan_MainContractApprove), new Action(this.detach_ActionPlan_MainContractApprove)); this._ActionPlan_ManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ManagerRule), new Action(this.detach_ActionPlan_ManagerRule)); this._ActionPlan_ProjectManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ProjectManagerRule), new Action(this.detach_ActionPlan_ProjectManagerRule)); @@ -156996,19 +156883,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Person_Persons_CompileMan", Storage="_ActionPlan_MainContract", ThisKey="PersonId", OtherKey="CompileMan", DeleteRule="NO ACTION")] - public EntitySet ActionPlan_MainContract - { - get - { - return this._ActionPlan_MainContract; - } - set - { - this._ActionPlan_MainContract.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContractApprove_Person_Persons", Storage="_ActionPlan_MainContractApprove", ThisKey="PersonId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] public EntitySet ActionPlan_MainContractApprove { @@ -160210,18 +160084,6 @@ namespace Model entity.Person_Persons = null; } - private void attach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Person_Persons = this; - } - - private void detach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Person_Persons = null; - } - private void attach_ActionPlan_MainContractApprove(ActionPlan_MainContractApprove entity) { this.SendPropertyChanging();