diff --git a/DataBase/版本日志/SGGLDB_V2023-10-23.sql b/DataBase/版本日志/SGGLDB_V2023-10-23.sql index a3d0eae6..1e359cfe 100644 --- a/DataBase/版本日志/SGGLDB_V2023-10-23.sql +++ b/DataBase/版本日志/SGGLDB_V2023-10-23.sql @@ -40,3 +40,48 @@ LEFT JOIN Sys_Const AS constw ON Item.WorkStates=constw.ConstValue AND constw.Gr GO +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) +VALUES ( N'34037636-4BEC-44A9-8267-7830F021AF02',N'˾ƽЧͳ',N'PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx',70,N'0',N'Menu_HTGL',1,0,1) +GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'7557B840-26E8-419C-ACD4-167362B40333',N'34037636-4BEC-44A9-8267-7830F021AF02',N'',1) +GO + + +CREATE TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyCompany]( + [ConstructionLogWorkEfficiencyCompanyId] [nvarchar](50) NOT NULL, + [Type] [nvarchar](20) NULL, + [TypeId] [nvarchar](50) NULL, + [UnitOfMeasurement] [nvarchar](50) NULL, + [BaseWorkEfficiency] [decimal](18, 2) NULL, + [AvgWorkEfficiency] [decimal](18, 2) NULL, + CONSTRAINT [PK_ZHGL_ConstructionLogWorkEfficiencyCompany] PRIMARY KEY CLUSTERED +( + [ConstructionLogWorkEfficiencyCompanyId] 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 + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany', @level2type=N'COLUMN',@level2name=N'ConstructionLogWorkEfficiencyCompanyId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ˹/е' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany', @level2type=N'COLUMN',@level2name=N'Type' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany', @level2type=N'COLUMN',@level2name=N'TypeId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany', @level2type=N'COLUMN',@level2name=N'UnitOfMeasurement' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ч׼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany', @level2type=N'COLUMN',@level2name=N'BaseWorkEfficiency' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˾ǰƽЧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany', @level2type=N'COLUMN',@level2name=N'AvgWorkEfficiency' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˾ƽЧͳƱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyCompany' +GO + + diff --git a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql index 5a6ab701..fbb07771 100644 --- a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql +++ b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql @@ -217,4 +217,9 @@ GO INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) VALUES ( N'E9CB92B6-3DE0-4CA6-A616-29F2957B8BD5',N'481E6B1E-A3D5-4012-B828-FE62EB6BA861',N'保存',4) GO - \ No newline at end of file +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) +VALUES ( N'34037636-4BEC-44A9-8267-7830F021AF02',N'公司平均工效统计',N'PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx',70,N'0',N'Menu_HTGL',1,0,1) +GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'7557B840-26E8-419C-ACD4-167362B40333',N'34037636-4BEC-44A9-8267-7830F021AF02',N'保存',1) +GO \ No newline at end of file diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 3b5f63e6..ea01de06 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -649,6 +649,7 @@ + diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyCompanyService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyCompanyService.cs new file mode 100644 index 00000000..01dbe239 --- /dev/null +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyCompanyService.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + public class ConstructionLogWorkEfficiencyCompanyService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 获取施工日志公司工效明细列表 + /// + /// + /// + /// + public static List getListData(string projectId, DateTime month) + { + return (from x in db.ZHGL_ConstructionLogWorkEfficiencyCompany + select x).ToList(); + } + + /// + /// 增加施工日志公司工效明细 + /// + /// 施工日志公司工效明细实体 + public static void AddConstructionLogWorkEfficiencyCompany(Model.ZHGL_ConstructionLogWorkEfficiencyCompany constructionLogWorkEfficiencyCompany) + { + Model.SGGLDB db = Funs.DB; + Model.ZHGL_ConstructionLogWorkEfficiencyCompany newConstructionLogWorkEfficiencyCompany = new Model.ZHGL_ConstructionLogWorkEfficiencyCompany(); + newConstructionLogWorkEfficiencyCompany.ConstructionLogWorkEfficiencyCompanyId = constructionLogWorkEfficiencyCompany.ConstructionLogWorkEfficiencyCompanyId; + newConstructionLogWorkEfficiencyCompany.Type = constructionLogWorkEfficiencyCompany.Type; + newConstructionLogWorkEfficiencyCompany.TypeId = constructionLogWorkEfficiencyCompany.TypeId; + newConstructionLogWorkEfficiencyCompany.UnitOfMeasurement = constructionLogWorkEfficiencyCompany.UnitOfMeasurement; + newConstructionLogWorkEfficiencyCompany.BaseWorkEfficiency = constructionLogWorkEfficiencyCompany.BaseWorkEfficiency; + newConstructionLogWorkEfficiencyCompany.AvgWorkEfficiency = constructionLogWorkEfficiencyCompany.AvgWorkEfficiency; + + db.ZHGL_ConstructionLogWorkEfficiencyCompany.InsertOnSubmit(newConstructionLogWorkEfficiencyCompany); + db.SubmitChanges(); + } + + /// + /// 根据月报id删除对应的所有施工日志公司工效明细 + /// + public static void DeleteConstructionLogWorkEfficiencyCompanys() + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.ZHGL_ConstructionLogWorkEfficiencyCompany select x).ToList(); + if (q.Count() > 0) + { + db.ZHGL_ConstructionLogWorkEfficiencyCompany.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 08258896..a4b2b3ee 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1316,6 +1316,7 @@ + @@ -12782,6 +12783,13 @@ UnitWorkView.aspx + + CompanyConstructionLogWorkEfficiencySum.aspx + ASPXCodeBehind + + + CompanyConstructionLogWorkEfficiencySum.aspx + ConstructionLog.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx new file mode 100644 index 00000000..8045e90c --- /dev/null +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx @@ -0,0 +1,74 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CompanyConstructionLogWorkEfficiencySum.aspx.cs" Inherits="FineUIPro.Web.PZHGL.InformationProject.CompanyConstructionLogWorkEfficiencySum" %> + + + + + + 工效录入 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx.cs new file mode 100644 index 00000000..2b58dd86 --- /dev/null +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx.cs @@ -0,0 +1,274 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.PZHGL.InformationProject +{ + public partial class CompanyConstructionLogWorkEfficiencySum : PageBase + { + /// + /// 加载表头 + /// + protected void Page_Init(object sender, EventArgs e) + { + InitGrid(); + } + + #region 表头 + /// + /// 表头 + /// + private void InitGrid() + { + Model.SGGLDB db = Funs.DB; + var projects = (from x in db.Base_Project + where x.ProjectState == null || x.ProjectState == BLL.Const.ProjectState_1 + select x).ToList(); + GroupField gf = new GroupField(); + gf.ColumnID = "GX"; + gf.HeaderText = "工效统计"; + gf.HeaderTextAlign = TextAlign.Center; + for (int i = 0; i < projects.Count; i++) + { + RenderField rd1 = new RenderField(); + rd1.ColumnID = "Project" + i.ToString(); + rd1.Width = Unit.Pixel(100); + rd1.DataField = "Project" + i.ToString(); + rd1.FieldType = FieldType.Double; + rd1.HeaderText = projects[i].ShortName; + rd1.HeaderTextAlign = TextAlign.Center; + gf.Columns.Add(rd1); + } + Grid1.Columns.Add(gf); + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + + } + } + #endregion + + private void GetData() + { + Model.SGGLDB db = Funs.DB; + var constructionLogWorkEfficiencyProjects = from x in db.ZHGL_ConstructionLogWorkEfficiencyProject + select new { x.TypeId, x.UnitOfMeasurement, x.AvgWorkEfficiency, x.ProjectId }; + var persons = (from x in db.ZHGL_ConstructionLogWorkEfficiencyProject + join y in db.Base_WorkPost on x.TypeId equals y.WorkPostId + where x.Type == "Person" + select new { y.WorkPostName, x.UnitOfMeasurement, x.TypeId }).Distinct().OrderBy(x => x.WorkPostName).ToList(); + var machines = (from x in db.ZHGL_ConstructionLogWorkEfficiencyProject + join y in db.Base_SpecialEquipment on x.TypeId equals y.SpecialEquipmentId + where x.Type == "Machine" + select new { y.SpecialEquipmentName, x.UnitOfMeasurement, x.TypeId }).Distinct().OrderBy(x => x.SpecialEquipmentName).ToList(); + var projects = (from x in db.Base_Project + where x.ProjectState == null || x.ProjectState == BLL.Const.ProjectState_1 + select x).ToList(); + var workEfficiencyCompanys = from x in db.ZHGL_ConstructionLogWorkEfficiencyCompany select x; + DataTable table = new DataTable(); + table.Columns.Add(new DataColumn("Id", typeof(String))); + table.Columns.Add(new DataColumn("Code", typeof(String))); + table.Columns.Add(new DataColumn("Name", typeof(String))); + table.Columns.Add(new DataColumn("UnitOfMeasurement", typeof(String))); + table.Columns.Add(new DataColumn("BaseWorkEfficiency", typeof(String))); + table.Columns.Add(new DataColumn("AvgWorkEfficiency", typeof(String))); + table.Columns.Add(new DataColumn("Type", typeof(String))); + table.Columns.Add(new DataColumn("TypeId", typeof(String))); + table.Columns.Add(new DataColumn("Project0", typeof(String))); + table.Columns.Add(new DataColumn("Project1", typeof(String))); + table.Columns.Add(new DataColumn("Project2", typeof(String))); + table.Columns.Add(new DataColumn("Project3", typeof(String))); + table.Columns.Add(new DataColumn("Project4", typeof(String))); + table.Columns.Add(new DataColumn("Project5", typeof(String))); + table.Columns.Add(new DataColumn("Project6", typeof(String))); + table.Columns.Add(new DataColumn("Project7", typeof(String))); + table.Columns.Add(new DataColumn("Project8", typeof(String))); + table.Columns.Add(new DataColumn("Project9", typeof(String))); + table.Columns.Add(new DataColumn("Project10", typeof(String))); + table.Columns.Add(new DataColumn("Project11", typeof(String))); + table.Columns.Add(new DataColumn("Project12", typeof(String))); + table.Columns.Add(new DataColumn("Project13", typeof(String))); + table.Columns.Add(new DataColumn("Project14", typeof(String))); + table.Columns.Add(new DataColumn("Project15", typeof(String))); + table.Columns.Add(new DataColumn("Project16", typeof(String))); + table.Columns.Add(new DataColumn("Project17", typeof(String))); + table.Columns.Add(new DataColumn("Project18", typeof(String))); + table.Columns.Add(new DataColumn("Project19", typeof(String))); + table.Columns.Add(new DataColumn("Project20", typeof(String))); + table.Columns.Add(new DataColumn("Project21", typeof(String))); + table.Columns.Add(new DataColumn("Project22", typeof(String))); + table.Columns.Add(new DataColumn("Project23", typeof(String))); + table.Columns.Add(new DataColumn("Project24", typeof(String))); + table.Columns.Add(new DataColumn("Project25", typeof(String))); + table.Columns.Add(new DataColumn("Project26", typeof(String))); + table.Columns.Add(new DataColumn("Project27", typeof(String))); + table.Columns.Add(new DataColumn("Project28", typeof(String))); + table.Columns.Add(new DataColumn("Project29", typeof(String))); + table.Columns.Add(new DataColumn("Project30", typeof(String))); + table.Columns.Add(new DataColumn("Project31", typeof(String))); + table.Columns.Add(new DataColumn("Project32", typeof(String))); + table.Columns.Add(new DataColumn("Project33", typeof(String))); + table.Columns.Add(new DataColumn("Project34", typeof(String))); + table.Columns.Add(new DataColumn("Project35", typeof(String))); + table.Columns.Add(new DataColumn("Project36", typeof(String))); + table.Columns.Add(new DataColumn("Project37", typeof(String))); + table.Columns.Add(new DataColumn("Project38", typeof(String))); + table.Columns.Add(new DataColumn("Project39", typeof(String))); + table.Columns.Add(new DataColumn("Project40", typeof(String))); + DataRow row; + row = table.NewRow(); + row[0] = SQLHelper.GetNewID(); + row[1] = "一"; + row[2] = "人工"; + table.Rows.Add(row); + int a = 1; + foreach (var person in persons) + { + row = table.NewRow(); + row[0] = SQLHelper.GetNewID(); + row[1] = a; + row[2] = person.WorkPostName; + row[3] = person.UnitOfMeasurement; + var workEfficiencyCompany = workEfficiencyCompanys.FirstOrDefault(x => x.TypeId == person.TypeId && x.UnitOfMeasurement == person.UnitOfMeasurement); + if (workEfficiencyCompany != null) + { + row[4] = workEfficiencyCompany.BaseWorkEfficiency; + } + int b = 0; + List list = new List(); + foreach (var project in projects) + { + var workEfficiency = (from x in constructionLogWorkEfficiencyProjects + where x.TypeId == person.TypeId && x.UnitOfMeasurement == person.UnitOfMeasurement && x.ProjectId == project.ProjectId && x.AvgWorkEfficiency != null + select x).FirstOrDefault(); + if (workEfficiency != null) + { + decimal d = decimal.Round(workEfficiency.AvgWorkEfficiency.Value, 2); + row[8 + b] = d; + list.Add(d); + } + b++; + } + if (list.Count > 0) + { + row[5] = decimal.Round(Convert.ToDecimal(list.Sum() / Convert.ToDecimal(list.Count)), 2); + } + row[6] = "Person"; + row[7] = person.TypeId; + table.Rows.Add(row); + a++; + } + row = table.NewRow(); + row[0] = SQLHelper.GetNewID(); + row[1] = "二"; + row[2] = "机械"; + table.Rows.Add(row); + a = 1; + foreach (var machine in machines) + { + row = table.NewRow(); + row[0] = SQLHelper.GetNewID(); + row[1] = a; + row[2] = machine.SpecialEquipmentName; + row[3] = machine.UnitOfMeasurement; + var workEfficiencyCompany = workEfficiencyCompanys.FirstOrDefault(x => x.TypeId == machine.TypeId && x.UnitOfMeasurement == machine.UnitOfMeasurement); + if (workEfficiencyCompany != null) + { + row[4] = workEfficiencyCompany.BaseWorkEfficiency; + } + int b = 0; + List list = new List(); + foreach (var project in projects) + { + var workEfficiency = (from x in constructionLogWorkEfficiencyProjects + where x.TypeId == machine.TypeId && x.UnitOfMeasurement == machine.UnitOfMeasurement && x.ProjectId == project.ProjectId && x.AvgWorkEfficiency != null + select x).FirstOrDefault(); + if (workEfficiency != null) + { + decimal d = decimal.Round(workEfficiency.AvgWorkEfficiency.Value, 2); + row[8 + b] = d; + list.Add(d); + } + b++; + } + if (list.Count > 0) + { + row[5] = decimal.Round(Convert.ToDecimal(list.Sum() / Convert.ToDecimal(list.Count)), 2); + } + row[6] = "Machine"; + row[7] = machine.TypeId; + table.Rows.Add(row); + a++; + } + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 统计按钮事件 + /// + /// 统计 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + GetData(); + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.Grid1.Rows.Count > 0) + { + BLL.ConstructionLogWorkEfficiencyCompanyService.DeleteConstructionLogWorkEfficiencyCompanys(); + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int a = mergedRow.Value("index"); + string type = values.Value("Type"); + if (!string.IsNullOrEmpty(type)) + { + string unitOfMeasurement = values.Value("UnitOfMeasurement"); + string baseWorkEfficiency = values.Value("BaseWorkEfficiency"); + string avgWorkEfficiency = values.Value("AvgWorkEfficiency"); + string typeId = values.Value("TypeId"); + Model.ZHGL_ConstructionLogWorkEfficiencyCompany workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyCompany(); + workEfficiency.ConstructionLogWorkEfficiencyCompanyId = SQLHelper.GetNewID(); + workEfficiency.Type = type; + workEfficiency.TypeId = typeId; + workEfficiency.UnitOfMeasurement = unitOfMeasurement; + workEfficiency.BaseWorkEfficiency = Funs.GetNewDecimal(baseWorkEfficiency); + workEfficiency.AvgWorkEfficiency = Funs.GetNewDecimal(avgWorkEfficiency); + BLL.ConstructionLogWorkEfficiencyCompanyService.AddConstructionLogWorkEfficiencyCompany(workEfficiency); + } + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("请先统计后再保存！", MessageBoxIcon.Warning); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx.designer.cs new file mode 100644 index 00000000..845c1807 --- /dev/null +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PZHGL.InformationProject { + + + public partial class CompanyConstructionLogWorkEfficiencySum { + + /// + /// 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; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// BtnAnalyse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// nbBaseWorkEfficiency 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox nbBaseWorkEfficiency; + } +} diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx index 148b95e8..c956c415 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx @@ -40,9 +40,13 @@ + + + diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs index 8c107946..ebf59c9c 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs @@ -1283,5 +1283,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject Alert.ShowInTop("请选择合同编号和专业工程！", MessageBoxIcon.Warning); } } + + protected void imgBtnFile_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdConstructionLogId.Text)) //新增记录 + { + this.hdConstructionLogId.Text = SQLHelper.GetNewID(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ConstructionLog&menuId={2}", 0, this.hdConstructionLogId.Text, BLL.Const.ConstructionLogMenuId))); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.designer.cs index 358072d6..b223ac56 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.PZHGL.InformationProject { /// protected global::FineUIPro.Toolbar Toolbar3; + /// + /// imgBtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnFile; + /// /// hdWorkPostId 控件。 /// diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs index 55ce0406..9199652f 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs @@ -184,7 +184,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject rootNode.Expanded = true; this.tvControlItem.Nodes.Add(rootNode); var logs = from x in Funs.DB.ZHGL_ProjectConstructionLog - where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileMan == this.CurrUser.PersonId && x.CompileDate >= startTime && x.CompileDate < endTime + where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate >= startTime && x.CompileDate < endTime select x; foreach (var item in logs) { diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx.cs index 57c25ab7..e5f6eb46 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx.cs @@ -82,6 +82,9 @@ namespace FineUIPro.Web.PZHGL.InformationProject where x.ProjectId == this.CurrUser.LoginProjectId orderby x.ContractNum select x).ToList(); + var workEfficiencyProjects = from x in db.ZHGL_ConstructionLogWorkEfficiencyProject + where x.ProjectId == this.CurrUser.LoginProjectId + select x; DataTable table = new DataTable(); table.Columns.Add(new DataColumn("Id", typeof(String))); table.Columns.Add(new DataColumn("Code", typeof(String))); @@ -146,7 +149,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject row[1] = a; row[2] = person.WorkPostName; row[3] = person.UnitOfMeasurement; - + var workEfficiencyProject = workEfficiencyProjects.FirstOrDefault(x=> x.TypeId == person.TypeId && x.UnitOfMeasurement == person.UnitOfMeasurement); + if (workEfficiencyProject != null) + { + row[4] = workEfficiencyProject.BaseWorkEfficiency; + } int b = 0; List list = new List(); foreach (var contract in contracts) @@ -185,7 +192,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject row[1] = a; row[2] = machine.SpecialEquipmentName; row[3] = machine.UnitOfMeasurement; - + var workEfficiencyProject = workEfficiencyProjects.FirstOrDefault(x => x.TypeId == machine.TypeId && x.UnitOfMeasurement == machine.UnitOfMeasurement); + if (workEfficiencyProject != null) + { + row[4] = workEfficiencyProject.BaseWorkEfficiency; + } int b = 0; List list = new List(); foreach (var contract in contracts) diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 5d5236b3..b4f9e702 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1733,6 +1733,9 @@ namespace Model partial void InsertZHGL_ConstructionLogWorkEfficiency(ZHGL_ConstructionLogWorkEfficiency instance); partial void UpdateZHGL_ConstructionLogWorkEfficiency(ZHGL_ConstructionLogWorkEfficiency instance); partial void DeleteZHGL_ConstructionLogWorkEfficiency(ZHGL_ConstructionLogWorkEfficiency instance); + partial void InsertZHGL_ConstructionLogWorkEfficiencyCompany(ZHGL_ConstructionLogWorkEfficiencyCompany instance); + partial void UpdateZHGL_ConstructionLogWorkEfficiencyCompany(ZHGL_ConstructionLogWorkEfficiencyCompany instance); + partial void DeleteZHGL_ConstructionLogWorkEfficiencyCompany(ZHGL_ConstructionLogWorkEfficiencyCompany instance); partial void InsertZHGL_ConstructionLogWorkEfficiencyMonth(ZHGL_ConstructionLogWorkEfficiencyMonth instance); partial void UpdateZHGL_ConstructionLogWorkEfficiencyMonth(ZHGL_ConstructionLogWorkEfficiencyMonth instance); partial void DeleteZHGL_ConstructionLogWorkEfficiencyMonth(ZHGL_ConstructionLogWorkEfficiencyMonth instance); @@ -7118,6 +7121,14 @@ namespace Model } } + public System.Data.Linq.Table ZHGL_ConstructionLogWorkEfficiencyCompany + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table ZHGL_ConstructionLogWorkEfficiencyMonth { get @@ -305742,6 +305753,188 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ZHGL_ConstructionLogWorkEfficiencyCompany")] + public partial class ZHGL_ConstructionLogWorkEfficiencyCompany : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ConstructionLogWorkEfficiencyCompanyId; + + private string _Type; + + private string _TypeId; + + private string _UnitOfMeasurement; + + private System.Nullable _BaseWorkEfficiency; + + private System.Nullable _AvgWorkEfficiency; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnConstructionLogWorkEfficiencyCompanyIdChanging(string value); + partial void OnConstructionLogWorkEfficiencyCompanyIdChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); + partial void OnTypeIdChanging(string value); + partial void OnTypeIdChanged(); + partial void OnUnitOfMeasurementChanging(string value); + partial void OnUnitOfMeasurementChanged(); + partial void OnBaseWorkEfficiencyChanging(System.Nullable value); + partial void OnBaseWorkEfficiencyChanged(); + partial void OnAvgWorkEfficiencyChanging(System.Nullable value); + partial void OnAvgWorkEfficiencyChanged(); + #endregion + + public ZHGL_ConstructionLogWorkEfficiencyCompany() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionLogWorkEfficiencyCompanyId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ConstructionLogWorkEfficiencyCompanyId + { + get + { + return this._ConstructionLogWorkEfficiencyCompanyId; + } + set + { + if ((this._ConstructionLogWorkEfficiencyCompanyId != value)) + { + this.OnConstructionLogWorkEfficiencyCompanyIdChanging(value); + this.SendPropertyChanging(); + this._ConstructionLogWorkEfficiencyCompanyId = value; + this.SendPropertyChanged("ConstructionLogWorkEfficiencyCompanyId"); + this.OnConstructionLogWorkEfficiencyCompanyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="NVarChar(20)")] + public string Type + { + get + { + return this._Type; + } + set + { + if ((this._Type != value)) + { + this.OnTypeChanging(value); + this.SendPropertyChanging(); + this._Type = value; + this.SendPropertyChanged("Type"); + this.OnTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeId", DbType="NVarChar(50)")] + public string TypeId + { + get + { + return this._TypeId; + } + set + { + if ((this._TypeId != value)) + { + this.OnTypeIdChanging(value); + this.SendPropertyChanging(); + this._TypeId = value; + this.SendPropertyChanged("TypeId"); + this.OnTypeIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitOfMeasurement", DbType="NVarChar(50)")] + public string UnitOfMeasurement + { + get + { + return this._UnitOfMeasurement; + } + set + { + if ((this._UnitOfMeasurement != value)) + { + this.OnUnitOfMeasurementChanging(value); + this.SendPropertyChanging(); + this._UnitOfMeasurement = value; + this.SendPropertyChanged("UnitOfMeasurement"); + this.OnUnitOfMeasurementChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BaseWorkEfficiency", DbType="Decimal(18,2)")] + public System.Nullable BaseWorkEfficiency + { + get + { + return this._BaseWorkEfficiency; + } + set + { + if ((this._BaseWorkEfficiency != value)) + { + this.OnBaseWorkEfficiencyChanging(value); + this.SendPropertyChanging(); + this._BaseWorkEfficiency = value; + this.SendPropertyChanged("BaseWorkEfficiency"); + this.OnBaseWorkEfficiencyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AvgWorkEfficiency", DbType="Decimal(18,2)")] + public System.Nullable AvgWorkEfficiency + { + get + { + return this._AvgWorkEfficiency; + } + set + { + if ((this._AvgWorkEfficiency != value)) + { + this.OnAvgWorkEfficiencyChanging(value); + this.SendPropertyChanging(); + this._AvgWorkEfficiency = value; + this.SendPropertyChanged("AvgWorkEfficiency"); + this.OnAvgWorkEfficiencyChanged(); + } + } + } + + 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.ZHGL_ConstructionLogWorkEfficiencyMonth")] public partial class ZHGL_ConstructionLogWorkEfficiencyMonth : INotifyPropertyChanging, INotifyPropertyChanged {