From ee4e3fae13027859d6eb3872cba93b012db052ee Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Mon, 14 Jul 2025 15:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_2025-07-14-geh.sql | Bin 0 -> 2056 bytes SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs | 3 + .../Information/ActionWorkLedgerService.cs | 3 + .../ZHGL/Information/ActionWorkLedger.aspx | 16 +- .../ZHGL/Information/ActionWorkLedger.aspx.cs | 15 + .../ActionWorkLedger.aspx.designer.cs | 36 ++ .../ZHGL/Information/ActionWorkLedgerAdd.aspx | 9 + .../Information/ActionWorkLedgerAdd.aspx.cs | 27 + .../ActionWorkLedgerAdd.aspx.designer.cs | 27 + .../MillionsMonthlyReportSave.aspx.cs | 79 ++- .../Model/APIItem/CNCEC/ActionWorkLedger.cs | 18 + SUBQHSE/Model/Model.cs | 571 ++++++++++++++++++ 12 files changed, 799 insertions(+), 5 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_2025-07-14-geh.sql diff --git a/DataBase/版本日志/SGGLDB_2025-07-14-geh.sql b/DataBase/版本日志/SGGLDB_2025-07-14-geh.sql new file mode 100644 index 0000000000000000000000000000000000000000..34195eae716e951cf3c297a3b1653c0ff743719f GIT binary patch literal 2056 zcmd6oTW=FF5QWbxNc;!CHHZ+kJn_P!*+gfkL{iaw+uB1K-$n_M*+E zst`hvvtD~VGv~~i_3vL}O*B`csT|L-&UjClx0UL%u2{chb*>BMsYcq-r{&vwzyDnw zPMqt@otH85b3DA|{Z`SYs|B7Mep1dm{ue}==!qWV|KH@$Bd7l*k7LiOF`ep$`4nEi z`e#Egw5g{hjtN<_I$*{TN>;OJ4P)MCkKHALjIg=0MW!wgD zmVMdc9Xd3N&;!+824L%BVSSL0d6l2n?55zd?pbGB)fv@Zi_(7oMHPOo6aR5My?(D@YyQ_gpX n%`%0CZ1Wl@?yX}lYBY9*DK|1zRB=_L{I@4`fW@mD<=f;B`~FIz literal 0 HcmV?d00001 diff --git a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs index bff7a49..5526d2c 100644 --- a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs +++ b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs @@ -7019,6 +7019,9 @@ Quarter = x.Quarter, YearId = x.YearId, CompileMan = x.CompileMan, + KeyWorkNum = x.KeyWorkNum, + KeyWorkOKNum = x.KeyWorkOKNum, + KeyWorkOKRate = x.KeyWorkOKRate, }; var upReportItem = from x in db.Information_ActionWorkLedgerItem diff --git a/SUBQHSE/BLL/ZHGL/Information/ActionWorkLedgerService.cs b/SUBQHSE/BLL/ZHGL/Information/ActionWorkLedgerService.cs index 603f472..ed3eb2c 100644 --- a/SUBQHSE/BLL/ZHGL/Information/ActionWorkLedgerService.cs +++ b/SUBQHSE/BLL/ZHGL/Information/ActionWorkLedgerService.cs @@ -81,6 +81,9 @@ namespace BLL newActionWorkLedger.UpState = ActionWorkLedger.UpState; newActionWorkLedger.HandleState = ActionWorkLedger.HandleState; newActionWorkLedger.HandleMan = ActionWorkLedger.HandleMan; + newActionWorkLedger.KeyWorkNum = ActionWorkLedger.KeyWorkNum; + newActionWorkLedger.KeyWorkOKNum = ActionWorkLedger.KeyWorkOKNum; + newActionWorkLedger.KeyWorkOKRate = ActionWorkLedger.KeyWorkOKRate; Funs.DB.SubmitChanges(); } } diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx index 6e2464f..a2d16bc 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx @@ -80,14 +80,26 @@ - + - + + + + + + + + + + + + protected global::FineUIPro.Label lbHandleMan; + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtKeyWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtKeyWorkNum; + + /// + /// txtKeyWorkOKNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtKeyWorkOKNum; + + /// + /// txtKeyWorkOKRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtKeyWorkOKRate; + /// /// Grid1 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx index 2e0c1dd..40f63ba 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx @@ -27,6 +27,15 @@ + + + + + + + + + 0) + { + rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%"; + } + this.txtKeyWorkOKRate.Text = rate; + } } } \ No newline at end of file diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs index ffe225d..97c972e 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs @@ -75,6 +75,33 @@ namespace FineUIPro.Web.ZHGL.Information { /// protected global::FineUIPro.DatePicker dpkCompileDate; + /// + /// txtKeyWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtKeyWorkNum; + + /// + /// txtKeyWorkOKNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtKeyWorkOKNum; + + /// + /// txtKeyWorkOKRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtKeyWorkOKRate; + /// /// Grid1 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs index 766268e..fa3c007 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs @@ -359,17 +359,90 @@ namespace FineUIPro.Web.ZHGL.Information protected void btnSave_Click(object sender, EventArgs e) { - Save("add"); + string err = AuditData(); + if (string.IsNullOrEmpty(err)) + { + Save("add"); + } + else + { + ShowNotify(err, MessageBoxIcon.Warning); + } } protected void btnUpdata_Click(object sender, EventArgs e) { - Save("updata"); + string err = AuditData(); + if (string.IsNullOrEmpty(err)) + { + Save("updata"); + } + else + { + ShowNotify(err, MessageBoxIcon.Warning); + } } protected void btnSubmit_Click(object sender, EventArgs e) { - Save("submit"); + string err = AuditData(); + if (string.IsNullOrEmpty(err)) + { + Save("submit"); + } + else + { + ShowNotify(err, MessageBoxIcon.Warning); + } + } + + private string AuditData() + { + string err = string.Empty; + Model.SUBQHSEDB db = Funs.DB; + var reports = from x in db.Information_MillionsMonthlyReport + where x.FillingDate < DateTime.Now + orderby x.FillingDate descending + select x; + if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId)) + { + reports = from x in reports + where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId + orderby x.FillingDate descending + select x; + } + var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList(); + //var items = from x in db.Information_MillionsMonthlyReportItem + // where reportIds.Contains(x.MillionsMonthlyReportId) + // select new { x.Name, x.TotalWorkNum }; + var items = from x in db.Information_MillionsMonthlyReportItem + where reportIds.Contains(x.MillionsMonthlyReportId) + select new { x.Name, x.TotalWorkNum }; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString())) + { + string name = values.Value("Name"); + decimal d = values.Value("TotalWorkNum"); + var list = items.Where(x => x.Name == name); + decimal a = 0; + if (list.Count() > 0) + { + foreach (var item in list) + { + a += item.TotalWorkNum ?? 0; + } + } + decimal b = a / list.Count(); + if (d > b * 5) + { + err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！"; + break; + } + } + } + return err; } #endregion diff --git a/SUBQHSE/Model/APIItem/CNCEC/ActionWorkLedger.cs b/SUBQHSE/Model/APIItem/CNCEC/ActionWorkLedger.cs index d54abd0..7501f62 100644 --- a/SUBQHSE/Model/APIItem/CNCEC/ActionWorkLedger.cs +++ b/SUBQHSE/Model/APIItem/CNCEC/ActionWorkLedger.cs @@ -40,5 +40,23 @@ namespace Model get; set; } + + public int? KeyWorkNum + { + get; + set; + } + + public int? KeyWorkOKNum + { + get; + set; + } + + public string KeyWorkOKRate + { + get; + set; + } } } diff --git a/SUBQHSE/Model/Model.cs b/SUBQHSE/Model/Model.cs index abed5fd..302d470 100644 --- a/SUBQHSE/Model/Model.cs +++ b/SUBQHSE/Model/Model.cs @@ -452,6 +452,9 @@ namespace Model partial void InsertCheck_ProjectLeaderCheck(Check_ProjectLeaderCheck instance); partial void UpdateCheck_ProjectLeaderCheck(Check_ProjectLeaderCheck instance); partial void DeleteCheck_ProjectLeaderCheck(Check_ProjectLeaderCheck instance); + partial void InsertCheck_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove instance); + partial void UpdateCheck_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove instance); + partial void DeleteCheck_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove instance); partial void InsertCheck_PunishNotice(Check_PunishNotice instance); partial void UpdateCheck_PunishNotice(Check_PunishNotice instance); partial void DeleteCheck_PunishNotice(Check_PunishNotice instance); @@ -4111,6 +4114,14 @@ namespace Model } } + public System.Data.Linq.Table Check_ProjectLeaderCheckApprove + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Check_PunishNotice { get @@ -78385,8 +78396,16 @@ namespace Model private System.Nullable _CompileDate; + private string _State; + + private string _RectificationSituation; + + private System.Nullable _RectificationDate; + private EntityRef _Base_Project; + private EntitySet _Check_ProjectLeaderCheckApprove; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -78415,11 +78434,18 @@ namespace Model partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); partial void OnCompileDateChanged(); + partial void OnStateChanging(string value); + partial void OnStateChanged(); + partial void OnRectificationSituationChanging(string value); + partial void OnRectificationSituationChanged(); + partial void OnRectificationDateChanging(System.Nullable value); + partial void OnRectificationDateChanged(); #endregion public Check_ProjectLeaderCheck() { this._Base_Project = default(EntityRef); + this._Check_ProjectLeaderCheckApprove = new EntitySet(new Action(this.attach_Check_ProjectLeaderCheckApprove), new Action(this.detach_Check_ProjectLeaderCheckApprove)); OnCreated(); } @@ -78667,6 +78693,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Char(1)")] + public string State + { + get + { + return this._State; + } + set + { + if ((this._State != value)) + { + this.OnStateChanging(value); + this.SendPropertyChanging(); + this._State = value; + this.SendPropertyChanged("State"); + this.OnStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationSituation", DbType="NVarChar(2000)")] + public string RectificationSituation + { + get + { + return this._RectificationSituation; + } + set + { + if ((this._RectificationSituation != value)) + { + this.OnRectificationSituationChanging(value); + this.SendPropertyChanging(); + this._RectificationSituation = value; + this.SendPropertyChanged("RectificationSituation"); + this.OnRectificationSituationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationDate", DbType="DateTime")] + public System.Nullable RectificationDate + { + get + { + return this._RectificationDate; + } + set + { + if ((this._RectificationDate != value)) + { + this.OnRectificationDateChanging(value); + this.SendPropertyChanging(); + this._RectificationDate = value; + this.SendPropertyChanged("RectificationDate"); + this.OnRectificationDateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ProjectLeaderCheck_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -78701,6 +78787,319 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ProjectLeaderCheckApprove_Check_ProjectLeaderCheck", Storage="_Check_ProjectLeaderCheckApprove", ThisKey="ProjectLeaderCheckId", OtherKey="ProjectLeaderCheckId", DeleteRule="NO ACTION")] + public EntitySet Check_ProjectLeaderCheckApprove + { + get + { + return this._Check_ProjectLeaderCheckApprove; + } + set + { + this._Check_ProjectLeaderCheckApprove.Assign(value); + } + } + + 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)); + } + } + + private void attach_Check_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove entity) + { + this.SendPropertyChanging(); + entity.Check_ProjectLeaderCheck = this; + } + + private void detach_Check_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove entity) + { + this.SendPropertyChanging(); + entity.Check_ProjectLeaderCheck = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Check_ProjectLeaderCheckApprove")] + public partial class Check_ProjectLeaderCheckApprove : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ProjectLeaderCheckApproveId; + + private string _ProjectLeaderCheckId; + + private string _ApproveMan; + + private System.Nullable _ApproveDate; + + private System.Nullable _IsAgree; + + private string _ApproveIdea; + + private string _ApproveType; + + private EntityRef _Check_ProjectLeaderCheck; + + private EntityRef _Sys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnProjectLeaderCheckApproveIdChanging(string value); + partial void OnProjectLeaderCheckApproveIdChanged(); + partial void OnProjectLeaderCheckIdChanging(string value); + partial void OnProjectLeaderCheckIdChanged(); + partial void OnApproveManChanging(string value); + partial void OnApproveManChanged(); + partial void OnApproveDateChanging(System.Nullable value); + partial void OnApproveDateChanged(); + partial void OnIsAgreeChanging(System.Nullable value); + partial void OnIsAgreeChanged(); + partial void OnApproveIdeaChanging(string value); + partial void OnApproveIdeaChanged(); + partial void OnApproveTypeChanging(string value); + partial void OnApproveTypeChanged(); + #endregion + + public Check_ProjectLeaderCheckApprove() + { + this._Check_ProjectLeaderCheck = default(EntityRef); + this._Sys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectLeaderCheckApproveId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ProjectLeaderCheckApproveId + { + get + { + return this._ProjectLeaderCheckApproveId; + } + set + { + if ((this._ProjectLeaderCheckApproveId != value)) + { + this.OnProjectLeaderCheckApproveIdChanging(value); + this.SendPropertyChanging(); + this._ProjectLeaderCheckApproveId = value; + this.SendPropertyChanged("ProjectLeaderCheckApproveId"); + this.OnProjectLeaderCheckApproveIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectLeaderCheckId", DbType="NVarChar(50)")] + public string ProjectLeaderCheckId + { + get + { + return this._ProjectLeaderCheckId; + } + set + { + if ((this._ProjectLeaderCheckId != value)) + { + if (this._Check_ProjectLeaderCheck.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectLeaderCheckIdChanging(value); + this.SendPropertyChanging(); + this._ProjectLeaderCheckId = value; + this.SendPropertyChanged("ProjectLeaderCheckId"); + this.OnProjectLeaderCheckIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + public string ApproveMan + { + get + { + return this._ApproveMan; + } + set + { + if ((this._ApproveMan != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnApproveManChanging(value); + this.SendPropertyChanging(); + this._ApproveMan = value; + this.SendPropertyChanged("ApproveMan"); + this.OnApproveManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveDate", DbType="DateTime")] + public System.Nullable ApproveDate + { + get + { + return this._ApproveDate; + } + set + { + if ((this._ApproveDate != value)) + { + this.OnApproveDateChanging(value); + this.SendPropertyChanging(); + this._ApproveDate = value; + this.SendPropertyChanged("ApproveDate"); + this.OnApproveDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAgree", DbType="Bit")] + public System.Nullable IsAgree + { + get + { + return this._IsAgree; + } + set + { + if ((this._IsAgree != value)) + { + this.OnIsAgreeChanging(value); + this.SendPropertyChanging(); + this._IsAgree = value; + this.SendPropertyChanged("IsAgree"); + this.OnIsAgreeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] + public string ApproveIdea + { + get + { + return this._ApproveIdea; + } + set + { + if ((this._ApproveIdea != value)) + { + this.OnApproveIdeaChanging(value); + this.SendPropertyChanging(); + this._ApproveIdea = value; + this.SendPropertyChanged("ApproveIdea"); + this.OnApproveIdeaChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Char(1)")] + public string 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.AssociationAttribute(Name="FK_Check_ProjectLeaderCheckApprove_Check_ProjectLeaderCheck", Storage="_Check_ProjectLeaderCheck", ThisKey="ProjectLeaderCheckId", OtherKey="ProjectLeaderCheckId", IsForeignKey=true)] + public Check_ProjectLeaderCheck Check_ProjectLeaderCheck + { + get + { + return this._Check_ProjectLeaderCheck.Entity; + } + set + { + Check_ProjectLeaderCheck previousValue = this._Check_ProjectLeaderCheck.Entity; + if (((previousValue != value) + || (this._Check_ProjectLeaderCheck.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Check_ProjectLeaderCheck.Entity = null; + previousValue.Check_ProjectLeaderCheckApprove.Remove(this); + } + this._Check_ProjectLeaderCheck.Entity = value; + if ((value != null)) + { + value.Check_ProjectLeaderCheckApprove.Add(this); + this._ProjectLeaderCheckId = value.ProjectLeaderCheckId; + } + else + { + this._ProjectLeaderCheckId = default(string); + } + this.SendPropertyChanged("Check_ProjectLeaderCheck"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ProjectLeaderCheckApprove_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.Check_ProjectLeaderCheckApprove.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.Check_ProjectLeaderCheckApprove.Add(this); + this._ApproveMan = value.UserId; + } + else + { + this._ApproveMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -215277,6 +215676,12 @@ namespace Model private string _HandleMan; + private System.Nullable _KeyWorkNum; + + private System.Nullable _KeyWorkOKNum; + + private string _KeyWorkOKRate; + private EntityRef _Base_Unit; private EntitySet _Information_ActionWorkLedgerItem; @@ -215303,6 +215708,12 @@ namespace Model partial void OnHandleStateChanged(); partial void OnHandleManChanging(string value); partial void OnHandleManChanged(); + partial void OnKeyWorkNumChanging(System.Nullable value); + partial void OnKeyWorkNumChanged(); + partial void OnKeyWorkOKNumChanging(System.Nullable value); + partial void OnKeyWorkOKNumChanged(); + partial void OnKeyWorkOKRateChanging(string value); + partial void OnKeyWorkOKRateChanged(); #endregion public Information_ActionWorkLedger() @@ -215496,6 +215907,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")] + public System.Nullable KeyWorkNum + { + get + { + return this._KeyWorkNum; + } + set + { + if ((this._KeyWorkNum != value)) + { + this.OnKeyWorkNumChanging(value); + this.SendPropertyChanging(); + this._KeyWorkNum = value; + this.SendPropertyChanged("KeyWorkNum"); + this.OnKeyWorkNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")] + public System.Nullable KeyWorkOKNum + { + get + { + return this._KeyWorkOKNum; + } + set + { + if ((this._KeyWorkOKNum != value)) + { + this.OnKeyWorkOKNumChanging(value); + this.SendPropertyChanging(); + this._KeyWorkOKNum = value; + this.SendPropertyChanged("KeyWorkOKNum"); + this.OnKeyWorkOKNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")] + public string KeyWorkOKRate + { + get + { + return this._KeyWorkOKRate; + } + set + { + if ((this._KeyWorkOKRate != value)) + { + this.OnKeyWorkOKRateChanging(value); + this.SendPropertyChanging(); + this._KeyWorkOKRate = value; + this.SendPropertyChanged("KeyWorkOKRate"); + this.OnKeyWorkOKRateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedger_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -410061,6 +410532,8 @@ namespace Model private EntitySet _Check_PauseNotice_Sys_User8; + private EntitySet _Check_ProjectLeaderCheckApprove; + private EntitySet _Check_PunishNotice; private EntitySet _Check_PunishNotice_Sys_User1; @@ -410877,6 +411350,7 @@ namespace Model this._Check_PauseNotice_Sys_User5 = new EntitySet(new Action(this.attach_Check_PauseNotice_Sys_User5), new Action(this.detach_Check_PauseNotice_Sys_User5)); this._Check_PauseNotice_Sys_User7 = new EntitySet(new Action(this.attach_Check_PauseNotice_Sys_User7), new Action(this.detach_Check_PauseNotice_Sys_User7)); this._Check_PauseNotice_Sys_User8 = new EntitySet(new Action(this.attach_Check_PauseNotice_Sys_User8), new Action(this.detach_Check_PauseNotice_Sys_User8)); + this._Check_ProjectLeaderCheckApprove = new EntitySet(new Action(this.attach_Check_ProjectLeaderCheckApprove), new Action(this.detach_Check_ProjectLeaderCheckApprove)); this._Check_PunishNotice = new EntitySet(new Action(this.attach_Check_PunishNotice), new Action(this.detach_Check_PunishNotice)); this._Check_PunishNotice_Sys_User1 = new EntitySet(new Action(this.attach_Check_PunishNotice_Sys_User1), new Action(this.detach_Check_PunishNotice_Sys_User1)); this._Check_PunishNotice_Sys_User2 = new EntitySet(new Action(this.attach_Check_PunishNotice_Sys_User2), new Action(this.detach_Check_PunishNotice_Sys_User2)); @@ -412851,6 +413325,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ProjectLeaderCheckApprove_Sys_User", Storage="_Check_ProjectLeaderCheckApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] + public EntitySet Check_ProjectLeaderCheckApprove + { + get + { + return this._Check_ProjectLeaderCheckApprove; + } + set + { + this._Check_ProjectLeaderCheckApprove.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_PunishNotice_Sys_User", Storage="_Check_PunishNotice", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Check_PunishNotice { @@ -417736,6 +418223,18 @@ namespace Model entity.Owner = null; } + private void attach_Check_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_Check_ProjectLeaderCheckApprove(Check_ProjectLeaderCheckApprove entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_Check_PunishNotice(Check_PunishNotice entity) { this.SendPropertyChanging(); @@ -466465,6 +466964,8 @@ namespace Model private string _PUnitName; + private System.Nullable _IsThisUnit; + private System.Nullable _IsBranch; private string _ProjectAddress; @@ -466797,6 +467298,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsThisUnit", DbType="Bit")] + public System.Nullable IsThisUnit + { + get + { + return this._IsThisUnit; + } + set + { + if ((this._IsThisUnit != value)) + { + this._IsThisUnit = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBranch", DbType="Bit")] public System.Nullable IsBranch { @@ -476709,6 +477226,12 @@ namespace Model private string _HandleState; + private System.Nullable _KeyWorkNum; + + private System.Nullable _KeyWorkOKNum; + + private string _KeyWorkOKRate; + private string _Quarters; private string _UnitName; @@ -476833,6 +477356,54 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")] + public System.Nullable KeyWorkNum + { + get + { + return this._KeyWorkNum; + } + set + { + if ((this._KeyWorkNum != value)) + { + this._KeyWorkNum = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")] + public System.Nullable KeyWorkOKNum + { + get + { + return this._KeyWorkOKNum; + } + set + { + if ((this._KeyWorkOKNum != value)) + { + this._KeyWorkOKNum = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")] + public string KeyWorkOKRate + { + get + { + return this._KeyWorkOKRate; + } + set + { + if ((this._KeyWorkOKRate != value)) + { + this._KeyWorkOKRate = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarters", DbType="NVarChar(200) NOT NULL", CanBeNull=false)] public string Quarters {