From abb15b53fc7114bf255efc71cd0c8c4871cad164 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 21 Oct 2024 16:29:59 +0800 Subject: [PATCH] =?UTF-8?q?20241021=20=E4=BF=AE=E6=94=B9=E5=85=B1=E6=A3=80?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_V2024-10-21-bwj.sql | 13 + SGGL/BLL/BaseInfo/CNProfessionalService.cs | 5 + .../InspectionManagementService.cs | 4 + .../ProcessControl/InspectionNotice.aspx.cs | 13 +- .../ProcessControl/InspectionNoticeEdit.aspx | 82 +- .../InspectionNoticeEdit.aspx.cs | 285 ++- .../InspectionNoticeEdit.aspx.designer.cs | 30 +- SGGL/FineUIPro.Web/Web.config | 2 +- .../common/mainMenu_CQMS.aspx.cs | 10 +- SGGL/FineUIPro.Web/common/main_new1.aspx.cs | 14 +- SGGL/Model/Model.cs | 2261 ++++++++++------- 11 files changed, 1724 insertions(+), 995 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_V2024-10-21-bwj.sql diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-10-21-bwj.sql b/DataBase/版本日志/SGGLDB_WH_V2024-10-21-bwj.sql new file mode 100644 index 00000000..7e2d85e8 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-10-21-bwj.sql @@ -0,0 +1,13 @@ + +alter table ProcessControl_InspectionManagement add ChildUnitWorkId nvarchar(50) +alter table ProcessControl_InspectionManagement add ChildBranch nvarchar(50) +go +ALTER TABLE [dbo].[ProcessControl_InspectionManagement] DROP CONSTRAINT [FK_ProcessControl_InspectionManagement_Base_CNProfessional] +GO + +update ProcessControl_InspectionManagement set CNProfessionalId='D03E079B-8B97-4C5A-BF1C-782887548B92' where CNProfessionalId='10487C07-DE54-4ED6-BBDF-2C7988A44665'--ܵ +update ProcessControl_InspectionManagement set CNProfessionalId='445B1EE6-901E-4A07-A4AB-4EE1066E742F' where CNProfessionalId='DEB367FF-AD35-41A0-B68E-FA8E68737B93'-- +update ProcessControl_InspectionManagement set CNProfessionalId='E9AC9563-E338-48B7-867D-488222AD0557' where CNProfessionalId='F41C5022-F499-4BD7-84B6-E87E4CE53CAC'-- +--update ProcessControl_InspectionManagement set CNProfessionalId='' where CNProfessionalId='FBC066BE-082F-4185-AE5C-016A12132ADE'--豸 + + diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs index a5361053..ed46a47b 100644 --- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs +++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs @@ -21,6 +21,11 @@ namespace BLL var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList(); return q; } + + public static List GetCnProList() + { + return (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList(); + } /// /// 添加 /// diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index f8ff3af4..2d3b6cad 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -250,6 +250,8 @@ namespace BLL newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason; newInspectionManagement.AcceptanceCheckMan = inspectionManagement.AcceptanceCheckMan; newInspectionManagement.FileType = inspectionManagement.FileType; + newInspectionManagement.ChildUnitWorkId = inspectionManagement.ChildUnitWorkId; + newInspectionManagement.ChildBranch = inspectionManagement.ChildBranch; db.ProcessControl_InspectionManagement.InsertOnSubmit(newInspectionManagement); db.SubmitChanges(); } @@ -282,6 +284,8 @@ namespace BLL newInspectionManagement.ParentDivisionProjectId = inspectionManagement.ParentDivisionProjectId; newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason; newInspectionManagement.AcceptanceCheckMan = inspectionManagement.AcceptanceCheckMan; + newInspectionManagement.ChildUnitWorkId = inspectionManagement.ChildUnitWorkId; + newInspectionManagement.ChildBranch = inspectionManagement.ChildBranch; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index e1faeafe..5bd73ea7 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -25,7 +25,14 @@ namespace FineUIPro.Web.CQMS.ProcessControl if (!IsPostBack) { GetButtonPower(); - BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业 + //BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业 + //专业 + this.drpCNProfessional.DataTextField = "DetectionItems"; + this.drpCNProfessional.DataValueField = "ControlId"; + this.drpCNProfessional.DataSource = BLL.CNProfessionalService.GetCnProList(); + this.drpCNProfessional.DataBind(); + Funs.FineUIPleaseSelect(this.drpCNProfessional); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BindGrid(); } @@ -42,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl P.CNProfessionalId, P.UnitWorkId, U.UnitName, - C.ProfessionalName, + C.DetectionItems as ProfessionalName, P.NoticeCode, UnitWork.UnitWorkName, DP.DivisionName AS Branch, @@ -52,7 +59,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl P.AcceptanceCheckMan" + @" FROM ProcessControl_InspectionManagement AS P" + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId" - + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId" + + @" LEFT JOIN Control_PointCropping C ON C.ControlId = P.CNProfessionalId" + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId" + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch" + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType" diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx index cf8356d9..6dbf5b0d 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx @@ -15,91 +15,56 @@ - + - + - - - + + - <%-- + - - - + + + + + + + + + + - - - - - - - - - - - - - --%> - - - - - <%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - + EnableTextSelection="True"> @@ -110,8 +75,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index 9de02d03..0c1f311f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -21,14 +21,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl //测试阶段，仅hfnbd账号使用 if (this.CurrUser.UserId == BLL.Const.hfnbdId) { + this.drpUnitWorkId.Hidden = false; this.fr1.Hidden = false; this.fr2.Hidden = false; } GetButtonPower(); BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 - BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 + //BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false); //UserService.InitUserNameProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false); + //专业 + this.drpCNProfessionalId.DataTextField = "DetectionItems"; + this.drpCNProfessionalId.DataValueField = "ControlId"; + this.drpCNProfessionalId.DataSource = BLL.CNProfessionalService.GetCnProList(); + this.drpCNProfessionalId.DataBind(); + Funs.FineUIPleaseSelect(this.drpCNProfessionalId); //单位工程 var q = (from x in Funs.DB.WBS_DivisionDivide @@ -44,9 +51,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.drpUnitWorkId.DataValueField = "UnitWorkId"; this.drpUnitWorkId.DataSource = q; this.drpUnitWorkId.DataBind(); - Funs.FineUIPleaseSelect(this.drpUnitWorkId); - Funs.FineUIPleaseSelect(this.drpBranch); - Funs.FineUIPleaseSelect(this.drpProEngineering); + Funs.FineUIPleaseSelect(this.drpUnitWorkId);//单位工程 + Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId);//子单位工程 + Funs.FineUIPleaseSelect(this.drpBranch);//分部工程 + Funs.FineUIPleaseSelect(this.drpChildBranch);//子分部工程 + Funs.FineUIPleaseSelect(this.drpProEngineering);//分项工程 this.hdInspectionNoticeId.Text = Request.Params["inspectionId"]; if (!string.IsNullOrEmpty(Request.Params["View"])) @@ -75,27 +84,118 @@ namespace FineUIPro.Web.CQMS.ProcessControl if (!string.IsNullOrEmpty(inspectionManagement.UnitWorkId)) { this.drpUnitWorkId.SelectedValue = inspectionManagement.UnitWorkId; + if (!string.IsNullOrEmpty(inspectionManagement.ChildUnitWorkId)) + { + //子单位工程 + var childUnitWorks = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.WBS_UnitWork on x.UnitWorkId equals y.UnitWorkId + where x.ProjectId == this.CurrUser.LoginProjectId + && y.SuperUnitWork == inspectionManagement.UnitWorkId + && (y.SuperUnitWork != "0") + select new + { + y.UnitWorkId, + UnitWorkName = y.UnitWorkCode + "-" + y.UnitWorkName + }).Distinct().ToList(); + this.drpChirldUnitWorkId.DataTextField = "UnitWorkName"; + this.drpChirldUnitWorkId.DataValueField = "UnitWorkId"; + this.drpChirldUnitWorkId.DataSource = childUnitWorks; + this.drpChirldUnitWorkId.DataBind(); + Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId); + this.drpChirldUnitWorkId.SelectedIndex = 0; + this.drpChirldUnitWorkId.SelectedValue = inspectionManagement.ChildUnitWorkId; + } if (!string.IsNullOrEmpty(inspectionManagement.Branch)) { - //分部工程 - var a = (from x in Funs.DB.WBS_DivisionDivide - join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId - where x.ProjectId == this.CurrUser.LoginProjectId - && x.UnitWorkId == this.drpUnitWorkId.SelectedValue - && y.ParentId == null - select new - { - y.DivisionId, - y.BranchEngineeringName - }).Distinct().ToList(); - this.drpBranch.DataTextField = "BranchEngineeringName"; - this.drpBranch.DataValueField = "DivisionId"; - this.drpBranch.DataSource = a; - this.drpBranch.DataBind(); - Funs.FineUIPleaseSelect(this.drpBranch); - this.drpBranch.SelectedIndex = 0; - - this.drpBranch.SelectedValue = inspectionManagement.Branch; + if (string.IsNullOrEmpty(inspectionManagement.ChildUnitWorkId))//无子单位工程 + { + //分部工程 + var a = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && x.UnitWorkId == inspectionManagement.UnitWorkId + && y.ParentId == null + select new + { + y.DivisionId, + y.BranchEngineeringName + }).Distinct().ToList(); + this.drpBranch.DataTextField = "BranchEngineeringName"; + this.drpBranch.DataValueField = "DivisionId"; + this.drpBranch.DataSource = a; + this.drpBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpBranch); + this.drpBranch.SelectedIndex = 0; + this.drpBranch.SelectedValue = inspectionManagement.Branch; + } + else + { + //分部工程(有子单位工程) + var a = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && x.UnitWorkId == inspectionManagement.ChildUnitWorkId + && y.ParentId == null + select new + { + y.DivisionId, + y.BranchEngineeringName + }).Distinct().ToList(); + this.drpBranch.DataTextField = "BranchEngineeringName"; + this.drpBranch.DataValueField = "DivisionId"; + this.drpBranch.DataSource = a; + this.drpBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpBranch); + this.drpBranch.SelectedIndex = 0; + this.drpBranch.SelectedValue = inspectionManagement.Branch; + } + if (!string.IsNullOrEmpty(inspectionManagement.ChildBranch)) + { + #region 子分部工程 + if (!string.IsNullOrEmpty(inspectionManagement.ChildUnitWorkId)) + { + //子分部工程 + var childBranchs = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && y.ParentId == inspectionManagement.Branch + && x.UnitWorkId == inspectionManagement.ChildUnitWorkId + && y.SubBranchEngineeringName != null + select new + { + y.DivisionId, + y.SubBranchEngineeringName + }).Distinct().ToList(); + this.drpChildBranch.DataTextField = "SubBranchEngineeringName"; + this.drpChildBranch.DataValueField = "DivisionId"; + this.drpChildBranch.DataSource = childBranchs; + this.drpChildBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpChildBranch); + this.drpChildBranch.SelectedIndex = 0; + } + else + { + var childBranchs = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && y.ParentId == inspectionManagement.Branch + && x.UnitWorkId == inspectionManagement.UnitWorkId + && y.SubBranchEngineeringName != null + select new + { + y.DivisionId, + y.SubBranchEngineeringName + }).Distinct().ToList(); + this.drpChildBranch.DataTextField = "SubBranchEngineeringName"; + this.drpChildBranch.DataValueField = "DivisionId"; + this.drpChildBranch.DataSource = childBranchs; + this.drpChildBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpChildBranch); + this.drpChildBranch.SelectedIndex = 0; + } + this.drpChildBranch.SelectedValue = inspectionManagement.ChildBranch; + #endregion + } if (!string.IsNullOrEmpty(inspectionManagement.ControlPointType)) { @@ -215,10 +315,18 @@ namespace FineUIPro.Web.CQMS.ProcessControl { inspectionManagement.UnitWorkId = this.drpUnitWorkId.SelectedValue; } + if (this.drpChirldUnitWorkId.SelectedValue!=BLL.Const._Null) + { + inspectionManagement.ChildUnitWorkId = this.drpChirldUnitWorkId.SelectedValue; + } if (this.drpBranch.SelectedValue != BLL.Const._Null) { inspectionManagement.Branch = this.drpBranch.SelectedValue; } + if (this.drpChildBranch.SelectedValue!=BLL.Const._Null) + { + inspectionManagement.ChildBranch = this.drpChildBranch.SelectedValue; + } if (this.drpProEngineering.SelectedValue != BLL.Const._Null) { inspectionManagement.ControlPointType = this.drpProEngineering.SelectedValue; @@ -527,9 +635,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// protected void drpUnitWorkId_SelectedIndexChanged(object sender, EventArgs e) { - this.drpBranch.Items.Clear(); + this.drpChirldUnitWorkId.Items.Clear(); if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) { + //子单位工程 + var childUnitWorks = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.WBS_UnitWork on x.UnitWorkId equals y.UnitWorkId + where x.ProjectId == this.CurrUser.LoginProjectId + && y.SuperUnitWork == this.drpUnitWorkId.SelectedValue + && (y.SuperUnitWork != "0") + select new + { + y.UnitWorkId, + UnitWorkName = y.UnitWorkCode + "-" + y.UnitWorkName + }).Distinct().ToList(); + this.drpChirldUnitWorkId.DataTextField = "UnitWorkName"; + this.drpChirldUnitWorkId.DataValueField = "UnitWorkId"; + this.drpChirldUnitWorkId.DataSource = childUnitWorks; + this.drpChirldUnitWorkId.DataBind(); + Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId); + this.drpChirldUnitWorkId.SelectedIndex = 0; + + //分部工程 + this.drpBranch.Items.Clear(); var q = (from x in Funs.DB.WBS_DivisionDivide join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId where x.ProjectId == this.CurrUser.LoginProjectId @@ -545,8 +673,37 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.drpBranch.DataSource = q; this.drpBranch.DataBind(); Funs.FineUIPleaseSelect(this.drpBranch); + this.drpBranch.SelectedIndex = 0; + } + } + + /// + /// 子单位工程下拉选择事件 + /// + /// + /// + protected void drpChirldUnitWorkId_SelectedIndexChanged(object sender, EventArgs e) + { + if (this.drpChirldUnitWorkId.SelectedValue != BLL.Const._Null) + { + this.drpBranch.Items.Clear(); + var q = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && x.UnitWorkId == this.drpChirldUnitWorkId.SelectedValue + && y.ParentId == null + select new + { + y.DivisionId, + y.BranchEngineeringName + }).Distinct().ToList(); + this.drpBranch.DataTextField = "BranchEngineeringName"; + this.drpBranch.DataValueField = "DivisionId"; + this.drpBranch.DataSource = q; + this.drpBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpBranch); + this.drpBranch.SelectedIndex = 0; } - this.drpBranch.SelectedIndex = 0; } /// @@ -556,9 +713,55 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// protected void drpBranch_SelectedIndexChanged(object sender, EventArgs e) { - this.drpProEngineering.Items.Clear(); + this.drpChildBranch.Items.Clear(); if (this.drpBranch.SelectedValue != BLL.Const._Null) { + #region 子分部工程 + if (this.drpChirldUnitWorkId.SelectedValue != BLL.Const._Null) + { + //子分部工程 + var childBranchs = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && y.ParentId == this.drpBranch.SelectedValue + && x.UnitWorkId == this.drpChirldUnitWorkId.SelectedValue + && y.SubBranchEngineeringName != null + select new + { + y.DivisionId, + y.SubBranchEngineeringName + }).Distinct().ToList(); + this.drpChildBranch.DataTextField = "SubBranchEngineeringName"; + this.drpChildBranch.DataValueField = "DivisionId"; + this.drpChildBranch.DataSource = childBranchs; + this.drpChildBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpChildBranch); + this.drpChildBranch.SelectedIndex = 0; + } + else + { + var childBranchs = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && y.ParentId == this.drpBranch.SelectedValue + && x.UnitWorkId == this.drpUnitWorkId.SelectedValue + && y.SubBranchEngineeringName != null + select new + { + y.DivisionId, + y.SubBranchEngineeringName + }).Distinct().ToList(); + this.drpChildBranch.DataTextField = "SubBranchEngineeringName"; + this.drpChildBranch.DataValueField = "DivisionId"; + this.drpChildBranch.DataSource = childBranchs; + this.drpChildBranch.DataBind(); + Funs.FineUIPleaseSelect(this.drpChildBranch); + this.drpChildBranch.SelectedIndex = 0; + } + #endregion + + //分项工程 + this.drpProEngineering.Items.Clear(); var q = (from x in Funs.DB.WBS_DivisionDivide join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId where x.ProjectId == this.CurrUser.LoginProjectId @@ -600,6 +803,36 @@ namespace FineUIPro.Web.CQMS.ProcessControl } this.drpProEngineering.SelectedIndex = 0; } + + /// + /// 子分部工程下拉选择事件 + /// + /// + /// + protected void drpChildBranch_SelectedIndexChanged(object sender, EventArgs e) + { + this.drpProEngineering.Items.Clear(); + if (this.drpChildBranch.SelectedValue != BLL.Const._Null) + { + //分项工程 + var a = (from x in Funs.DB.WBS_DivisionDivide + join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId + where x.ProjectId == this.CurrUser.LoginProjectId + && x.UnitWorkId == this.drpUnitWorkId.SelectedValue + && y.ParentId == this.drpChildBranch.SelectedValue + select new + { + y.DivisionId, + y.ProEngineeringName + }).Distinct().ToList(); + this.drpProEngineering.DataTextField = "ProEngineeringName"; + this.drpProEngineering.DataValueField = "DivisionId"; + this.drpProEngineering.DataSource = a; + this.drpProEngineering.DataBind(); + Funs.FineUIPleaseSelect(this.drpProEngineering); + this.drpProEngineering.SelectedIndex = 0; + } + } #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs index 483cbd12..63f508cf 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs @@ -67,13 +67,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl { protected global::FineUIPro.TextBox txtNoticeCode; /// - /// txtAcceptanceSite 控件。 + /// drpUnitWorkId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtAcceptanceSite; + protected global::FineUIPro.DropDownList drpUnitWorkId; /// /// fr1 控件。 @@ -85,13 +85,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl { protected global::FineUIPro.FormRow fr1; /// - /// drpUnitWorkId 控件。 + /// drpChirldUnitWorkId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.DropDownList drpChirldUnitWorkId; /// /// drpBranch 控件。 @@ -111,6 +111,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// protected global::FineUIPro.FormRow fr2; + /// + /// drpChildBranch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpChildBranch; + /// /// drpProEngineering 控件。 /// @@ -121,13 +130,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl { protected global::FineUIPro.DropDownList drpProEngineering; /// - /// Lable1 控件。 + /// txtAcceptanceSite 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Lable1; + protected global::FineUIPro.TextBox txtAcceptanceSite; /// /// drpAcceptanceCheckMan 控件。 @@ -156,15 +165,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl { /// protected global::FineUIPro.Button btnAttach; - /// - /// Panel2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel2; - /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs index b51ff853..cb3b0e12 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs @@ -333,7 +333,7 @@ namespace FineUIPro.Web Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); businessColumn.title = "质量一次合格率"; - var cns = BLL.CNProfessionalService.GetList(); + var cns = BLL.CNProfessionalService.GetCnProList(); Model.SGGLDB db = Funs.DB; List TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true @@ -348,16 +348,16 @@ namespace FineUIPro.Web double result = 0, result2 = 0; foreach (var cn in cns) { - listCategories.Add(cn.ProfessionalName); - var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList(); - var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList(); + listCategories.Add(cn.DetectionItems); + var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.ControlId).ToList(); + var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.ControlId).ToList(); if (okChecks.Count > 0 && totalChecks.Count > 0) { var a = Convert.ToDouble(okChecks.Count); var b = Convert.ToDouble(totalChecks.Count); result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1)); } - if (cn.ProfessionalName.Contains("管道")) + if (cn.DetectionItems.Contains("管道")) { var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault(); if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate)) diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs index 91ae046f..a1f0cc7d 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs @@ -707,14 +707,14 @@ namespace FineUIPro.Web.common private void getInspectionManagementInfo() { - var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList(); - + //var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList(); + var q = (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList(); foreach (var item in q) { //获取专业 - InspectionManagementZy += "'" + item.ProfessionalName + "',"; + InspectionManagementZy += "'" + item.DetectionItems + "',"; //根据专业获取总计 //var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail // join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId @@ -725,18 +725,18 @@ namespace FineUIPro.Web.common if (pids == null) { num1 = (from x in Funs.DB.ProcessControl_InspectionManagement - where x.CNProfessionalId == item.CNProfessionalId + where x.CNProfessionalId == item.ControlId select x).Count(); num2 = (from x in Funs.DB.ProcessControl_InspectionManagement - where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true + where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true select x).Count(); } else { num1 = (from x in Funs.DB.ProcessControl_InspectionManagement - where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId) + where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId) select x).Count(); num2 = (from x in Funs.DB.ProcessControl_InspectionManagement - where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId) + where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId) select x).Count(); } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f657d28c..6e92da83 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1502,6 +1502,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2072,6 +2075,9 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); + partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -6700,6 +6706,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligations + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -8220,6 +8234,14 @@ namespace Model } } + public System.Data.Linq.Table Report_CQMS_ProblemHandle + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Report_CqmsTarget { get @@ -21917,8 +21939,6 @@ namespace Model private string _CodeRule; - private EntitySet _Doc_DocManage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21935,7 +21955,6 @@ namespace Model public Base_DocType() { - this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -22019,19 +22038,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManage - { - get - { - return this._Doc_DocManage; - } - set - { - this._Doc_DocManage.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -22051,18 +22057,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = this; - } - - private void detach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -39916,6 +39910,8 @@ namespace Model private EntitySet _Check_CheckRectify; + private EntitySet _Check_CheckSpecialDetail; + private EntitySet _Check_ContactList; private EntitySet _Check_IncentiveNotice; @@ -40311,6 +40307,7 @@ namespace Model this._Check_CheckDayDetail = new EntitySet(new Action(this.attach_Check_CheckDayDetail), new Action(this.detach_Check_CheckDayDetail)); this._Check_CheckInfo = new EntitySet(new Action(this.attach_Check_CheckInfo), new Action(this.detach_Check_CheckInfo)); this._Check_CheckRectify = new EntitySet(new Action(this.attach_Check_CheckRectify), new Action(this.detach_Check_CheckRectify)); + this._Check_CheckSpecialDetail = new EntitySet(new Action(this.attach_Check_CheckSpecialDetail), new Action(this.detach_Check_CheckSpecialDetail)); this._Check_ContactList = new EntitySet(new Action(this.attach_Check_ContactList), new Action(this.detach_Check_ContactList)); this._Check_IncentiveNotice = new EntitySet(new Action(this.attach_Check_IncentiveNotice), new Action(this.detach_Check_IncentiveNotice)); this._Check_JointCheck = new EntitySet(new Action(this.attach_Check_JointCheck), new Action(this.detach_Check_JointCheck)); @@ -41220,6 +41217,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Check_CheckSpecialDetail", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] + public EntitySet Check_CheckSpecialDetail + { + get + { + return this._Check_CheckSpecialDetail; + } + set + { + this._Check_CheckSpecialDetail.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ContactList_Base_Unit", Storage="_Check_ContactList", ThisKey="UnitId", OtherKey="SponsorUnitId", DeleteRule="NO ACTION")] public EntitySet Check_ContactList { @@ -43535,6 +43545,18 @@ namespace Model entity.Base_Unit = null; } + private void attach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = this; + } + + private void detach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = null; + } + private void attach_Check_ContactList(Check_ContactList entity) { this.SendPropertyChanging(); @@ -62278,6 +62300,8 @@ namespace Model private EntityRef _Base_Project; + private EntityRef _Technique_CheckItemSet; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -62329,6 +62353,7 @@ namespace Model public Check_CheckSpecial() { this._Base_Project = default(EntityRef); + this._Technique_CheckItemSet = default(EntityRef); OnCreated(); } @@ -62647,6 +62672,10 @@ namespace Model { if ((this._CheckItemSetId != value)) { + if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnCheckItemSetIdChanging(value); this.SendPropertyChanging(); this._CheckItemSetId = value; @@ -62790,6 +62819,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)] + public Technique_CheckItemSet Technique_CheckItemSet + { + get + { + return this._Technique_CheckItemSet.Entity; + } + set + { + Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity; + if (((previousValue != value) + || (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Technique_CheckItemSet.Entity = null; + previousValue.Check_CheckSpecial.Remove(this); + } + this._Technique_CheckItemSet.Entity = value; + if ((value != null)) + { + value.Check_CheckSpecial.Add(this); + this._CheckItemSetId = value.CheckItemSetId; + } + else + { + this._CheckItemSetId = default(string); + } + this.SendPropertyChanged("Technique_CheckItemSet"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -62865,6 +62928,8 @@ namespace Model private string _HiddenType; + private EntityRef _Base_Unit; + private EntityRef _WBS_UnitWork; #region 可扩展性方法定义 @@ -62923,6 +62988,7 @@ namespace Model public Check_CheckSpecialDetail() { + this._Base_Unit = default(EntityRef); this._WBS_UnitWork = default(EntityRef); OnCreated(); } @@ -63062,6 +63128,10 @@ namespace Model { if ((this._UnitId != value)) { + if (this._Base_Unit.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnUnitIdChanging(value); this.SendPropertyChanging(); this._UnitId = value; @@ -63411,6 +63481,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] + public Base_Unit Base_Unit + { + get + { + return this._Base_Unit.Entity; + } + set + { + Base_Unit previousValue = this._Base_Unit.Entity; + if (((previousValue != value) + || (this._Base_Unit.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Unit.Entity = null; + previousValue.Check_CheckSpecialDetail.Remove(this); + } + this._Base_Unit.Entity = value; + if ((value != null)) + { + value.Check_CheckSpecialDetail.Add(this); + this._UnitId = value.UnitId; + } + else + { + this._UnitId = default(string); + } + this.SendPropertyChanged("Base_Unit"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_ProjectData_WorkArea", Storage="_WBS_UnitWork", ThisKey="CheckArea", OtherKey="UnitWorkId", IsForeignKey=true)] public WBS_UnitWork WBS_UnitWork { @@ -98851,10 +98955,10 @@ namespace Model private string _AuditMan; - private string _Problem; - private string _Measure; + private string _Problem; + private System.Nullable _RemarkCode; private string _Supervisor; @@ -98907,10 +99011,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnProblemChanging(string value); - partial void OnProblemChanged(); partial void OnMeasureChanging(string value); partial void OnMeasureChanged(); + partial void OnProblemChanging(string value); + partial void OnProblemChanged(); partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); partial void OnSupervisorChanging(string value); @@ -99283,26 +99387,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="NVarChar(1000)")] - public string Problem - { - get - { - return this._Problem; - } - set - { - if ((this._Problem != value)) - { - this.OnProblemChanging(value); - this.SendPropertyChanging(); - this._Problem = value; - this.SendPropertyChanged("Problem"); - this.OnProblemChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="NVarChar(1000)")] public string Measure { @@ -99323,6 +99407,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="NVarChar(1000)")] + public string Problem + { + get + { + return this._Problem; + } + set + { + if ((this._Problem != value)) + { + this.OnProblemChanging(value); + this.SendPropertyChanging(); + this._Problem = value; + this.SendPropertyChanged("Problem"); + this.OnProblemChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] public System.Nullable RemarkCode { @@ -123383,8 +123487,6 @@ namespace Model private EntityRef _Base_CNProfessional; - private EntityRef _Base_DocType; - private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -123436,7 +123538,6 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); - this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -123515,10 +123616,6 @@ namespace Model { if ((this._DocTypeId != value)) { - if (this._Base_DocType.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -123838,40 +123935,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] - public Base_DocType Base_DocType - { - get - { - return this._Base_DocType.Entity; - } - set - { - Base_DocType previousValue = this._Base_DocType.Entity; - if (((previousValue != value) - || (this._Base_DocType.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_DocType.Entity = null; - previousValue.Doc_DocManage.Remove(this); - } - this._Base_DocType.Entity = value; - if ((value != null)) - { - value.Doc_DocManage.Add(this); - this._DocTypeId = value.DocTypeId; - } - else - { - this._DocTypeId = default(string); - } - this.SendPropertyChanged("Base_DocType"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -124042,8 +124105,6 @@ namespace Model private EntityRef _Doc_DocManage; - private EntityRef _Sys_User; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -124067,7 +124128,6 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -124115,7 +124175,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] public string ApproveMan { get @@ -124126,10 +124186,6 @@ namespace Model { if ((this._ApproveMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -124253,40 +124309,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.Doc_DocManageApprove.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.Doc_DocManageApprove.Add(this); - this._ApproveMan = value.UserId; - } - else - { - this._ApproveMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -241267,6 +241289,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] + public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligations() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligations.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligations.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -247486,12 +247731,6 @@ namespace Model private string _AccidentDef; - private System.Nullable _StartDate; - - private System.Nullable _EndDate; - - private System.Nullable _TotalHseManhoursYear; - private System.Nullable _MonthHdangerCount; private System.Nullable _YearHdangerCount; @@ -247508,6 +247747,12 @@ namespace Model private string _MonthReportType; + private System.Nullable _StartDate; + + private System.Nullable _EndDate; + + private System.Nullable _TotalHseManhoursYear; + private EntitySet _Manager_AccidentSortC; private EntitySet _Manager_CheckDetailSortC; @@ -247536,6 +247781,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligations; + private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -247790,12 +248037,6 @@ namespace Model partial void OnPhotoContentsChanged(); partial void OnAccidentDefChanging(string value); partial void OnAccidentDefChanged(); - partial void OnStartDateChanging(System.Nullable value); - partial void OnStartDateChanged(); - partial void OnEndDateChanging(System.Nullable value); - partial void OnEndDateChanged(); - partial void OnTotalHseManhoursYearChanging(System.Nullable value); - partial void OnTotalHseManhoursYearChanged(); partial void OnMonthHdangerCountChanging(System.Nullable value); partial void OnMonthHdangerCountChanged(); partial void OnYearHdangerCountChanging(System.Nullable value); @@ -247812,6 +248053,12 @@ namespace Model partial void OnGoalach3Changed(); partial void OnMonthReportTypeChanging(string value); partial void OnMonthReportTypeChanged(); + partial void OnStartDateChanging(System.Nullable value); + partial void OnStartDateChanged(); + partial void OnEndDateChanging(System.Nullable value); + partial void OnEndDateChanged(); + partial void OnTotalHseManhoursYearChanging(System.Nullable value); + partial void OnTotalHseManhoursYearChanged(); #endregion public Manager_MonthReportC() @@ -247830,6 +248077,7 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -249828,66 +250076,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartDate", DbType="DateTime")] - public System.Nullable StartDate - { - get - { - return this._StartDate; - } - set - { - if ((this._StartDate != value)) - { - this.OnStartDateChanging(value); - this.SendPropertyChanging(); - this._StartDate = value; - this.SendPropertyChanged("StartDate"); - this.OnStartDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndDate", DbType="DateTime")] - public System.Nullable EndDate - { - get - { - return this._EndDate; - } - set - { - if ((this._EndDate != value)) - { - this.OnEndDateChanging(value); - this.SendPropertyChanging(); - this._EndDate = value; - this.SendPropertyChanged("EndDate"); - this.OnEndDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalHseManhoursYear", DbType="Int")] - public System.Nullable TotalHseManhoursYear - { - get - { - return this._TotalHseManhoursYear; - } - set - { - if ((this._TotalHseManhoursYear != value)) - { - this.OnTotalHseManhoursYearChanging(value); - this.SendPropertyChanging(); - this._TotalHseManhoursYear = value; - this.SendPropertyChanged("TotalHseManhoursYear"); - this.OnTotalHseManhoursYearChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthHdangerCount", DbType="Int")] public System.Nullable MonthHdangerCount { @@ -250048,6 +250236,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartDate", DbType="DateTime")] + public System.Nullable StartDate + { + get + { + return this._StartDate; + } + set + { + if ((this._StartDate != value)) + { + this.OnStartDateChanging(value); + this.SendPropertyChanging(); + this._StartDate = value; + this.SendPropertyChanged("StartDate"); + this.OnStartDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndDate", DbType="DateTime")] + public System.Nullable EndDate + { + get + { + return this._EndDate; + } + set + { + if ((this._EndDate != value)) + { + this.OnEndDateChanging(value); + this.SendPropertyChanging(); + this._EndDate = value; + this.SendPropertyChanged("EndDate"); + this.OnEndDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalHseManhoursYear", DbType="Int")] + public System.Nullable TotalHseManhoursYear + { + get + { + return this._TotalHseManhoursYear; + } + set + { + if ((this._TotalHseManhoursYear != value)) + { + this.OnTotalHseManhoursYearChanging(value); + this.SendPropertyChanging(); + this._TotalHseManhoursYear = value; + this.SendPropertyChanged("TotalHseManhoursYear"); + this.OnTotalHseManhoursYearChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_AccidentCSort_Manager_MonthReport", Storage="_Manager_AccidentSortC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_AccidentSortC { @@ -250230,6 +250478,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligations + { + get + { + return this._Manager_Month_ComplianceObligations; + } + set + { + this._Manager_Month_ComplianceObligations.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -250811,6 +251072,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -279505,7 +279778,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -279519,18 +279792,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + + private string _SubInspectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -279547,8 +279822,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -279561,18 +279836,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -279700,22 +279977,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId { get { - return this._SubInspectId; + return this._QuestionTechnologyId; } set { - if ((this._SubInspectId != value)) + if ((this._QuestionTechnologyId != value)) { - this.OnSubInspectIdChanging(value); + this.OnQuestionTechnologyIdChanging(value); this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); } } } @@ -279840,26 +280117,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -279880,26 +280137,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -279960,6 +280197,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -280001,14 +280298,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -280027,14 +280324,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -280182,26 +280479,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -280262,6 +280539,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -281194,7 +281491,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -281317,6 +281614,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -281325,6 +281628,12 @@ namespace Model private string _Owner; + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -281335,9 +281644,7 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; + private System.Nullable _WanderIsComplete; private System.Nullable _SubcontractorAllPassData; @@ -281347,35 +281654,25 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderIsComplete; - private System.Nullable _WanderCompleteData; + private System.Nullable _WorkPackType; + private System.Nullable _IsSiteImplement; - private string _SiteImplementUser; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - private System.Nullable _InspectIsClose; - private string _InspectIsCloseUser; - private System.Nullable _InspectCloseData; - private System.Nullable _IsUnifyWanderAbout; + private string _InspectIsCloseUser; - private System.Nullable _UnifyWanderAboutData; + private string _PropertyTechnologyId; - private string _UnifyWanderAboutOpinion; + private System.Nullable _RecordUploadData; - private System.Nullable _InspectTime; + private System.Nullable _SiteImplementConfirmData; - private string _AddUser; - - private System.Nullable _AddTime; + private string _SiteImplementUser; #region 可扩展性方法定义 partial void OnLoaded(); @@ -281397,6 +281694,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -281405,6 +281708,12 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -281415,10 +281724,8 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -281427,36 +281734,26 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); partial void OnInspectCloseDataChanging(System.Nullable value); partial void OnInspectCloseDataChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); #endregion public PreRun_SubInspectTerm() @@ -281624,6 +281921,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -281704,6 +282061,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -281804,42 +282221,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete { get { - return this._WorkPackType; + return this._WanderIsComplete; } set { - if ((this._WorkPackType != value)) + if ((this._WanderIsComplete != value)) { - this.OnWorkPackTypeChanging(value); + this.OnWanderIsCompleteChanging(value); this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); } } } @@ -281924,26 +282321,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete - { - get - { - return this._WanderIsComplete; - } - set - { - if ((this._WanderIsComplete != value)) - { - this.OnWanderIsCompleteChanging(value); - this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -281964,6 +282341,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -281984,66 +282381,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] public System.Nullable InspectIsClose { @@ -282064,26 +282401,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] public System.Nullable InspectCloseData { @@ -282104,122 +282421,102 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] + public string InspectIsCloseUser { get { - return this._IsUnifyWanderAbout; + return this._InspectIsCloseUser; } set { - if ((this._IsUnifyWanderAbout != value)) + if ((this._InspectIsCloseUser != value)) { - this.OnIsUnifyWanderAboutChanging(value); + this.OnInspectIsCloseUserChanging(value); this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] + public string PropertyTechnologyId { get { - return this._UnifyWanderAboutData; + return this._PropertyTechnologyId; } set { - if ((this._UnifyWanderAboutData != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnUnifyWanderAboutDataChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._UnifyWanderAboutOpinion; + return this._RecordUploadData; } set { - if ((this._UnifyWanderAboutOpinion != value)) + if ((this._RecordUploadData != value)) { - this.OnUnifyWanderAboutOpinionChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData { get { - return this._InspectTime; + return this._SiteImplementConfirmData; } set { - if ((this._InspectTime != value)) + if ((this._SiteImplementConfirmData != value)) { - this.OnInspectTimeChanging(value); + this.OnSiteImplementConfirmDataChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] + public string SiteImplementUser { get { - return this._AddUser; + return this._SiteImplementUser; } set { - if ((this._AddUser != value)) + if ((this._SiteImplementUser != value)) { - this.OnAddUserChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -282287,22 +282584,6 @@ namespace Model private string _Owner; - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -282315,6 +282596,22 @@ namespace Model private System.Nullable _Sort; + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -282355,22 +282652,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -282383,6 +282664,22 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -282750,166 +283047,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -282930,7 +283067,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] public string PropertyTechnologyId { get @@ -283030,6 +283167,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -284031,8 +284328,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -284043,11 +284338,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -284063,6 +284356,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -284099,8 +284396,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -284111,12 +284406,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -284131,6 +284424,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -284440,26 +284737,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -284560,26 +284837,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -284600,22 +284857,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -284760,6 +285017,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -285472,7 +285769,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -286436,6 +286733,10 @@ namespace Model private string _AttachUrl2; + private string _ChildUnitWorkId; + + private string _ChildBranch; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -286496,6 +286797,10 @@ namespace Model partial void OnFileTypeChanged(); partial void OnAttachUrl2Changing(string value); partial void OnAttachUrl2Changed(); + partial void OnChildUnitWorkIdChanging(string value); + partial void OnChildUnitWorkIdChanged(); + partial void OnChildBranchChanging(string value); + partial void OnChildBranchChanged(); #endregion public ProcessControl_InspectionManagement() @@ -286969,6 +287274,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChildUnitWorkId", DbType="NVarChar(50)")] + public string ChildUnitWorkId + { + get + { + return this._ChildUnitWorkId; + } + set + { + if ((this._ChildUnitWorkId != value)) + { + this.OnChildUnitWorkIdChanging(value); + this.SendPropertyChanging(); + this._ChildUnitWorkId = value; + this.SendPropertyChanged("ChildUnitWorkId"); + this.OnChildUnitWorkIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChildBranch", DbType="NVarChar(50)")] + public string ChildBranch + { + get + { + return this._ChildBranch; + } + set + { + if ((this._ChildBranch != value)) + { + this.OnChildBranchChanging(value); + this.SendPropertyChanging(); + this._ChildBranch = value; + this.SendPropertyChanged("ChildBranch"); + this.OnChildBranchChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -321293,6 +321638,164 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] + public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ReportId; + + private string _ReType; + + private string _UnitName; + + private string _ProblemDes; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnReportIdChanging(string value); + partial void OnReportIdChanged(); + partial void OnReTypeChanging(string value); + partial void OnReTypeChanged(); + partial void OnUnitNameChanging(string value); + partial void OnUnitNameChanged(); + partial void OnProblemDesChanging(string value); + partial void OnProblemDesChanged(); + #endregion + + public Report_CQMS_ProblemHandle() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")] + public string ReportId + { + get + { + return this._ReportId; + } + set + { + if ((this._ReportId != value)) + { + this.OnReportIdChanging(value); + this.SendPropertyChanging(); + this._ReportId = value; + this.SendPropertyChanged("ReportId"); + this.OnReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")] + public string ReType + { + get + { + return this._ReType; + } + set + { + if ((this._ReType != value)) + { + this.OnReTypeChanging(value); + this.SendPropertyChanging(); + this._ReType = value; + this.SendPropertyChanged("ReType"); + this.OnReTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this.OnUnitNameChanging(value); + this.SendPropertyChanging(); + this._UnitName = value; + this.SendPropertyChanged("UnitName"); + this.OnUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] + public string ProblemDes + { + get + { + return this._ProblemDes; + } + set + { + if ((this._ProblemDes != value)) + { + this.OnProblemDesChanging(value); + this.SendPropertyChanging(); + this._ProblemDes = value; + this.SendPropertyChanged("ProblemDes"); + this.OnProblemDesChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged { @@ -343116,7 +343619,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CsUsers", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CsUsers", DbType="NVarChar(2000)")] public string CsUsers { get @@ -358736,8 +359239,6 @@ namespace Model private EntitySet _Doc_DocManage; - private EntitySet _Doc_DocManageApprove; - private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -359468,7 +359969,6 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); - this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -361912,19 +362412,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManageApprove - { - get - { - return this._Doc_DocManageApprove; - } - set - { - this._Doc_DocManageApprove.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -366519,18 +367006,6 @@ namespace Model entity.Sys_User = null; } - private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging(); @@ -373900,6 +374375,8 @@ namespace Model private System.Nullable _IsBuiltIn; + private EntitySet _Check_CheckSpecial; + private EntitySet _Technique_CheckItemDetail; #region 可扩展性方法定义 @@ -373926,6 +374403,7 @@ namespace Model public Technique_CheckItemSet() { + this._Check_CheckSpecial = new EntitySet(new Action(this.attach_Check_CheckSpecial), new Action(this.detach_Check_CheckSpecial)); this._Technique_CheckItemDetail = new EntitySet(new Action(this.attach_Technique_CheckItemDetail), new Action(this.detach_Technique_CheckItemDetail)); OnCreated(); } @@ -374090,6 +374568,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] + public EntitySet Check_CheckSpecial + { + get + { + return this._Check_CheckSpecial; + } + set + { + this._Check_CheckSpecial.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] public EntitySet Technique_CheckItemDetail { @@ -374123,6 +374614,18 @@ namespace Model } } + private void attach_Check_CheckSpecial(Check_CheckSpecial entity) + { + this.SendPropertyChanging(); + entity.Technique_CheckItemSet = this; + } + + private void detach_Check_CheckSpecial(Check_CheckSpecial entity) + { + this.SendPropertyChanging(); + entity.Technique_CheckItemSet = null; + } + private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity) { this.SendPropertyChanging(); @@ -397900,8 +398403,12 @@ namespace Model private string _Comments; + private string _Num_NO; + private string _System_No; + private string _Sub_Sys_No; + private string _Cat; private string _Raised_By; @@ -397922,6 +398429,8 @@ namespace Model private string _PIC_WUH; + private string _Correction_Action; + private System.Nullable _Actual_Date; private string _Cleared_By; @@ -397940,12 +398449,6 @@ namespace Model private string _Remark; - private string _Sub_Sys_No; - - private string _Num_NO; - - private string _Correction_Action; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -397982,8 +398485,12 @@ namespace Model partial void OnPUNCH_ITEM_STATUSChanged(); partial void OnCommentsChanging(string value); partial void OnCommentsChanged(); + partial void OnNum_NOChanging(string value); + partial void OnNum_NOChanged(); partial void OnSystem_NoChanging(string value); partial void OnSystem_NoChanged(); + partial void OnSub_Sys_NoChanging(string value); + partial void OnSub_Sys_NoChanged(); partial void OnCatChanging(string value); partial void OnCatChanged(); partial void OnRaised_ByChanging(string value); @@ -398004,6 +398511,8 @@ namespace Model partial void OnPICChanged(); partial void OnPIC_WUHChanging(string value); partial void OnPIC_WUHChanged(); + partial void OnCorrection_ActionChanging(string value); + partial void OnCorrection_ActionChanged(); partial void OnActual_DateChanging(System.Nullable value); partial void OnActual_DateChanged(); partial void OnCleared_ByChanging(string value); @@ -398022,12 +398531,6 @@ namespace Model partial void OnStatusChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); - partial void OnSub_Sys_NoChanging(string value); - partial void OnSub_Sys_NoChanged(); - partial void OnNum_NOChanging(string value); - partial void OnNum_NOChanged(); - partial void OnCorrection_ActionChanging(string value); - partial void OnCorrection_ActionChanged(); #endregion public Transfer_PunchlistFrom() @@ -398355,6 +398858,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")] + public string Num_NO + { + get + { + return this._Num_NO; + } + set + { + if ((this._Num_NO != value)) + { + this.OnNum_NOChanging(value); + this.SendPropertyChanging(); + this._Num_NO = value; + this.SendPropertyChanged("Num_NO"); + this.OnNum_NOChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")] public string System_No { @@ -398375,6 +398898,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] + public string Sub_Sys_No + { + get + { + return this._Sub_Sys_No; + } + set + { + if ((this._Sub_Sys_No != value)) + { + this.OnSub_Sys_NoChanging(value); + this.SendPropertyChanging(); + this._Sub_Sys_No = value; + this.SendPropertyChanged("Sub_Sys_No"); + this.OnSub_Sys_NoChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")] public string Cat { @@ -398575,6 +399118,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")] + public string Correction_Action + { + get + { + return this._Correction_Action; + } + set + { + if ((this._Correction_Action != value)) + { + this.OnCorrection_ActionChanging(value); + this.SendPropertyChanging(); + this._Correction_Action = value; + this.SendPropertyChanged("Correction_Action"); + this.OnCorrection_ActionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")] public System.Nullable Actual_Date { @@ -398755,66 +399318,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] - public string Sub_Sys_No - { - get - { - return this._Sub_Sys_No; - } - set - { - if ((this._Sub_Sys_No != value)) - { - this.OnSub_Sys_NoChanging(value); - this.SendPropertyChanging(); - this._Sub_Sys_No = value; - this.SendPropertyChanged("Sub_Sys_No"); - this.OnSub_Sys_NoChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")] - public string Num_NO - { - get - { - return this._Num_NO; - } - set - { - if ((this._Num_NO != value)) - { - this.OnNum_NOChanging(value); - this.SendPropertyChanging(); - this._Num_NO = value; - this.SendPropertyChanged("Num_NO"); - this.OnNum_NOChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")] - public string Correction_Action - { - get - { - return this._Correction_Action; - } - set - { - if ((this._Correction_Action != value)) - { - this.OnCorrection_ActionChanging(value); - this.SendPropertyChanging(); - this._Correction_Action = value; - this.SendPropertyChanged("Correction_Action"); - this.OnCorrection_ActionChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;