diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-07-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-07-gaofei.sql new file mode 100644 index 00000000..c26c932e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-07-gaofei.sql @@ -0,0 +1,99 @@ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('94287B92-7E96-4B90-BC6F-DAF30AE3B314','¶ȼƻ','JDGL/Check/MonthPlan.aspx',51,'0','Menu_JDGL',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8672C3E5-C819-4906-BB7D-50A5319F7B79','94287B92-7E96-4B90-BC6F-DAF30AE3B314','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C75747BA-F48D-4A2F-8DD1-D2DABEEE125F','94287B92-7E96-4B90-BC6F-DAF30AE3B314','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('11049A9C-C66C-44E2-B9E8-FEC69D498CBD','94287B92-7E96-4B90-BC6F-DAF30AE3B314','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F136D1B4-A988-42E7-AD7C-4A246B440D03','94287B92-7E96-4B90-BC6F-DAF30AE3B314','',4) + GO + + +CREATE TABLE [dbo].[JDGL_MonthPlan]( + [MonthPlanId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Months] [datetime] NULL, + [UnitId] [nvarchar](50) NULL, + [NodeContent] [nvarchar](500) NULL, + [PlanDate] [datetime] NULL, + [DutyPerson] [nvarchar](50) NULL, + [RealDate] [datetime] NULL, + [Remark] [nvarchar](200) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_JDGL_MonthPlan] PRIMARY KEY CLUSTERED +( + [MonthPlanId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] WITH CHECK ADD CONSTRAINT [FK_JDGL_MonthPlan_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] CHECK CONSTRAINT [FK_JDGL_MonthPlan_Base_Project] +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] WITH CHECK ADD CONSTRAINT [FK_JDGL_MonthPlan_Base_Unit] FOREIGN KEY([UnitId]) +REFERENCES [dbo].[Base_Unit] ([UnitId]) +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] CHECK CONSTRAINT [FK_JDGL_MonthPlan_Base_Unit] +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] WITH CHECK ADD CONSTRAINT [FK_JDGL_MonthPlan_Sys_User] FOREIGN KEY([DutyPerson]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] CHECK CONSTRAINT [FK_JDGL_MonthPlan_Sys_User] +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] WITH CHECK ADD CONSTRAINT [FK_JDGL_MonthPlan_Sys_User1] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[JDGL_MonthPlan] CHECK CONSTRAINT [FK_JDGL_MonthPlan_Sys_User1] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'MonthPlanId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'·' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'Months' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ελId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'UnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'NodeContent' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ƻʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'PlanDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'廷Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'DutyPerson' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'RealDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'Remark' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¶ȼƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MonthPlan' +GO + + diff --git a/DataBase/菜单初始化脚本/1-4进度管理（Menu_JDGL）.sql b/DataBase/菜单初始化脚本/1-4进度管理（Menu_JDGL）.sql index 99e3c609..5cacfbb3 100644 --- a/DataBase/菜单初始化脚本/1-4进度管理（Menu_JDGL）.sql +++ b/DataBase/菜单初始化脚本/1-4进度管理（Menu_JDGL）.sql @@ -91,6 +91,19 @@ go VALUES('60462BF3-3F78-4E17-8E15-451A108D5475','9CAF311E-C234-4DA4-B235-D4E478FBD80E','保存',4) GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('94287B92-7E96-4B90-BC6F-DAF30AE3B314','月度计划情况','JDGL/Check/MonthPlan.aspx',51,'0','Menu_JDGL',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8672C3E5-C819-4906-BB7D-50A5319F7B79','94287B92-7E96-4B90-BC6F-DAF30AE3B314','增加',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C75747BA-F48D-4A2F-8DD1-D2DABEEE125F','94287B92-7E96-4B90-BC6F-DAF30AE3B314','修改',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('11049A9C-C66C-44E2-B9E8-FEC69D498CBD','94287B92-7E96-4B90-BC6F-DAF30AE3B314','删除',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F136D1B4-A988-42E7-AD7C-4A246B440D03','94287B92-7E96-4B90-BC6F-DAF30AE3B314','保存',4) + GO + --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('27C1D718-2DC0-42A5-96C0-F7A2D0DBC5F6','进度测量标志（权重）设置','',20,'0','Menu_JDGL',0,0,1) --GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 469027fb..073bd892 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -580,6 +580,7 @@ + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 4d251f9e..e0439ccc 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -5757,6 +5757,11 @@ namespace BLL /// public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7"; + /// + /// 工程量完成情况 + /// + public const string MonthPlanMenuId = "94287B92-7E96-4B90-BC6F-DAF30AE3B314"; + /// /// 进度完成情况 /// diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs new file mode 100644 index 00000000..9b21c6f6 --- /dev/null +++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace BLL +{ + /// + /// 月度计划情况 + /// + public class MonthPlanService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取月度计划情况 + /// + /// + /// + public static Model.JDGL_MonthPlan GetMonthPlanById(string MonthPlanId) + { + return Funs.DB.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlanId); + } + + /// + /// 添加月度计划情况 + /// + /// + public static void AddMonthPlan(Model.JDGL_MonthPlan MonthPlan) + { + Model.SGGLDB db = Funs.DB; + Model.JDGL_MonthPlan newMonthPlan = new Model.JDGL_MonthPlan + { + MonthPlanId = MonthPlan.MonthPlanId, + ProjectId = MonthPlan.ProjectId, + Months = MonthPlan.Months, + UnitId = MonthPlan.UnitId, + NodeContent = MonthPlan.NodeContent, + PlanDate = MonthPlan.PlanDate, + DutyPerson = MonthPlan.DutyPerson, + RealDate = MonthPlan.RealDate, + Remark = MonthPlan.Remark, + CompileMan = MonthPlan.CompileMan, + CompileDate = MonthPlan.CompileDate, + }; + db.JDGL_MonthPlan.InsertOnSubmit(newMonthPlan); + db.SubmitChanges(); + } + + /// + /// 修改月度计划情况 + /// + /// + public static void UpdateMonthPlan(Model.JDGL_MonthPlan MonthPlan) + { + Model.SGGLDB db = Funs.DB; + Model.JDGL_MonthPlan newMonthPlan = db.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlan.MonthPlanId); + if (newMonthPlan != null) + { + newMonthPlan.UnitId = MonthPlan.UnitId; + newMonthPlan.NodeContent = MonthPlan.NodeContent; + newMonthPlan.PlanDate = MonthPlan.PlanDate; + newMonthPlan.DutyPerson = MonthPlan.DutyPerson; + newMonthPlan.RealDate = MonthPlan.RealDate; + newMonthPlan.Remark = MonthPlan.Remark; + newMonthPlan.CompileMan = MonthPlan.CompileMan; + newMonthPlan.CompileDate = MonthPlan.CompileDate; + + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除月度计划情况 + /// + /// + public static void DeleteMonthPlanByMonthPlanId(string MonthPlanId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.JDGL_MonthPlan where x.MonthPlanId == MonthPlanId select x).FirstOrDefault(); + if (q != null) + { + db.JDGL_MonthPlan.DeleteOnSubmit(q); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 0daf201e..772fde5b 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1378,6 +1378,7 @@ + @@ -13743,6 +13744,13 @@ MeterCompletionIn.aspx + + MonthPlan.aspx + ASPXCodeBehind + + + MonthPlan.aspx + PipelineCompletion.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx new file mode 100644 index 00000000..82708f7a --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx @@ -0,0 +1,103 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthPlan.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.MonthPlan" %> + + + + + + 月度计划情况 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs new file mode 100644 index 00000000..86941399 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs @@ -0,0 +1,184 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Data; +using System.Data.SqlClient; +using BLL; +using Newtonsoft.Json.Linq; + +namespace FineUIPro.Web.JDGL.Check +{ + public partial class MonthPlan : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + btnNew.OnClientClick = Window1.GetShowReference("MonthPlanEdit.aspx") + "return false;"; + this.txtMonths.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + BindGrid(); + } + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == BLL.Const._Null) + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.MonthPlanMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnNew.Hidden = false; + this.btnModify.Hidden = false; + this.btnMenuDel.Hidden = false; + } + } + } + #endregion + + protected void btnModify_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanEdit.aspx?Months={0}", this.txtMonths.Text, "编辑 - "))); + } + + /// + /// 加载Grid + /// + private void BindGrid() + { + string strSql = @"select qc.MonthPlanId,(select PlanNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum, + (select RealNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as RealNum, + (select NextNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex, + CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum, + CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum, + CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0 + + ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%' + + AS Rate, + CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0 + + ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%' + + AS TotalRate, + CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0 + + ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%' + + AS SumRate, + CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, + CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum + from[dbo].JDGL_QuantityList ql + left join dbo.[JDGL_MonthPlan] qc on ql.QuantityListId=qc.QuantityListId +where qc.MonthPlanId=(select top 1 MonthPlanId from[JDGL_MonthPlan] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name"; + //string strSql = @"select * + // from dbo.View_JDGL_MonthPlan qc + // where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@month", string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01")))); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 月份选择事件 + /// + /// 月份选择事件 + /// + /// + /// + protected void txtMonths_TextChanged(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 保存按钮 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.Grid1.Rows.Count > 0) + { + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.JDGL_MonthPlan MonthPlan = BLL.MonthPlanService.GetMonthPlanById(this.Grid1.Rows[i].RowID); + if (MonthPlan != null) + { + MonthPlan.CompileMan = this.CurrUser.UserId; + MonthPlan.CompileDate = DateTime.Now; + BLL.MonthPlanService.UpdateMonthPlan(MonthPlan); + } + } + Alert.ShowInTop("保存成功！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.MonthPlanService.DeleteMonthPlanByMonthPlanId(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + #region 导入 + /// + /// 导入按钮 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanIn.aspx?ProjectId={0}", this.CurrUser.LoginProjectId, "导入 - "))); + } + + /// + /// 关闭导入弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs new file mode 100644 index 00000000..48d93b0d --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JDGL.Check { + + + public partial class MonthPlan { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtMonths 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonths; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnModify; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs index 45edcc9b..a5db92db 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx.cs @@ -111,7 +111,7 @@ namespace FineUIPro.Web.JDGL.Check BLL.QuantityListService.UpdateQuantityList(oldQuantityList); } var oldQuantityCompletion = db.JDGL_QuantityCompletion.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.QuantityListId == quantityListId && x.Months == months); - if (oldQuantityCompletion==null) + if (oldQuantityCompletion == null) { Model.JDGL_QuantityCompletion QuantityCompletion = new Model.JDGL_QuantityCompletion(); QuantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion)); diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..963148f2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 750e6fd7..32ad8b2a 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1316,6 +1316,9 @@ namespace Model partial void InsertJDGL_MeterCompletion(JDGL_MeterCompletion instance); partial void UpdateJDGL_MeterCompletion(JDGL_MeterCompletion instance); partial void DeleteJDGL_MeterCompletion(JDGL_MeterCompletion instance); + partial void InsertJDGL_MonthPlan(JDGL_MonthPlan instance); + partial void UpdateJDGL_MonthPlan(JDGL_MonthPlan instance); + partial void DeleteJDGL_MonthPlan(JDGL_MonthPlan instance); partial void InsertJDGL_PipelineCompletion(JDGL_PipelineCompletion instance); partial void UpdateJDGL_PipelineCompletion(JDGL_PipelineCompletion instance); partial void DeleteJDGL_PipelineCompletion(JDGL_PipelineCompletion instance); @@ -6126,6 +6129,14 @@ namespace Model } } + public System.Data.Linq.Table JDGL_MonthPlan + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JDGL_PipelineCompletion { get @@ -26360,6 +26371,8 @@ namespace Model private EntitySet _JDGL_LowTankCompletion; + private EntitySet _JDGL_MonthPlan; + private EntitySet _JDGL_PipelineCompletion; private EntitySet _JDGL_ProgressCompletion; @@ -26884,6 +26897,7 @@ namespace Model this._JDGL_ElectricalCompletion = new EntitySet(new Action(this.attach_JDGL_ElectricalCompletion), new Action(this.detach_JDGL_ElectricalCompletion)); this._JDGL_EquipmentCompletion = new EntitySet(new Action(this.attach_JDGL_EquipmentCompletion), new Action(this.detach_JDGL_EquipmentCompletion)); this._JDGL_LowTankCompletion = new EntitySet(new Action(this.attach_JDGL_LowTankCompletion), new Action(this.detach_JDGL_LowTankCompletion)); + this._JDGL_MonthPlan = new EntitySet(new Action(this.attach_JDGL_MonthPlan), new Action(this.detach_JDGL_MonthPlan)); this._JDGL_PipelineCompletion = new EntitySet(new Action(this.attach_JDGL_PipelineCompletion), new Action(this.detach_JDGL_PipelineCompletion)); this._JDGL_ProgressCompletion = new EntitySet(new Action(this.attach_JDGL_ProgressCompletion), new Action(this.detach_JDGL_ProgressCompletion)); this._JDGL_QuantityCompletion = new EntitySet(new Action(this.attach_JDGL_QuantityCompletion), new Action(this.detach_JDGL_QuantityCompletion)); @@ -30030,6 +30044,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Project", Storage="_JDGL_MonthPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan + { + get + { + return this._JDGL_MonthPlan; + } + set + { + this._JDGL_MonthPlan.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_PipelineCompletion_Base_Project", Storage="_JDGL_PipelineCompletion", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JDGL_PipelineCompletion { @@ -33773,6 +33800,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JDGL_PipelineCompletion(JDGL_PipelineCompletion entity) { this.SendPropertyChanging(); @@ -39594,6 +39633,8 @@ namespace Model private EntitySet _JDGL_MeterCompletion; + private EntitySet _JDGL_MonthPlan; + private EntitySet _JDGL_PipelineCompletion; private EntitySet _JDGL_SteelStructureCompletion; @@ -39897,6 +39938,7 @@ namespace Model this._JDGL_ElectricalCompletion = new EntitySet(new Action(this.attach_JDGL_ElectricalCompletion), new Action(this.detach_JDGL_ElectricalCompletion)); this._JDGL_EquipmentCompletion = new EntitySet(new Action(this.attach_JDGL_EquipmentCompletion), new Action(this.detach_JDGL_EquipmentCompletion)); this._JDGL_MeterCompletion = new EntitySet(new Action(this.attach_JDGL_MeterCompletion), new Action(this.detach_JDGL_MeterCompletion)); + this._JDGL_MonthPlan = new EntitySet(new Action(this.attach_JDGL_MonthPlan), new Action(this.detach_JDGL_MonthPlan)); this._JDGL_PipelineCompletion = new EntitySet(new Action(this.attach_JDGL_PipelineCompletion), new Action(this.detach_JDGL_PipelineCompletion)); this._JDGL_SteelStructureCompletion = new EntitySet(new Action(this.attach_JDGL_SteelStructureCompletion), new Action(this.detach_JDGL_SteelStructureCompletion)); this._JDGL_UndergroundPipeCompletion = new EntitySet(new Action(this.attach_JDGL_UndergroundPipeCompletion), new Action(this.detach_JDGL_UndergroundPipeCompletion)); @@ -41835,6 +41877,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Unit", Storage="_JDGL_MonthPlan", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan + { + get + { + return this._JDGL_MonthPlan; + } + set + { + this._JDGL_MonthPlan.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_PipelineCompletion_Base_Unit", Storage="_JDGL_PipelineCompletion", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] public EntitySet JDGL_PipelineCompletion { @@ -44025,6 +44080,18 @@ namespace Model entity.Base_Unit = null; } + private void attach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = this; + } + + private void detach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = null; + } + private void attach_JDGL_PipelineCompletion(JDGL_PipelineCompletion entity) { this.SendPropertyChanging(); @@ -212202,6 +212269,472 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_MonthPlan")] + public partial class JDGL_MonthPlan : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MonthPlanId; + + private string _ProjectId; + + private System.Nullable _Months; + + private string _UnitId; + + private string _NodeContent; + + private System.Nullable _PlanDate; + + private string _DutyPerson; + + private System.Nullable _RealDate; + + private string _Remark; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private EntityRef _Base_Project; + + private EntityRef _Base_Unit; + + private EntityRef _Sys_User; + + private EntityRef _CompileManSys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMonthPlanIdChanging(string value); + partial void OnMonthPlanIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnMonthsChanging(System.Nullable value); + partial void OnMonthsChanged(); + partial void OnUnitIdChanging(string value); + partial void OnUnitIdChanged(); + partial void OnNodeContentChanging(string value); + partial void OnNodeContentChanged(); + partial void OnPlanDateChanging(System.Nullable value); + partial void OnPlanDateChanged(); + partial void OnDutyPersonChanging(string value); + partial void OnDutyPersonChanged(); + partial void OnRealDateChanging(System.Nullable value); + partial void OnRealDateChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public JDGL_MonthPlan() + { + this._Base_Project = default(EntityRef); + this._Base_Unit = default(EntityRef); + this._Sys_User = default(EntityRef); + this._CompileManSys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthPlanId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MonthPlanId + { + get + { + return this._MonthPlanId; + } + set + { + if ((this._MonthPlanId != value)) + { + this.OnMonthPlanIdChanging(value); + this.SendPropertyChanging(); + this._MonthPlanId = value; + this.SendPropertyChanged("MonthPlanId"); + this.OnMonthPlanIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Months", DbType="DateTime")] + public System.Nullable Months + { + get + { + return this._Months; + } + set + { + if ((this._Months != value)) + { + this.OnMonthsChanging(value); + this.SendPropertyChanging(); + this._Months = value; + this.SendPropertyChanged("Months"); + this.OnMonthsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + if (this._Base_Unit.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnUnitIdChanging(value); + this.SendPropertyChanging(); + this._UnitId = value; + this.SendPropertyChanged("UnitId"); + this.OnUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NodeContent", DbType="NVarChar(500)")] + public string NodeContent + { + get + { + return this._NodeContent; + } + set + { + if ((this._NodeContent != value)) + { + this.OnNodeContentChanging(value); + this.SendPropertyChanging(); + this._NodeContent = value; + this.SendPropertyChanged("NodeContent"); + this.OnNodeContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanDate", DbType="DateTime")] + public System.Nullable PlanDate + { + get + { + return this._PlanDate; + } + set + { + if ((this._PlanDate != value)) + { + this.OnPlanDateChanging(value); + this.SendPropertyChanging(); + this._PlanDate = value; + this.SendPropertyChanged("PlanDate"); + this.OnPlanDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyPerson", DbType="NVarChar(50)")] + public string DutyPerson + { + get + { + return this._DutyPerson; + } + set + { + if ((this._DutyPerson != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnDutyPersonChanging(value); + this.SendPropertyChanging(); + this._DutyPerson = value; + this.SendPropertyChanged("DutyPerson"); + this.OnDutyPersonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealDate", DbType="DateTime")] + public System.Nullable RealDate + { + get + { + return this._RealDate; + } + set + { + if ((this._RealDate != value)) + { + this.OnRealDateChanging(value); + this.SendPropertyChanging(); + this._RealDate = value; + this.SendPropertyChanged("RealDate"); + this.OnRealDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._CompileManSys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.JDGL_MonthPlan.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_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.JDGL_MonthPlan.Remove(this); + } + this._Base_Unit.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan.Add(this); + this._UnitId = value.UnitId; + } + else + { + this._UnitId = default(string); + } + this.SendPropertyChanged("Base_Unit"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User", Storage="_Sys_User", ThisKey="DutyPerson", 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.JDGL_MonthPlan.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan.Add(this); + this._DutyPerson = value.UserId; + } + else + { + this._DutyPerson = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User1", Storage="_CompileManSys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User CompileManSys_User + { + get + { + return this._CompileManSys_User.Entity; + } + set + { + Sys_User previousValue = this._CompileManSys_User.Entity; + if (((previousValue != value) + || (this._CompileManSys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._CompileManSys_User.Entity = null; + previousValue.JDGL_MonthPlan_Sys_User1.Remove(this); + } + this._CompileManSys_User.Entity = value; + if ((value != null)) + { + value.JDGL_MonthPlan_Sys_User1.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("CompileManSys_User"); + } + } + } + + 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.JDGL_PipelineCompletion")] public partial class JDGL_PipelineCompletion : INotifyPropertyChanging, INotifyPropertyChanged { @@ -350770,6 +351303,10 @@ namespace Model private EntitySet _JDGL_MeterCompletion; + private EntitySet _JDGL_MonthPlan; + + private EntitySet _JDGL_MonthPlan_Sys_User1; + private EntitySet _JDGL_PipelineCompletion; private EntitySet _JDGL_ProgressCompletion; @@ -351426,6 +351963,8 @@ namespace Model this._JDGL_ElectricalCompletion = new EntitySet(new Action(this.attach_JDGL_ElectricalCompletion), new Action(this.detach_JDGL_ElectricalCompletion)); this._JDGL_LowTankCompletion = new EntitySet(new Action(this.attach_JDGL_LowTankCompletion), new Action(this.detach_JDGL_LowTankCompletion)); this._JDGL_MeterCompletion = new EntitySet(new Action(this.attach_JDGL_MeterCompletion), new Action(this.detach_JDGL_MeterCompletion)); + this._JDGL_MonthPlan = new EntitySet(new Action(this.attach_JDGL_MonthPlan), new Action(this.detach_JDGL_MonthPlan)); + this._JDGL_MonthPlan_Sys_User1 = new EntitySet(new Action(this.attach_JDGL_MonthPlan_Sys_User1), new Action(this.detach_JDGL_MonthPlan_Sys_User1)); this._JDGL_PipelineCompletion = new EntitySet(new Action(this.attach_JDGL_PipelineCompletion), new Action(this.detach_JDGL_PipelineCompletion)); this._JDGL_ProgressCompletion = new EntitySet(new Action(this.attach_JDGL_ProgressCompletion), new Action(this.detach_JDGL_ProgressCompletion)); this._JDGL_QuantityCompletion = new EntitySet(new Action(this.attach_JDGL_QuantityCompletion), new Action(this.detach_JDGL_QuantityCompletion)); @@ -354563,6 +355102,32 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User", Storage="_JDGL_MonthPlan", ThisKey="UserId", OtherKey="DutyPerson", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan + { + get + { + return this._JDGL_MonthPlan; + } + set + { + this._JDGL_MonthPlan.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Sys_User1", Storage="_JDGL_MonthPlan_Sys_User1", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet JDGL_MonthPlan_Sys_User1 + { + get + { + return this._JDGL_MonthPlan_Sys_User1; + } + set + { + this._JDGL_MonthPlan_Sys_User1.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_PipelineCompletion_Sys_User", Storage="_JDGL_PipelineCompletion", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet JDGL_PipelineCompletion { @@ -359019,6 +359584,30 @@ namespace Model entity.Sys_User = null; } + private void attach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_JDGL_MonthPlan(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + + private void attach_JDGL_MonthPlan_Sys_User1(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.CompileManSys_User = this; + } + + private void detach_JDGL_MonthPlan_Sys_User1(JDGL_MonthPlan entity) + { + this.SendPropertyChanging(); + entity.CompileManSys_User = null; + } + private void attach_JDGL_PipelineCompletion(JDGL_PipelineCompletion entity) { this.SendPropertyChanging();