From c13283b8e182cf77cfb985dbd4fdc4ab3c05bf40 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 1 Aug 2023 17:28:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-08-01.sql | 38 ++++ .../CQMS/WBS/ControlItemAndCycleService.cs | 1 + SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 168 +++++++++++++++++- SGGL/BLL/ProjectData/UnitWorkService.cs | 2 + .../CQMS/Check/EditSpotCheck.aspx.cs | 21 ++- .../CQMS/WBS/WorkPackageSet1.aspx.cs | 2 + .../CQMS/WBS/WorkPackageSet2.aspx.cs | 2 + SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx | 13 ++ SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs | 71 +++----- .../JDGL/Check/PlanSet.aspx.designer.cs | 18 ++ SGGL/Model/Model.cs | 146 ++++++++++++++- 11 files changed, 427 insertions(+), 55 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-08-01.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-01.sql b/DataBase/版本日志/SGGLDB_V2023-08-01.sql new file mode 100644 index 00000000..3756c1b4 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-08-01.sql @@ -0,0 +1,38 @@ +alter table [dbo].[WBS_WorkPackage] add PlanCost decimal(18,2) null +GO +alter table [dbo].[WBS_WorkPackage] add JDWeights decimal(9,2) null +GO +alter table [dbo].[WBS_WorkPackage] add PreWorkCode nvarchar(50) null +GO + +alter table [dbo].[WBS_UnitWork] add PlanCost decimal(18,2) null +GO +alter table [dbo].[WBS_UnitWork] add JDWeights decimal(9,2) null +GO +alter table [dbo].[WBS_ControlItemAndCycle] add RealEndDate datetime null +GO + +ALTER VIEW [dbo].[View_WBS] +AS +select '1' as Id,'0' as SupId ,'JZ' as Code, '' as Name,'ProjectType' as WBSType, +ProjectId from dbo.WBS_UnitWork +Union +select '2' as Id,'0' as SupId ,'AZ' as Code, 'װ' as Name,'ProjectType' as WBSType, +ProjectId from dbo.WBS_UnitWork +Union +select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType, +ProjectId from dbo.WBS_UnitWork +Union all +select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null +Union all +select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null + + + + + +GO + + diff --git a/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs b/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs index 63d63d58..3bd3e464 100644 --- a/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs +++ b/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs @@ -99,6 +99,7 @@ namespace BLL newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate; newControlItemAndCycle.Costs = ControlItemAndCycle.Costs; newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType; + newControlItemAndCycle.RealEndDate = ControlItemAndCycle.RealEndDate; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 644354cb..6a9a7529 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -73,6 +73,9 @@ namespace BLL newWorkPackage.RealEndDate = WorkPackage.RealEndDate; newWorkPackage.Unit = WorkPackage.Unit; newWorkPackage.IsMileStone = WorkPackage.IsMileStone; + newWorkPackage.PlanCost = WorkPackage.PlanCost; + newWorkPackage.JDWeights = WorkPackage.JDWeights; + newWorkPackage.PreWorkCode = WorkPackage.PreWorkCode; db.SubmitChanges(); } @@ -266,6 +269,8 @@ namespace BLL table.Columns.Add(new DataColumn("RealStartDate", typeof(DateTime))); table.Columns.Add(new DataColumn("RealEndDate", typeof(DateTime))); table.Columns.Add(new DataColumn("IsMileStone", typeof(bool))); + table.Columns.Add(new DataColumn("PlanCost", typeof(String))); + table.Columns.Add(new DataColumn("PreWorkCode", typeof(String))); if (getWBSs.Count() > 0) { List newList = new List(); @@ -293,9 +298,9 @@ namespace BLL var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id); if (workPackage != null) { - if (workPackage.Weights != null) + if (workPackage.JDWeights != null) { - row[6] = decimal.Round(Convert.ToDecimal(workPackage.Weights), 2); + row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2); } row[7] = workPackage.Unit; if (workPackage.PlanProjectQuantity != null) @@ -326,6 +331,11 @@ namespace BLL { row[14] = workPackage.IsMileStone; } + if (workPackage.PlanCost != null) + { + row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2); + } + row[16] = workPackage.PreWorkCode; } } } @@ -334,6 +344,10 @@ namespace BLL var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == item.Id); if (unitWork != null) { + if (unitWork.JDWeights != null) + { + row[6] = decimal.Round(Convert.ToDecimal(unitWork.JDWeights), 2); + } if (unitWork.PlanStartDate != null) { row[10] = unitWork.PlanStartDate; @@ -350,6 +364,10 @@ namespace BLL { row[13] = unitWork.RealEndDate; } + if (unitWork.PlanCost != null) + { + row[15] = decimal.Round(Convert.ToDecimal(unitWork.PlanCost), 2); + } } } table.Rows.Add(row); @@ -368,5 +386,151 @@ namespace BLL AddDetail(newList, oldList, item.Id); } } + + #region 更新工作包、工作项 + /// + /// 更新月工作包、工作项 + /// + /// + /// + /// + /// + public static void UpdateWorkPackages(Model.SGGLDB db, Model.WBS_WorkPackage workPackage, DateTime? planStartDate, DateTime? planEndDate, DateTime? realStartDate, DateTime? realEndDate) + { + if (workPackage != null) + { + Model.WBS_WorkPackage parentWorkPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(workPackage.SuperWorkPackageId); + if (parentWorkPackage != null) + { + if (planStartDate != null) + { + if (parentWorkPackage.PlanStartDate == null) + { + parentWorkPackage.PlanStartDate = planStartDate; + } + else + { + if (parentWorkPackage.PlanStartDate > planStartDate) + { + parentWorkPackage.PlanStartDate = planStartDate; + } + } + } + if (planEndDate != null) + { + if (parentWorkPackage.PlanEndDate == null) + { + parentWorkPackage.PlanEndDate = planEndDate; + } + else + { + if (parentWorkPackage.PlanEndDate < planEndDate) + { + parentWorkPackage.PlanEndDate = planEndDate; + } + } + } + if (realStartDate != null) + { + if (parentWorkPackage.RealStartDate == null) + { + parentWorkPackage.RealStartDate = realStartDate; + } + else + { + if (parentWorkPackage.RealStartDate > realStartDate) + { + parentWorkPackage.RealStartDate = realStartDate; + } + } + } + if (realEndDate != null) + { + if (parentWorkPackage.RealEndDate == null) + { + parentWorkPackage.RealEndDate = realEndDate; + } + else + { + if (parentWorkPackage.RealEndDate < realEndDate) + { + parentWorkPackage.RealEndDate = realEndDate; + } + } + } + UpdateWorkPackages(db, parentWorkPackage, planStartDate, planEndDate, realStartDate, realEndDate); + } + } + } + #endregion + + /// + /// 更新分部分项工程实际完成时间 + /// + /// + public static void UpdateWorkPackageRealEndDate(string workPackageId) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + var controlItemAndCycles = from x in db.WBS_ControlItemAndCycle where x.WorkPackageId == workPackageId && x.IsApprove == true select x; + var spotCheckDetails = from x in db.Check_SpotCheckDetail where x.IsOK == true select x; + bool b = true; + if (controlItemAndCycles.Count() > 0) + { + foreach (var c in controlItemAndCycles) + { + if (c.CheckNum != null && c.CheckNum != 0) //检查次数为0表示一直检查 + { + var okSpotCheckDetails = spotCheckDetails.Where(x => x.ControlItemAndCycleId == c.ControlItemAndCycleId); + if (okSpotCheckDetails.Count() != c.CheckNum) + { + b = false; + break; + } + } + else + { + b = false; + break; + } + } + if (b) + { + var LastEndControlItemAndCycle = controlItemAndCycles.OrderByDescending(x => x.RealEndDate).FirstOrDefault(); + if (LastEndControlItemAndCycle != null) + { + var workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == LastEndControlItemAndCycle.WorkPackageId); + if (workPackage != null) + { + workPackage.RealEndDate = LastEndControlItemAndCycle.RealEndDate; + UpdateWorkPackages(db, workPackage, null, null, null, workPackage.RealEndDate); + db.SubmitChanges(); + var unitWork = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); + //获取是否存在其他未完成的分部分项 + var notEndOthenWorkPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.UnitWorkId == unitWork.UnitWorkId && x.IsApprove == true && x.RealEndDate == null); + if (notEndOthenWorkPackage == null) + { + if (workPackage.RealEndDate != null) + { + if (unitWork.RealEndDate == null) + { + unitWork.RealEndDate = workPackage.RealEndDate; + } + else + { + if (unitWork.RealEndDate < workPackage.RealEndDate) + { + unitWork.RealEndDate = workPackage.RealEndDate; + } + } + } + } + } + } + db.SubmitChanges(); + } + } + } + } } } diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index 92425604..5b75b8bd 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -62,6 +62,8 @@ namespace BLL newUnitWork.PlanEndDate = UnitWork.PlanEndDate; newUnitWork.RealStartDate = UnitWork.RealStartDate; newUnitWork.RealEndDate = UnitWork.RealEndDate; + newUnitWork.PlanCost = UnitWork.PlanCost; + newUnitWork.JDWeights = UnitWork.JDWeights; db.SubmitChanges(); } GetWeights(UnitWork.ProjectId); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs index 6fd8a683..d999a89d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs @@ -972,7 +972,26 @@ namespace FineUIPro.Web.CQMS.Check if (!string.IsNullOrEmpty(c.HGForms) || !string.IsNullOrEmpty(c.SHForms)) { isExitForms = true; - break; + } + //处理工作包实际完成时间 + if (c.CheckNum != null && c.CheckNum != 0) //检查次数为0表示一直检查 + { + if (c.CheckNum == 1) //检查一次 + { + c.RealEndDate = DateTime.Now; + BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c); + BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId); + } + else //检查多次 + { + List details = BLL.SpotCheckDetailService.GetSpotCheckDetailsByControlItemAndCycleId(c.ControlItemAndCycleId); + if (details.Count == c.CheckNum) //检查次数已达到最大值 + { + c.RealEndDate = DateTime.Now; + BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c); + BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId); + } + } } } } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs index e93f7091..5dc96655 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs @@ -567,6 +567,7 @@ namespace FineUIPro.Web.CQMS.WBS } else { + oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode; oldWorkPackage.PackageContent = workPackageProject.PackageContent + name; oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage); @@ -670,6 +671,7 @@ namespace FineUIPro.Web.CQMS.WBS } else { + oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode; oldWorkPackage.PackageContent = workPackageProject.PackageContent + name; oldWorkPackage.IsApprove = true; oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs index 5ab4ed30..1a87f7f1 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs @@ -599,6 +599,7 @@ namespace FineUIPro.Web.CQMS.WBS } else { + oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode; oldWorkPackage.PackageContent = workPackageProject.PackageContent + name; oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage); @@ -699,6 +700,7 @@ namespace FineUIPro.Web.CQMS.WBS } else { + oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode; oldWorkPackage.PackageContent = workPackageProject.PackageContent + name; oldWorkPackage.IsApprove = true; oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value("SubItemType")); diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx index 6dc22446..98132d3a 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx @@ -40,6 +40,12 @@ <%----%> + + + + + @@ -67,6 +73,9 @@ + + @@ -91,6 +100,10 @@ + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs index 4a5bbd46..fba96f7f 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs @@ -104,6 +104,8 @@ namespace FineUIPro.Web.JDGL.Check string realProjectQuantity = values.Value("RealProjectQuantity"); string planStartDate = values.Value("PlanStartDate"); string planEndDate = values.Value("PlanEndDate"); + string realStartDate = values.Value("RealStartDate"); + string preWorkCode = values.Value("PreWorkCode"); System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone")); workPackage.Weights = Funs.GetNewDecimal(weights); workPackage.Unit = unit; @@ -111,11 +113,13 @@ namespace FineUIPro.Web.JDGL.Check workPackage.RealProjectQuantity = Funs.GetNewDecimal(realProjectQuantity); workPackage.PlanStartDate = Funs.GetNewDateTime(planStartDate); workPackage.PlanEndDate = Funs.GetNewDateTime(planEndDate); + workPackage.RealStartDate = Funs.GetNewDateTime(realStartDate); workPackage.IsMileStone = cbIsMileStone.Checked; + workPackage.PreWorkCode = preWorkCode; BLL.WorkPackageService.UpdateWorkPackage(workPackage); - if (workPackage.PlanStartDate != null || workPackage.PlanEndDate != null) + if (workPackage.PlanStartDate != null || workPackage.PlanEndDate != null || workPackage.RealStartDate != null) { - UpdateWorkPackages(db, workPackage, workPackage.PlanStartDate, workPackage.PlanEndDate); + BLL.WorkPackageService.UpdateWorkPackages(db, workPackage, workPackage.PlanStartDate, workPackage.PlanEndDate, workPackage.RealStartDate, null); var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); if (workPackage.PlanStartDate != null) { @@ -145,6 +149,20 @@ namespace FineUIPro.Web.JDGL.Check } } } + if (workPackage.RealStartDate != null) + { + if (unitWork.RealStartDate == null) + { + unitWork.RealStartDate = workPackage.RealStartDate; + } + else + { + if (unitWork.RealStartDate > workPackage.RealStartDate) + { + unitWork.RealStartDate = workPackage.RealStartDate; + } + } + } } db.SubmitChanges(); } @@ -152,55 +170,6 @@ namespace FineUIPro.Web.JDGL.Check } } } - - #region 更新工作包、工作项 - /// - /// 更新月工作包、工作项 - /// - /// - /// - /// - /// - private void UpdateWorkPackages(Model.SGGLDB db, Model.WBS_WorkPackage workPackage, DateTime? planStartDate, DateTime? planEndDate) - { - if (workPackage != null) - { - Model.WBS_WorkPackage parentWorkPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(workPackage.SuperWorkPackageId); - if (parentWorkPackage != null) - { - if (planStartDate != null) - { - if (parentWorkPackage.PlanStartDate == null) - { - parentWorkPackage.PlanStartDate = planStartDate; - } - else - { - if (parentWorkPackage.PlanStartDate > planStartDate) - { - parentWorkPackage.PlanStartDate = planStartDate; - } - } - } - if (planEndDate != null) - { - if (parentWorkPackage.PlanEndDate == null) - { - parentWorkPackage.PlanEndDate = planEndDate; - } - else - { - if (parentWorkPackage.PlanEndDate < planEndDate) - { - parentWorkPackage.PlanEndDate = planEndDate; - } - } - } - UpdateWorkPackages(db, parentWorkPackage, planStartDate, planEndDate); - } - } - } - #endregion #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs index 7cab4891..656badf1 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs @@ -75,6 +75,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.Button btnSave; + /// + /// txtPreWorkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPreWorkCode; + /// /// IsMileStone 控件。 /// @@ -146,5 +155,14 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtPlanEndDate; + + /// + /// txtRealStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRealStartDate; } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 8b5f4777..df42c444 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -287846,7 +287846,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] public string Name { get @@ -289894,6 +289894,8 @@ namespace Model private string _CheckAcceptType; + private System.Nullable _RealEndDate; + private EntityRef _WBS_WorkPackage; #region 可扩展性方法定义 @@ -289940,6 +289942,8 @@ namespace Model partial void OnCostsChanged(); partial void OnCheckAcceptTypeChanging(string value); partial void OnCheckAcceptTypeChanged(); + partial void OnRealEndDateChanging(System.Nullable value); + partial void OnRealEndDateChanged(); #endregion public WBS_ControlItemAndCycle() @@ -290352,6 +290356,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealEndDate", DbType="DateTime")] + public System.Nullable RealEndDate + { + get + { + return this._RealEndDate; + } + set + { + if ((this._RealEndDate != value)) + { + this.OnRealEndDateChanging(value); + this.SendPropertyChanging(); + this._RealEndDate = value; + this.SendPropertyChanged("RealEndDate"); + this.OnRealEndDateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] public WBS_WorkPackage WBS_WorkPackage { @@ -291511,6 +291535,10 @@ namespace Model private System.Nullable _RealEndDate; + private System.Nullable _PlanCost; + + private System.Nullable _JDWeights; + private EntitySet _Accident_AccidentPersonRecord; private EntitySet _Accident_AccidentReport; @@ -291597,6 +291625,10 @@ namespace Model partial void OnRealStartDateChanged(); partial void OnRealEndDateChanging(System.Nullable value); partial void OnRealEndDateChanged(); + partial void OnPlanCostChanging(System.Nullable value); + partial void OnPlanCostChanged(); + partial void OnJDWeightsChanging(System.Nullable value); + partial void OnJDWeightsChanged(); #endregion public WBS_UnitWork() @@ -291980,6 +292012,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(18,2)")] + public System.Nullable PlanCost + { + get + { + return this._PlanCost; + } + set + { + if ((this._PlanCost != value)) + { + this.OnPlanCostChanging(value); + this.SendPropertyChanging(); + this._PlanCost = value; + this.SendPropertyChanged("PlanCost"); + this.OnPlanCostChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JDWeights", DbType="Decimal(9,2)")] + public System.Nullable JDWeights + { + get + { + return this._JDWeights; + } + set + { + if ((this._JDWeights != value)) + { + this.OnJDWeightsChanging(value); + this.SendPropertyChanging(); + this._JDWeights = value; + this.SendPropertyChanged("JDWeights"); + this.OnJDWeightsChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_ProjectData_WorkArea", Storage="_Accident_AccidentPersonRecord", ThisKey="UnitWorkId", OtherKey="WorkAreaId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentPersonRecord { @@ -292688,6 +292760,12 @@ namespace Model private System.Nullable _IsMileStone; + private System.Nullable _PlanCost; + + private System.Nullable _JDWeights; + + private string _PreWorkCode; + private EntitySet _WBS_ControlItemAndCycle; private EntityRef _WBS_UnitWork; @@ -292750,6 +292828,12 @@ namespace Model partial void OnUnitChanged(); partial void OnIsMileStoneChanging(System.Nullable value); partial void OnIsMileStoneChanged(); + partial void OnPlanCostChanging(System.Nullable value); + partial void OnPlanCostChanged(); + partial void OnJDWeightsChanging(System.Nullable value); + partial void OnJDWeightsChanged(); + partial void OnPreWorkCodeChanging(string value); + partial void OnPreWorkCodeChanged(); #endregion public WBS_WorkPackage() @@ -293303,6 +293387,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(18,2)")] + public System.Nullable PlanCost + { + get + { + return this._PlanCost; + } + set + { + if ((this._PlanCost != value)) + { + this.OnPlanCostChanging(value); + this.SendPropertyChanging(); + this._PlanCost = value; + this.SendPropertyChanged("PlanCost"); + this.OnPlanCostChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JDWeights", DbType="Decimal(9,2)")] + public System.Nullable JDWeights + { + get + { + return this._JDWeights; + } + set + { + if ((this._JDWeights != value)) + { + this.OnJDWeightsChanging(value); + this.SendPropertyChanging(); + this._JDWeights = value; + this.SendPropertyChanged("JDWeights"); + this.OnJDWeightsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PreWorkCode", DbType="NVarChar(50)")] + public string PreWorkCode + { + get + { + return this._PreWorkCode; + } + set + { + if ((this._PreWorkCode != value)) + { + this.OnPreWorkCodeChanging(value); + this.SendPropertyChanging(); + this._PreWorkCode = value; + this.SendPropertyChanged("PreWorkCode"); + this.OnPreWorkCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] public EntitySet WBS_ControlItemAndCycle {