报表修改

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

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();
             }
         }

SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx

@@ -80,14 +80,26 @@
                                     <Items>
                                         <f:Label ID="txtUnitName" runat="server" Hidden="true">
                                         </f:Label>
-                                        <f:Label ID="txtQuarter" runat="server">
+                                        <f:Label ID="txtQuarter" runat="server" LabelWidth="130px">
                                         </f:Label>
-                                        <f:Label ID="txtCompileDate" runat="server">
+                                        <f:Label ID="txtCompileDate" runat="server" LabelWidth="130px">
                                         </f:Label>
                                         <f:Label ID="lbHandleMan" runat="server">
                                         </f:Label>
                                     </Items>
                                 </f:FormRow>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:Label ID="Label1" runat="server" Hidden="true">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkNum" runat="server" Label="重点工作任务数" LabelWidth="130px">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkOKNum" runat="server" Label="重点工作完成数" LabelWidth="130px">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkOKRate" runat="server" Label="综合完成率">
+                                        </f:Label>
+                                    </Items>
+                                </f:FormRow>
                             </Rows>
                         </f:Form>
                         <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"

SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs

@@ -62,6 +62,9 @@ namespace FineUIPro.Web.ZHGL.Information
             txtUnitName.Text = string.Empty;
             txtQuarter.Text = string.Empty;
             txtCompileDate.Text = string.Empty;
+            txtKeyWorkNum.Text = string.Empty;
+            txtKeyWorkOKNum.Text = string.Empty;
+            txtKeyWorkOKRate.Text = string.Empty;
             this.lbHandleMan.Text = string.Empty;
             Grid1.DataSource = null;
             Grid1.DataBind();
@@ -105,6 +108,18 @@ namespace FineUIPro.Web.ZHGL.Information
                 this.ActionWorkLedgerId = report.ActionWorkLedgerId;
                 txtUnitName.Text = "单位：" + report.UnitName;
                 txtQuarter.Text = "季度：" + report.Quarters;
+                if (report.KeyWorkNum != null)
+                {
+                    txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
+                }
+                if (report.KeyWorkOKNum != null)
+                {
+                    txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
+                }
+                if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
+                {
+                    txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
+                }
                 if (report.HandleState == BLL.Const.HandleState_1 || report.UpState == BLL.Const.UpState_3)
                 {
                     this.lbHandleMan.Hidden = true;

SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs

@@ -228,6 +228,42 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.Label lbHandleMan;
         
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtKeyWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkOKNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkOKRate;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>

SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx

@@ -27,6 +27,15 @@
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" ID="txtKeyWorkNum" Label="重点工作任务数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtKeyWorkOKNum" Label="重点工作完成数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
+                        <f:TextBox ID="txtKeyWorkOKRate" runat="server" Label="综合完成率" Readonly="true">
+                        </f:TextBox>
+                        <f:Label runat="server"></f:Label>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"

SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs

@@ -99,6 +99,18 @@ namespace FineUIPro.Web.ZHGL.Information
                         {
                             this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ActionWorkLedger.ReportDate);
                         }
+                        if (ActionWorkLedger.KeyWorkNum != null)
+                        {
+                            this.txtKeyWorkNum.Text = ActionWorkLedger.KeyWorkNum.ToString();
+                        }
+                        if (ActionWorkLedger.KeyWorkOKNum != null)
+                        {
+                            this.txtKeyWorkOKNum.Text = ActionWorkLedger.KeyWorkOKNum.ToString();
+                        }
+                        if (!string.IsNullOrEmpty(ActionWorkLedger.KeyWorkOKRate))
+                        {
+                            this.txtKeyWorkOKRate.Text = ActionWorkLedger.KeyWorkOKRate;
+                        }
                     }
                 }
                 else
@@ -237,6 +249,9 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             ActionWorkLedger.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
             ActionWorkLedger.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
+            ActionWorkLedger.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
+            ActionWorkLedger.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
+            ActionWorkLedger.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
             if (string.IsNullOrEmpty(this.ActionWorkLedgerId))
             {
                 this.ActionWorkLedgerId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedger)); ActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
@@ -530,5 +545,17 @@ namespace FineUIPro.Web.ZHGL.Information
             }
         }
         #endregion
+
+        protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
+        {
+            decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
+            decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
+            string rate = string.Empty;
+            if (keyWorkNum > 0)
+            {
+                rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
+            }
+            this.txtKeyWorkOKRate.Text = rate;
+        }
     }
 }

SUBQHSE/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs

@@ -75,6 +75,33 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.DatePicker dpkCompileDate;
         
+        /// <summary>
+        /// txtKeyWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtKeyWorkNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtKeyWorkOKRate;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>

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<JObject>("values");
+                if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
+                {
+                    string name = values.Value<string>("Name");
+                    decimal d = values.Value<decimal>("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
 

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;
+        }
     }
 }

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> Check_ProjectLeaderCheckApprove
+		{
+			get
+			{
+				return this.GetTable<Check_ProjectLeaderCheckApprove>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Check_PunishNotice> Check_PunishNotice
 		{
 			get
@@ -78385,8 +78396,16 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompileDate;
 		
+		private string _State;
+		
+		private string _RectificationSituation;
+		
+		private System.Nullable<System.DateTime> _RectificationDate;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
+		private EntitySet<Check_ProjectLeaderCheckApprove> _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<System.DateTime> 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<System.DateTime> value);
+    partial void OnRectificationDateChanged();
     #endregion
 		
 		public Check_ProjectLeaderCheck()
 		{
 			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Check_ProjectLeaderCheckApprove = new EntitySet<Check_ProjectLeaderCheckApprove>(new Action<Check_ProjectLeaderCheckApprove>(this.attach_Check_ProjectLeaderCheckApprove), new Action<Check_ProjectLeaderCheckApprove>(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<System.DateTime> 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> 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<System.DateTime> _ApproveDate;
+		
+		private System.Nullable<bool> _IsAgree;
+		
+		private string _ApproveIdea;
+		
+		private string _ApproveType;
+		
+		private EntityRef<Check_ProjectLeaderCheck> _Check_ProjectLeaderCheck;
+		
+		private EntityRef<Sys_User> _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<System.DateTime> value);
+    partial void OnApproveDateChanged();
+    partial void OnIsAgreeChanging(System.Nullable<bool> 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<Check_ProjectLeaderCheck>);
+			this._Sys_User = default(EntityRef<Sys_User>);
+			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<System.DateTime> 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<bool> 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<int> _KeyWorkNum;
+		
+		private System.Nullable<int> _KeyWorkOKNum;
+		
+		private string _KeyWorkOKRate;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntitySet<Information_ActionWorkLedgerItem> _Information_ActionWorkLedgerItem;
@@ -215303,6 +215708,12 @@ namespace Model
     partial void OnHandleStateChanged();
     partial void OnHandleManChanging(string value);
     partial void OnHandleManChanged();
+    partial void OnKeyWorkNumChanging(System.Nullable<int> value);
+    partial void OnKeyWorkNumChanged();
+    partial void OnKeyWorkOKNumChanging(System.Nullable<int> 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<int> 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<int> 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> _Check_PauseNotice_Sys_User8;
 		
+		private EntitySet<Check_ProjectLeaderCheckApprove> _Check_ProjectLeaderCheckApprove;
+		
 		private EntitySet<Check_PunishNotice> _Check_PunishNotice;
 		
 		private EntitySet<Check_PunishNotice> _Check_PunishNotice_Sys_User1;
@@ -410877,6 +411350,7 @@ namespace Model
 			this._Check_PauseNotice_Sys_User5 = new EntitySet<Check_PauseNotice>(new Action<Check_PauseNotice>(this.attach_Check_PauseNotice_Sys_User5), new Action<Check_PauseNotice>(this.detach_Check_PauseNotice_Sys_User5));
 			this._Check_PauseNotice_Sys_User7 = new EntitySet<Check_PauseNotice>(new Action<Check_PauseNotice>(this.attach_Check_PauseNotice_Sys_User7), new Action<Check_PauseNotice>(this.detach_Check_PauseNotice_Sys_User7));
 			this._Check_PauseNotice_Sys_User8 = new EntitySet<Check_PauseNotice>(new Action<Check_PauseNotice>(this.attach_Check_PauseNotice_Sys_User8), new Action<Check_PauseNotice>(this.detach_Check_PauseNotice_Sys_User8));
+			this._Check_ProjectLeaderCheckApprove = new EntitySet<Check_ProjectLeaderCheckApprove>(new Action<Check_ProjectLeaderCheckApprove>(this.attach_Check_ProjectLeaderCheckApprove), new Action<Check_ProjectLeaderCheckApprove>(this.detach_Check_ProjectLeaderCheckApprove));
 			this._Check_PunishNotice = new EntitySet<Check_PunishNotice>(new Action<Check_PunishNotice>(this.attach_Check_PunishNotice), new Action<Check_PunishNotice>(this.detach_Check_PunishNotice));
 			this._Check_PunishNotice_Sys_User1 = new EntitySet<Check_PunishNotice>(new Action<Check_PunishNotice>(this.attach_Check_PunishNotice_Sys_User1), new Action<Check_PunishNotice>(this.detach_Check_PunishNotice_Sys_User1));
 			this._Check_PunishNotice_Sys_User2 = new EntitySet<Check_PunishNotice>(new Action<Check_PunishNotice>(this.attach_Check_PunishNotice_Sys_User2), new Action<Check_PunishNotice>(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> 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> 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<bool> _IsThisUnit;
+		
 		private System.Nullable<bool> _IsBranch;
 		
 		private string _ProjectAddress;
@@ -466797,6 +467298,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsThisUnit", DbType="Bit")]
+		public System.Nullable<bool> 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<bool> IsBranch
 		{
@@ -476709,6 +477226,12 @@ namespace Model
 		
 		private string _HandleState;
 		
+		private System.Nullable<int> _KeyWorkNum;
+		
+		private System.Nullable<int> _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<int> 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<int> 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
 		{