From b238b27726d08d1cb1d059862698cc35748d3a63 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 5 Sep 2023 09:52:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=B8=8E=E5=90=88=E5=90=8C=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-09-05.sql | 51 +++++ .../1-2质量管理（Menu_CQMS）.sql | 32 +-- .../CQMS/WBS/ControlItemAndCycleService.cs | 1 + SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 26 +++ .../CQMS/WBS/ControlItemAndCycleSet.aspx.cs | 3 + .../CQMS/WBS/ControlItemInitSet.aspx | 2 +- .../WBS/ProjectControlItemInitSet.aspx.cs | 1 + SGGL/FineUIPro.Web/ErrLog.txt | 42 ++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 + .../ContractCompile/ContractTrackList.aspx.cs | 216 +++++++++++++++--- .../ContractTrackMatchWBS.aspx | 3 + .../ContractTrackMatchWBS.aspx.cs | 130 ++++++++++- SGGL/FineUIPro.Web/common/Menu_Doc.xml | 8 + SGGL/FineUIPro.Web/common/Menu_PGJSX.xml | 7 + SGGL/Model/Model.cs | 26 ++- 15 files changed, 497 insertions(+), 53 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-09-05.sql create mode 100644 SGGL/FineUIPro.Web/common/Menu_Doc.xml create mode 100644 SGGL/FineUIPro.Web/common/Menu_PGJSX.xml diff --git a/DataBase/版本日志/SGGLDB_V2023-09-05.sql b/DataBase/版本日志/SGGLDB_V2023-09-05.sql new file mode 100644 index 00000000..875cccf9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-05.sql @@ -0,0 +1,51 @@ +update WBS_ControlItemProject set Weights=b.Weights from WBS_ControlItemProject a, WBS_ControlItemInit b + where a.ControlItemCode=b.ControlItemCode + GO + + update WBS_ControlItemAndCycle set Weights=b.Weights from WBS_ControlItemAndCycle a, WBS_ControlItemInit b + where a.InitControlItemCode=b.ControlItemCode + GO + + +ALTER VIEW [dbo].[View_WBS] +AS +select '1' as Id,'0' as SupId ,'JZ' as Code, '' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode, +ProjectId from dbo.WBS_UnitWork +Union +select '2' as Id,'0' as SupId ,'AZ' as Code, 'װ' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode, +ProjectId from dbo.WBS_UnitWork +Union +select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, isnull(WBSCode,'')+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode, +ProjectId from dbo.WBS_UnitWork +Union all +select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,isnull(WBSCode,'')+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null +Union all +select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, isnull(WBSCode,'')+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null + + + + + + + + +GO + + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('8317C0F7-3A69-48AB-87E5-03E96C543B1C','','CQMS/Check/SpotDataCheck.aspx',20,'B8500D87-407E-458C-9915-FD54F0E81F36','Menu_CQMS',0,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('9EAC9A0F-0E2E-4650-8318-3C9BC5EFC35D','8317C0F7-3A69-48AB-87E5-03E96C543B1C','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('BDAFA160-FC9D-4B2C-A887-178453E945FE','8317C0F7-3A69-48AB-87E5-03E96C543B1C','ύ',2) +GO + +delete from Sys_ButtonToMenu where MenuId='0B17549C-2749-4255-BFF4-574902E878FA' +delete from Sys_Menu where MenuId='0B17549C-2749-4255-BFF4-574902E878FA' +GO + +alter table WBS_ControlItemAndCycle add PlanCost decimal(9,2) null +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql b/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql index 7d1369b0..b65a32a6 100644 --- a/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql +++ b/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql @@ -327,28 +327,28 @@ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('5B1DCDDD-344E-4BD3-8660-E816D5EF9E1E','CC43E208-335D-4AE3-A1CE-B2D8510AE854','提交',5) GO ---INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) ---VALUES('8317C0F7-3A69-48AB-87E5-03E96C543B1C','资料验收','CQMS/Check/SpotDataCheck.aspx',20,'B8500D87-407E-458C-9915-FD54F0E81F36','Menu_CQMS',0,1,1) ---GO ---INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) ---VALUES('9EAC9A0F-0E2E-4650-8318-3C9BC5EFC35D','8317C0F7-3A69-48AB-87E5-03E96C543B1C','保存',1) ---INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) ---VALUES('BDAFA160-FC9D-4B2C-A887-178453E945FE','8317C0F7-3A69-48AB-87E5-03E96C543B1C','提交',2) ---GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('0B17549C-2749-4255-BFF4-574902E878FA','资料验收','CQMS/Check/MaterialAcceptance.aspx',20,'B8500D87-407E-458C-9915-FD54F0E81F36','Menu_CQMS',0,1,1) +VALUES('8317C0F7-3A69-48AB-87E5-03E96C543B1C','资料验收','CQMS/Check/SpotDataCheck.aspx',20,'B8500D87-407E-458C-9915-FD54F0E81F36','Menu_CQMS',0,1,1) GO INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('00B413F9-1BB9-4F56-8952-D661716E9EF2','0B17549C-2749-4255-BFF4-574902E878FA','增加',1) +VALUES('9EAC9A0F-0E2E-4650-8318-3C9BC5EFC35D','8317C0F7-3A69-48AB-87E5-03E96C543B1C','保存',1) INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('419D13BE-438D-450B-92AE-2737B571A4F1','0B17549C-2749-4255-BFF4-574902E878FA','修改',2) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('88813BE-438D-450B-92AE-2737B571A4F1','0B17549C-2749-4255-BFF4-574902E878FA','删除',3) +VALUES('BDAFA160-FC9D-4B2C-A887-178453E945FE','8317C0F7-3A69-48AB-87E5-03E96C543B1C','提交',2) GO + +--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +--VALUES('0B17549C-2749-4255-BFF4-574902E878FA','资料验收','CQMS/Check/MaterialAcceptance.aspx',20,'B8500D87-407E-458C-9915-FD54F0E81F36','Menu_CQMS',0,1,1) +--GO +--INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +--VALUES('00B413F9-1BB9-4F56-8952-D661716E9EF2','0B17549C-2749-4255-BFF4-574902E878FA','增加',1) +--INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +--VALUES('419D13BE-438D-450B-92AE-2737B571A4F1','0B17549C-2749-4255-BFF4-574902E878FA','修改',2) +--GO +--INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +--VALUES('88813BE-438D-450B-92AE-2737B571A4F1','0B17549C-2749-4255-BFF4-574902E878FA','删除',3) +--GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('1433BE70-13C0-4AC7-BC3D-34C9471CE2A8','质量验收统计','CQMS/Check/SpotCheckStatistics.aspx',30,'B8500D87-407E-458C-9915-FD54F0E81F36','Menu_CQMS',0,1,1) GO diff --git a/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs b/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs index 3bd3e464..af7418a5 100644 --- a/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs +++ b/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs @@ -100,6 +100,7 @@ namespace BLL newControlItemAndCycle.Costs = ControlItemAndCycle.Costs; newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType; newControlItemAndCycle.RealEndDate = ControlItemAndCycle.RealEndDate; + newControlItemAndCycle.PlanCost = ControlItemAndCycle.PlanCost; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 98f1f8fc..02518032 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -739,5 +739,31 @@ namespace BLL return returnValues; } #endregion + + #region 更新分部分项概算费用 + /// + /// 更新分部分项概算费用 + /// + /// + /// + /// + /// + public static void UpdateWorkPackagesPlanCost(List workPackages, string workPackageId, decimal changePlanCost) + { + var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == workPackageId); + if (workPackage != null) + { + if (workPackage.PlanCost == null) + { + workPackage.PlanCost = changePlanCost; + } + else + { + workPackage.PlanCost += changePlanCost; + } + UpdateWorkPackagesPlanCost(workPackages, workPackage.SuperWorkPackageId, changePlanCost); + } + } + #endregion } } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleSet.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleSet.aspx.cs index 452c8b46..e8f1898f 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleSet.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleSet.aspx.cs @@ -502,6 +502,7 @@ namespace FineUIPro.Web.CQMS.WBS newControlItemAndCycle.ControlItemDef = controlItemProject.ControlItemDef; newControlItemAndCycle.HGForms = controlItemProject.HGForms; newControlItemAndCycle.SHForms = controlItemProject.SHForms; + newControlItemAndCycle.Weights = controlItemProject.Weights; newControlItemAndCycle.Standard = controlItemProject.Standard; newControlItemAndCycle.ClauseNo = controlItemProject.ClauseNo; newControlItemAndCycle.CheckNum = controlItemProject.CheckNum; @@ -597,6 +598,7 @@ namespace FineUIPro.Web.CQMS.WBS newControlItemAndCycle.ControlItemDef = controlItemProject.ControlItemDef; newControlItemAndCycle.HGForms = controlItemProject.HGForms; newControlItemAndCycle.SHForms = controlItemProject.SHForms; + newControlItemAndCycle.Weights = controlItemProject.Weights; newControlItemAndCycle.Standard = controlItemProject.Standard; newControlItemAndCycle.ClauseNo = controlItemProject.ClauseNo; newControlItemAndCycle.IsApprove = true; @@ -668,6 +670,7 @@ namespace FineUIPro.Web.CQMS.WBS newControlItemAndCycle.ControlItemDef = controlItemProject.ControlItemDef; newControlItemAndCycle.HGForms = controlItemProject.HGForms; newControlItemAndCycle.SHForms = controlItemProject.SHForms; + newControlItemAndCycle.Weights = controlItemProject.Weights; newControlItemAndCycle.Standard = controlItemProject.Standard; newControlItemAndCycle.ClauseNo = controlItemProject.ClauseNo; newControlItemAndCycle.CheckNum = controlItemProject.CheckNum; diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitSet.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitSet.aspx index 6eed8437..05076cf0 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitSet.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitSet.aspx @@ -70,7 +70,7 @@ - +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.index.MenuSwitchMethod(String type) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\index.aspx.cs:行号 417 + 在 FineUIPro.Web.index.btnPerson_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\index.aspx.cs:行号 467 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2023 11:44:42 +出错文件:http://localhost:8797/index.aspx +IP地址:::1 + +出错时间:09/03/2023 11:44:42 + + +错误信息开始=====> +错误类型:ChangeConflictException +错误信息:2 的 1 更新失败。 +错误堆栈: + 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) + 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) + 在 System.Data.Linq.DataContext.SubmitChanges() + 在 BLL.PhtglContractTrackService.UpdatePHTGL_ContractTrack(PHTGL_ContractTrack newtable) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\PHTGL\ContractCompile\PhtglContracttrackService .cs:行号 200 + 在 FineUIPro.Web.PHTGL.ContractCompile.ContractTrackList.btnSave_OnClick(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PHTGL\ContractCompile\ContractTrackList.aspx.cs:行号 371 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/04/2023 10:22:11 +出错文件:http://localhost:8797/PHTGL/ContractCompile/ContractTrackList.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/04/2023 10:22:11 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index e1616b8e..40fcdd75 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -322,6 +322,7 @@ + @@ -330,6 +331,7 @@ + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs index 71f4e802..3e10c138 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs @@ -16,8 +16,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile public string ContractId { get => (string)ViewState["ContractId"]; - set => ViewState["ContractId"] =value; - } + set => ViewState["ContractId"] = value; + } protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) @@ -29,11 +29,11 @@ namespace FineUIPro.Web.PHTGL.ContractCompile this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId); this.DropContractCode.DataBind(); Funs.FineUIPleaseSelect(this.DropContractCode); - DropMainContractCode_SelectedIndexChanged(null,null); + DropMainContractCode_SelectedIndexChanged(null, null); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); // 绑定表格 this.BindGrid(); - + } } @@ -61,33 +61,33 @@ namespace FineUIPro.Web.PHTGL.ContractCompile Grid3.DataSource = null; Grid3.DataBind(); } - + } private void BindGrid2() { var db = Funs.DB; var q = from x in db.PHTGL_ContractTrackMatchWBS - join y in db.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId - where x.ContractTrackId==Grid1.SelectedRowID - select new - { - x.Id, - x.ContractTrackId, - x.ControlItemAndCycleId, - y.ControlItemAndCycleCode, - y.ControlItemContent, - y.Weights, - x.WorkPackageEstimate - }; + join y in db.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId + where x.ContractTrackId == Grid1.SelectedRowID + select new + { + x.Id, + x.ContractTrackId, + x.ControlItemAndCycleId, + y.ControlItemAndCycleCode, + y.ControlItemContent, + y.Weights, + x.WorkPackageEstimate + }; ; - Grid2.RecordCount =q.Count(); + Grid2.RecordCount = q.Count(); Grid2.DataSource = q; Grid2.DataBind(); string deleteScript = GetDeleteScript(); // 在第一行新增一条数据 btnMatchWBS_New.OnClientClick = Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", Grid1.SelectedRowID, "增加 - ")); - + } private string GetDeleteScript() { @@ -165,7 +165,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } else { - ShowNotify("请选择施工分包合同！",MessageBoxIcon.Information); + ShowNotify("请选择施工分包合同！", MessageBoxIcon.Information); } } @@ -196,8 +196,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected void Grid1_OnRowClick(object sender, GridRowClickEventArgs e) { - BindGrid2(); - BindGrid3(); + BindGrid2(); + BindGrid3(); } /// @@ -243,13 +243,42 @@ namespace FineUIPro.Web.PHTGL.ContractCompile { if (Grid2.SelectedRowIndexArray.Length > 0) { - + Model.SGGLDB db = Funs.DB; + var controlItemAndCycles = from x in db.WBS_ControlItemAndCycle + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + var unitWorks = from x in db.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + var workPackages = (from x in db.WBS_WorkPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); foreach (int rowIndex in Grid2.SelectedRowIndexArray) { string rowID = Grid2.DataKeys[rowIndex][0].ToString(); var p = BLL.PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(rowID); if (p != null) { + decimal changePlanCost = 0 - (p.WorkPackageEstimate ?? 0); + var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == p.ControlItemAndCycleId); + c.PlanCost = 0; + BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c); + //更新上级WBS内容概算费用 + BLL.WorkPackageService.UpdateWorkPackagesPlanCost(workPackages, c.WorkPackageId, changePlanCost); + var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == c.WorkPackageId); + if (workPackage != null) + { + var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); + if (unitWork.PlanCost == null) + { + unitWork.PlanCost = changePlanCost; + } + else + { + unitWork.PlanCost += changePlanCost; + } + } + db.SubmitChanges(); PhtglContracttrackmatchwbsService.DeleteModelById(rowID); } } @@ -284,8 +313,31 @@ namespace FineUIPro.Web.PHTGL.ContractCompile private void SaveGrid3() { - + Model.SGGLDB db = Funs.DB; + var list = (from x in db.PHTGL_ContractTrackProgress + where x.ContractTrackId == Grid1.SelectedRowID + select x).ToList(); PhtglContracttrackprogressService.DeleteModleByContractTrackId(Grid1.SelectedRowID); + decimal totalWeights = 0; + var SelectedList = (from x in db.PHTGL_ContractTrackMatchWBS + where x.ContractTrackId == Grid1.SelectedRowID + select x.ControlItemAndCycleId).ToList(); + var totalControlItemAndCycles = from x in db.WBS_ControlItemAndCycle + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + var unitWorks = from x in db.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + var workPackages = (from x in db.WBS_WorkPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + var controlItemAndCycles = from x in totalControlItemAndCycles + where SelectedList.Contains(x.ControlItemAndCycleId) + select x; + foreach (var controlItemAndCycle in controlItemAndCycles) + { + totalWeights += controlItemAndCycle.Weights ?? 0; + } JArray EditorArr = Grid3.GetMergedData(); if (EditorArr.Count > 0) { @@ -304,12 +356,120 @@ namespace FineUIPro.Web.PHTGL.ContractCompile model.ACWP_Percentage = Funs.GetNewDecimal(objects["values"]["ACWP_Percentage"].ToString()); model.Date = objects["values"]["Date"].ToString(); BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model); + var old = list.FirstOrDefault(x => x.Date == model.Date); + decimal oldValue = 0; + if (old != null) + { + oldValue = old.ACWP_OutputValue ?? 0; + } + decimal changeValue = (model.ACWP_OutputValue ?? 0) - oldValue; + if (changeValue != 0) + { + foreach (var item in controlItemAndCycles) + { + var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == item.ControlItemAndCycleId); + decimal thisValue = 0; + if (totalWeights > 0 && c.Weights.HasValue) + { + thisValue = decimal.Round(c.Weights.Value / totalWeights * changeValue, 2); + } + DateTime? months = Funs.GetNewDateTime(model.Date + "-01"); + var WorkPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.WorkPackageId); + Model.WBS_WorkPackageDetail WorkPackageDetail = BLL.WorkPackageDetailService.GetWorkPackageDetailByWorkPackageIdAndMonths(item.WorkPackageId, months.Value); + if (WorkPackageDetail != null) + { + WorkPackageDetail.ThisValue += thisValue; + } + else + { + WorkPackageDetail = new Model.WBS_WorkPackageDetail(); + WorkPackageDetail.WorkPackageDetailId = SQLHelper.GetNewID(); + WorkPackageDetail.WorkPackageId = item.WorkPackageId; + WorkPackageDetail.Months = months; + WorkPackageDetail.ThisValue = thisValue; + db.WBS_WorkPackageDetail.InsertOnSubmit(WorkPackageDetail); + } + //更新上级WBS内容每月实际费用 + UpdateWorkPackageParentThisValue(db, WorkPackage.SuperWorkPackageId, months.Value, thisValue); + ////更新单位工程 + Model.WBS_WorkPackageParentDetail unitWorkDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(WorkPackage.UnitWorkId, months.Value); + if (unitWorkDetail != null) + { + unitWorkDetail.ThisValue += thisValue; + } + else + { + unitWorkDetail = new Model.WBS_WorkPackageParentDetail(); + unitWorkDetail.WorkPackageParentDetailId = SQLHelper.GetNewID(); + unitWorkDetail.ParentId = WorkPackage.UnitWorkId; + unitWorkDetail.Months = months; + unitWorkDetail.ThisValue = thisValue; + db.WBS_WorkPackageParentDetail.InsertOnSubmit(unitWorkDetail); + } + ////更新建筑、安装工程 + Model.WBS_UnitWork unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == WorkPackage.UnitWorkId); + if (unitWork != null) + { + Model.WBS_WorkPackageParentDetail projectType = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(unitWork.ProjectType, this.CurrUser.LoginProjectId, months.Value); + if (projectType != null) + { + projectType.ThisValue += thisValue; + } + else + { + projectType = new Model.WBS_WorkPackageParentDetail(); + projectType.WorkPackageParentDetailId = SQLHelper.GetNewID(); + projectType.ParentId = unitWork.ProjectType; + projectType.ProjectId = this.CurrUser.LoginProjectId; + projectType.Months = months; + projectType.ThisValue = thisValue; + db.WBS_WorkPackageParentDetail.InsertOnSubmit(projectType); + } + } + db.SubmitChanges(); + } + } } } ShowNotify("保存成功", MessageBoxIcon.Success); } + #region 更新上级WBS内容每月实际费用 + /// + /// 更新上级WBS内容每月实际费用 + /// + /// + /// + /// + /// + private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue) + { + Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId); + if (workPackage != null) + { + Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months); + if (parentDetail != null) + { + parentDetail.ThisValue += thisValue; + } + else + { + parentDetail = new Model.WBS_WorkPackageParentDetail(); + parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID(); + parentDetail.ParentId = SuperWorkPackageId; + parentDetail.Months = months; + parentDetail.ThisValue = thisValue; + db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail); + } + if (workPackage.SuperWorkPackageId != null) //还存在上级节点，需要继续循环 + { + UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue); + } + } + } + #endregion + protected void btnSave_OnClick(object sender, EventArgs e) { JArray EditorArr = Grid1.GetMergedData(); @@ -499,7 +659,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); if (model != null) { - ContractId=model.ContractId; + ContractId = model.ContractId; this.txtContractName.Text = model.ContractName; } else @@ -509,7 +669,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } } - BindGrid(); + BindGrid(); } protected void btnImport_Click(object sender, EventArgs e) @@ -525,7 +685,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } else { - ShowNotify("请选择施工分包合同",MessageBoxIcon.Question); + ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); } } @@ -535,6 +695,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile BindGrid2(); } - + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx index 579c0fc2..1557e77d 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx @@ -68,6 +68,9 @@ + + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs index 916b6ef4..0b76d3dc 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs @@ -16,6 +16,36 @@ namespace FineUIPro.Web.PHTGL.ContractCompile set { ViewState["ContractTrackId"] = value; } } + /// + /// 被选择项列表 + /// + public List SelectedList + { + get + { + return (List)ViewState["SelectedList"]; + } + set + { + ViewState["SelectedList"] = value; + } + } + + /// + /// 未被选择项列表 + /// + public List NoSelectedList + { + get + { + return (List)ViewState["NoSelectedList"]; + } + set + { + ViewState["NoSelectedList"] = value; + } + } + #region 页面加载 /// /// 页面加载 @@ -27,7 +57,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile if (!IsPostBack) { ContractTrackId = Request.Params["ContractTrackId"]; - + this.SelectedList = new List(); + this.NoSelectedList = new List(); InitTreeMenu(); } } @@ -358,6 +389,21 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e) { + if (Grid1.SelectedRowIDArray.Length > 0) + { + var Ids = Grid1.SelectedRowIDArray; + for (int i = 0; i < this.Grid1.Rows.Count; i++) + { + if (Ids.Contains(this.Grid1.Rows[i].RowID)) + { + SelectedList.Add(this.Grid1.Rows[i].RowID); + } + else + { + NoSelectedList.Add(this.Grid1.Rows[i].RowID); + } + } + } BindGrid(); } #endregion @@ -407,7 +453,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// private void BindGrid() { - string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum" + string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,Weights" + @" FROM WBS_ControlItemAndCycle "; List listStr = new List(); strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 "; @@ -463,10 +509,53 @@ namespace FineUIPro.Web.PHTGL.ContractCompile protected void btnAccept_Click(object sender, EventArgs e) { - if (Grid1.SelectedRowIDArray.Length>0) + if (Grid1.SelectedRowIDArray.Length > 0) { - var Ids=Grid1.SelectedRowIDArray; - foreach (var item in Ids) + var Ids = Grid1.SelectedRowIDArray; + for (int i = 0; i < this.Grid1.Rows.Count; i++) + { + if (Ids.Contains(this.Grid1.Rows[i].RowID)) + { + SelectedList.Add(this.Grid1.Rows[i].RowID); + } + else + { + if (SelectedList.Contains(this.Grid1.Rows[i].RowID)) + { + SelectedList.Remove(this.Grid1.Rows[i].RowID); + } + NoSelectedList.Add(this.Grid1.Rows[i].RowID); + } + } + } + if (SelectedList.Count > 0) + { + SelectedList = SelectedList.Distinct().ToList(); + decimal estimatedAmount = 0; + var contractTrack = PhtglContractTrackService.GetPHTGL_ContractTrackById(ContractTrackId); + if (contractTrack != null && contractTrack.EstimatedAmount.HasValue) + { + estimatedAmount = contractTrack.EstimatedAmount.Value; + } + decimal totalWeights = 0; + Model.SGGLDB db = Funs.DB; + var totalControlItemAndCycles = from x in db.WBS_ControlItemAndCycle + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + var unitWorks = from x in db.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + var workPackages = (from x in db.WBS_WorkPackage + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + var controlItemAndCycles = from x in totalControlItemAndCycles + where SelectedList.Contains(x.ControlItemAndCycleId) + select x; + foreach (var controlItemAndCycle in controlItemAndCycles) + { + totalWeights += controlItemAndCycle.Weights ?? 0; + } + foreach (var item in SelectedList) { var querymodel = new Model.PHTGL_ContractTrackMatchWBS { @@ -484,7 +573,34 @@ namespace FineUIPro.Web.PHTGL.ContractCompile ControlItemAndCycleId = item, }; + var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == item); + decimal oldPlanCost = c.PlanCost ?? 0; + decimal changePlanCost = 0; + if (estimatedAmount > 0 && totalWeights > 0 && c.Weights.HasValue) + { + //工作包概算费用 + newtable.WorkPackageEstimate = decimal.Round(c.Weights.Value / totalWeights * estimatedAmount, 2); + } BLL.PhtglContracttrackmatchwbsService.AddPHTGL_ContractTrackMatchWBS(newtable); + c.PlanCost = newtable.WorkPackageEstimate ?? 0; + changePlanCost += (newtable.WorkPackageEstimate ?? 0) - oldPlanCost; + BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c); + //更新上级WBS内容概算费用 + BLL.WorkPackageService.UpdateWorkPackagesPlanCost(workPackages, c.WorkPackageId, changePlanCost); + var workPackage = workPackages.FirstOrDefault(x=>x.WorkPackageId== c.WorkPackageId); + if (workPackage != null) + { + var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); + if (unitWork.PlanCost == null) + { + unitWork.PlanCost = changePlanCost; + } + else + { + unitWork.PlanCost += changePlanCost; + } + } + db.SubmitChanges(); } } ShowNotify("添加成功", MessageBoxIcon.Success); @@ -492,7 +608,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } else { - ShowNotify("请选择需要添加的数据",MessageBoxIcon.Information); + ShowNotify("请选择需要添加的数据", MessageBoxIcon.Information); } } @@ -508,7 +624,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile if (queryResult.Any()) { e.RowCssClass = "color3"; - } + } } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Doc.xml b/SGGL/FineUIPro.Web/common/Menu_Doc.xml new file mode 100644 index 00000000..8ae51162 --- /dev/null +++ b/SGGL/FineUIPro.Web/common/Menu_Doc.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml new file mode 100644 index 00000000..c92461f4 --- /dev/null +++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 4254ee34..fa3e9548 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -290949,7 +290949,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(101)")] public string Name { get @@ -293605,6 +293605,8 @@ namespace Model private string _WBSCode; + private System.Nullable _PlanCost; + private EntityRef _WBS_WorkPackage; #region 可扩展性方法定义 @@ -293655,6 +293657,8 @@ namespace Model partial void OnRealEndDateChanged(); partial void OnWBSCodeChanging(string value); partial void OnWBSCodeChanged(); + partial void OnPlanCostChanging(System.Nullable value); + partial void OnPlanCostChanged(); #endregion public WBS_ControlItemAndCycle() @@ -294107,6 +294111,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(9,2)")] + public System.Nullable PlanCost + { + get + { + return this._PlanCost; + } + set + { + if ((this._PlanCost != value)) + { + this.OnPlanCostChanging(value); + this.SendPropertyChanging(); + this._PlanCost = value; + this.SendPropertyChanged("PlanCost"); + this.OnPlanCostChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] public WBS_WorkPackage WBS_WorkPackage { From 390865d5632de70ae9ce7fd238e2513fb51fb2dc Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 5 Sep 2023 10:18:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/Model/Model.cs | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 45926b12..123eed46 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -290949,7 +290949,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(101)")] public string Name { get @@ -293677,6 +293677,8 @@ namespace Model private string _WBSCode; + private System.Nullable _PlanCost; + private string _WorkPackageIds; private EntityRef _WBS_WorkPackage; @@ -293729,6 +293731,8 @@ namespace Model partial void OnRealEndDateChanged(); partial void OnWBSCodeChanging(string value); partial void OnWBSCodeChanged(); + partial void OnPlanCostChanging(System.Nullable value); + partial void OnPlanCostChanged(); partial void OnWorkPackageIdsChanging(string value); partial void OnWorkPackageIdsChanged(); #endregion @@ -294183,6 +294187,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(9,2)")] + public System.Nullable PlanCost + { + get + { + return this._PlanCost; + } + set + { + if ((this._PlanCost != value)) + { + this.OnPlanCostChanging(value); + this.SendPropertyChanging(); + this._PlanCost = value; + this.SendPropertyChanged("PlanCost"); + this.OnPlanCostChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageIds", DbType="NVarChar(2000)")] public string WorkPackageIds { From b53e552cfa08ef7f1b360d480edbe4602c2afaa3 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 5 Sep 2023 15:17:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E5=8C=85?= =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-09-05.sql | 14 ++ .../FineUIPro.Web/ZHGL/Plan/MainContract.aspx | 4 +- .../ZHGL/Plan/MainContract.aspx.cs | 6 +- .../ZHGL/Plan/MainContractEdit.aspx | 12 +- .../ZHGL/Plan/MainContractEdit.aspx.cs | 44 +----- .../Plan/MainContractEdit.aspx.designer.cs | 8 +- .../ZHGL/Plan/MainContractView.aspx | 12 +- .../ZHGL/Plan/MainContractView.aspx.cs | 15 +- .../Plan/MainContractView.aspx.designer.cs | 8 +- SGGL/Model/Model.cs | 138 ------------------ 10 files changed, 48 insertions(+), 213 deletions(-) diff --git a/DataBase/版本日志/SGGLDB_V2023-09-05.sql b/DataBase/版本日志/SGGLDB_V2023-09-05.sql index 875cccf9..da174d0d 100644 --- a/DataBase/版本日志/SGGLDB_V2023-09-05.sql +++ b/DataBase/版本日志/SGGLDB_V2023-09-05.sql @@ -48,4 +48,18 @@ delete from Sys_Menu where MenuId='0B17549C-2749-4255-BFF4-574902E878FA' GO alter table WBS_ControlItemAndCycle add PlanCost decimal(9,2) null +GO + + +alter table dbo.ActionPlan_MainContract drop constraint FK_ActionPlan_MainContract_Base_Project +alter table dbo.ActionPlan_MainContract drop constraint FK_ActionPlan_MainContract_Person_Persons_CompileMan +GO + +alter table dbo.ActionPlan_MainContract alter column ProjectId nvarchar(500) null +GO + +update dbo.ActionPlan_MainContract set ProjectId=b.ProjectName from ActionPlan_MainContract a, Base_Project b +where a.ProjectId=b.ProjectId +update dbo.ActionPlan_MainContract set CompileMan=b.PersonName from ActionPlan_MainContract a, Person_Persons b +where a.CompileMan=b.PersonId GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx index 181c9904..1d3d4706 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContract.aspx @@ -61,8 +61,8 @@ SortField="MainContractName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left"> - private void BindGrid() { - string strSql = "SELECT MainContract.MainContractId,MainContract.ProjectId,Project.ProjectName,MainContractCode,MainContract.MainContractName,MainContract.VersionNo,(CASE MainContract.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,MainContract.MainContractContents,MainContract.CompileMan,Users.PersonName AS CompileManName, MainContract.CompileDate,MainContract.States" + string strSql = "SELECT MainContract.MainContractId,MainContract.ProjectId,MainContractCode,MainContract.MainContractName,MainContract.VersionNo,(CASE MainContract.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,MainContract.MainContractContents,MainContract.CompileMan, MainContract.CompileDate,MainContract.States" + @" FROM ActionPlan_MainContract AS MainContract " - + @" LEFT JOIN Base_Project AS Project ON MainContract.ProjectId=Project.ProjectId " + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON MainContract.MainContractId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1" + @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId " - + @" LEFT JOIN Person_Persons AS Users ON Users.PersonId = MainContract.CompileMan " + @" WHERE 1=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != BLL.Const._Null) @@ -344,7 +342,7 @@ namespace FineUIPro.Web.ZHGL.Plan Model.ActionPlan_MainContract MainContract = MainContractService.GetMainContractById(id); if (MainContract != null) { - string projectName = BLL.ProjectService.GetProjectNameByProjectId(MainContract.ProjectId); + string projectName = MainContract.ProjectId; newUrl = uploadfilepath.Replace(".xlsx", MainContract.MainContractCode + "(" + MainContract.MainContractName + ")" + ".xlsx"); File.Copy(uploadfilepath, newUrl); // 第一步：读取文件流 diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx index 9ea167f7..ef276841 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx @@ -26,9 +26,9 @@ - - + + @@ -46,9 +46,9 @@ - - + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs index 787f909c..d50fb0f1 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs @@ -68,7 +68,6 @@ namespace FineUIPro.Web.ZHGL.Plan this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.ProjectId = this.CurrUser.LoginProjectId; this.MainContractId = Request.Params["MainContractId"]; - ProjectService.InitAllProjectDropDownList(this.drpProject, true); var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId); if (MainContract != null) @@ -79,11 +78,6 @@ namespace FineUIPro.Web.ZHGL.Plan q.Add(compileMan); } } - this.drpCompileMan.DataTextField = "PersonName"; - this.drpCompileMan.DataValueField = "PersonId"; - this.drpCompileMan.DataSource = q; - this.drpCompileMan.DataBind(); - Funs.FineUIPleaseSelect(this.drpCompileMan); this.drpPerson.DataTextField = "PersonName"; this.drpPerson.DataValueField = "PersonId"; this.drpPerson.DataSource = q; @@ -100,7 +94,7 @@ namespace FineUIPro.Web.ZHGL.Plan { txtEdition.Text = MainContract.Edition.ToString(); } - this.drpProject.SelectedValue = MainContract.ProjectId; + this.txtProjectId.Text = MainContract.ProjectId; ///读取编号 this.txtMainContractCode.Text = MainContract.MainContractCode; this.txtMainContractName.Text = MainContract.MainContractName; @@ -113,10 +107,7 @@ namespace FineUIPro.Web.ZHGL.Plan { this.drpProjectType.Hidden = true; } - if (!string.IsNullOrEmpty(MainContract.CompileMan)) - { - this.drpCompileMan.SelectedValue = MainContract.CompileMan; - } + this.txtCompileMan.Text = MainContract.CompileMan; if (MainContract.CompileDate != null) { this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", MainContract.CompileDate); @@ -137,8 +128,8 @@ namespace FineUIPro.Web.ZHGL.Plan txtMainContractName.Readonly = true; txtVersionNo.Readonly = true; drpProjectType.Readonly = true; - drpProject.Readonly = true; - drpCompileMan.Readonly = true; + txtProjectId.Readonly = true; + txtCompileMan.Readonly = true; txtCompileDate.Readonly = true; drpPerson.Readonly = true; ContactImg = -1; @@ -148,7 +139,7 @@ namespace FineUIPro.Web.ZHGL.Plan } else { - this.drpCompileMan.SelectedValue = this.CurrUser.PersonId; + this.txtCompileMan.Text = this.CurrUser.PersonName; this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.trAtt.Hidden = true; txtEdition.Text = "0"; @@ -181,11 +172,6 @@ namespace FineUIPro.Web.ZHGL.Plan /// protected void btnSave_Click(object sender, EventArgs e) { - if (this.drpCompileMan.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning); - return; - } this.SaveData(BLL.Const.BtnSave); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } @@ -197,16 +183,6 @@ namespace FineUIPro.Web.ZHGL.Plan /// protected void btnSubmit_Click(object sender, EventArgs e) { - if (this.drpProject.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择项目!", MessageBoxIcon.Warning); - return; - } - if (this.drpCompileMan.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning); - return; - } if (string.IsNullOrEmpty(HFMainContractId.Text)) { Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning); @@ -234,14 +210,8 @@ namespace FineUIPro.Web.ZHGL.Plan VersionNo = this.txtVersionNo.Text.Trim(), ProjectType = this.drpProjectType.SelectedValue, }; - if (this.drpProject.SelectedValue != BLL.Const._Null) - { - MainContract.ProjectId = this.drpProject.SelectedValue; - } - if (this.drpCompileMan.SelectedValue != BLL.Const._Null) - { - MainContract.CompileMan = this.drpCompileMan.SelectedValue; - } + MainContract.ProjectId = this.txtProjectId.Text; + MainContract.CompileMan = this.txtCompileMan.Text; if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim())) { MainContract.CompileDate = Convert.ToDateTime(this.txtCompileDate.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs index 8789b035..6bad3abf 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs @@ -58,13 +58,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.TextBox txtMainContractName; /// - /// drpProject 控件。 + /// txtProjectId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpProject; + protected global::FineUIPro.TextBox txtProjectId; /// /// txtVersionNo 控件。 @@ -85,13 +85,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.DropDownList drpProjectType; /// - /// drpCompileMan 控件。 + /// txtCompileMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpCompileMan; + protected global::FineUIPro.TextBox txtCompileMan; /// /// txtCompileDate 控件。 diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx index 81cc46ad..e78eda66 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx @@ -26,9 +26,9 @@ - - + + @@ -46,9 +46,9 @@ - - + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs index 4752e69f..3c3c2650 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs @@ -56,7 +56,6 @@ namespace FineUIPro.Web.ZHGL.Plan this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.ProjectId = this.CurrUser.LoginProjectId; this.MainContractId = Request.Params["MainContractId"]; - ProjectService.InitAllProjectDropDownList(this.drpProject, true); var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId); if (MainContract != null) @@ -67,11 +66,6 @@ namespace FineUIPro.Web.ZHGL.Plan q.Add(compileMan); } } - this.drpCompileMan.DataTextField = "PersonName"; - this.drpCompileMan.DataValueField = "PersonId"; - this.drpCompileMan.DataSource = q; - this.drpCompileMan.DataBind(); - Funs.FineUIPleaseSelect(this.drpCompileMan); this.drpPerson.DataTextField = "PersonName"; this.drpPerson.DataValueField = "PersonId"; this.drpPerson.DataSource = q; @@ -90,7 +84,7 @@ namespace FineUIPro.Web.ZHGL.Plan ///读取编号 this.txtMainContractCode.Text = MainContract.MainContractCode; this.txtMainContractName.Text = MainContract.MainContractName; - this.drpProject.SelectedValue = MainContract.ProjectId; + this.txtProjectId.Text = MainContract.ProjectId; this.txtVersionNo.Text = MainContract.VersionNo; if (!string.IsNullOrEmpty(MainContract.ProjectType)) { @@ -100,10 +94,7 @@ namespace FineUIPro.Web.ZHGL.Plan { this.drpProjectType.Hidden = true; } - if (!string.IsNullOrEmpty(MainContract.CompileMan)) - { - this.drpCompileMan.SelectedValue = MainContract.CompileMan; - } + this.txtCompileMan.Text = MainContract.CompileMan; if (MainContract.CompileDate != null) { this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", MainContract.CompileDate); @@ -119,7 +110,7 @@ namespace FineUIPro.Web.ZHGL.Plan } else { - this.drpCompileMan.SelectedValue = this.CurrUser.PersonId; + this.txtCompileMan.Text = this.CurrUser.PersonName; this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.trAtt.Hidden = true; txtEdition.Text = "0"; diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs index 8aa1064b..aefe939d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs @@ -58,13 +58,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.TextBox txtMainContractName; /// - /// drpProject 控件。 + /// txtProjectId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpProject; + protected global::FineUIPro.TextBox txtProjectId; /// /// txtVersionNo 控件。 @@ -85,13 +85,13 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::FineUIPro.DropDownList drpProjectType; /// - /// drpCompileMan 控件。 + /// txtCompileMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpCompileMan; + protected global::FineUIPro.TextBox txtCompileMan; /// /// txtCompileDate 控件。 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 123eed46..60b0c919 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -12320,10 +12320,6 @@ namespace Model private System.Nullable _IsCompanyReview; - private EntityRef _Base_Project; - - private EntityRef _Person_Persons; - private EntitySet _ActionPlan_MainContractApprove; private EntitySet _ActionPlan_MainContractOpinion; @@ -12364,8 +12360,6 @@ namespace Model public ActionPlan_MainContract() { - this._Base_Project = default(EntityRef); - this._Person_Persons = default(EntityRef); this._ActionPlan_MainContractApprove = new EntitySet(new Action(this.attach_ActionPlan_MainContractApprove), new Action(this.detach_ActionPlan_MainContractApprove)); this._ActionPlan_MainContractOpinion = new EntitySet(new Action(this.attach_ActionPlan_MainContractOpinion), new Action(this.detach_ActionPlan_MainContractOpinion)); OnCreated(); @@ -12402,10 +12396,6 @@ namespace Model { if ((this._ProjectId != value)) { - if (this._Base_Project.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -12526,10 +12516,6 @@ namespace Model { if ((this._CompileMan != value)) { - if (this._Person_Persons.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCompileManChanging(value); this.SendPropertyChanging(); this._CompileMan = value; @@ -12659,74 +12645,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_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.ActionPlan_MainContract.Remove(this); - } - this._Base_Project.Entity = value; - if ((value != null)) - { - value.ActionPlan_MainContract.Add(this); - this._ProjectId = value.ProjectId; - } - else - { - this._ProjectId = default(string); - } - this.SendPropertyChanged("Base_Project"); - } - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Person_Persons_CompileMan", Storage="_Person_Persons", ThisKey="CompileMan", OtherKey="PersonId", IsForeignKey=true)] - public Person_Persons Person_Persons - { - get - { - return this._Person_Persons.Entity; - } - set - { - Person_Persons previousValue = this._Person_Persons.Entity; - if (((previousValue != value) - || (this._Person_Persons.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Person_Persons.Entity = null; - previousValue.ActionPlan_MainContract.Remove(this); - } - this._Person_Persons.Entity = value; - if ((value != null)) - { - value.ActionPlan_MainContract.Add(this); - this._CompileMan = value.PersonId; - } - else - { - this._CompileMan = default(string); - } - this.SendPropertyChanged("Person_Persons"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContractApprove_ActionPlan_MainContract", Storage="_ActionPlan_MainContractApprove", ThisKey="MainContractId", OtherKey="MainContractId", DeleteRule="NO ACTION")] public EntitySet ActionPlan_MainContractApprove { @@ -23728,8 +23646,6 @@ namespace Model private EntitySet _ActionPlan_CompanyManagerRule; - private EntitySet _ActionPlan_MainContract; - private EntitySet _ActionPlan_ManagerRule; private EntitySet _ActionPlan_ProjectManagerRule; @@ -24135,7 +24051,6 @@ namespace Model this._Accident_NoFourLetoff = new EntitySet(new Action(this.attach_Accident_NoFourLetoff), new Action(this.detach_Accident_NoFourLetoff)); this._ActionPlan_ActionPlanList = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanList), new Action(this.detach_ActionPlan_ActionPlanList)); this._ActionPlan_CompanyManagerRule = new EntitySet(new Action(this.attach_ActionPlan_CompanyManagerRule), new Action(this.detach_ActionPlan_CompanyManagerRule)); - this._ActionPlan_MainContract = new EntitySet(new Action(this.attach_ActionPlan_MainContract), new Action(this.detach_ActionPlan_MainContract)); this._ActionPlan_ManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ManagerRule), new Action(this.detach_ActionPlan_ManagerRule)); this._ActionPlan_ProjectManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ProjectManagerRule), new Action(this.detach_ActionPlan_ProjectManagerRule)); this._ActionPlan_ProjectPlan = new EntitySet(new Action(this.attach_ActionPlan_ProjectPlan), new Action(this.detach_ActionPlan_ProjectPlan)); @@ -24965,19 +24880,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Base_Project", Storage="_ActionPlan_MainContract", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] - public EntitySet ActionPlan_MainContract - { - get - { - return this._ActionPlan_MainContract; - } - set - { - this._ActionPlan_MainContract.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ManagerRule_Base_Project", Storage="_ActionPlan_ManagerRule", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet ActionPlan_ManagerRule { @@ -27295,18 +27197,6 @@ namespace Model entity.Base_Project = null; } - private void attach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Base_Project = this; - } - - private void detach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Base_Project = null; - } - private void attach_ActionPlan_ManagerRule(ActionPlan_ManagerRule entity) { this.SendPropertyChanging(); @@ -154753,8 +154643,6 @@ namespace Model private EntitySet _ActionPlan_CompanyManagerRule; - private EntitySet _ActionPlan_MainContract; - private EntitySet _ActionPlan_MainContractApprove; private EntitySet _ActionPlan_ManagerRule; @@ -155357,7 +155245,6 @@ namespace Model this._ActionPlan_ActionPlanList = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanList), new Action(this.detach_ActionPlan_ActionPlanList)); this._ActionPlan_ActionPlanListApprove = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanListApprove), new Action(this.detach_ActionPlan_ActionPlanListApprove)); this._ActionPlan_CompanyManagerRule = new EntitySet(new Action(this.attach_ActionPlan_CompanyManagerRule), new Action(this.detach_ActionPlan_CompanyManagerRule)); - this._ActionPlan_MainContract = new EntitySet(new Action(this.attach_ActionPlan_MainContract), new Action(this.detach_ActionPlan_MainContract)); this._ActionPlan_MainContractApprove = new EntitySet(new Action(this.attach_ActionPlan_MainContractApprove), new Action(this.detach_ActionPlan_MainContractApprove)); this._ActionPlan_ManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ManagerRule), new Action(this.detach_ActionPlan_ManagerRule)); this._ActionPlan_ProjectManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ProjectManagerRule), new Action(this.detach_ActionPlan_ProjectManagerRule)); @@ -156996,19 +156883,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContract_Person_Persons_CompileMan", Storage="_ActionPlan_MainContract", ThisKey="PersonId", OtherKey="CompileMan", DeleteRule="NO ACTION")] - public EntitySet ActionPlan_MainContract - { - get - { - return this._ActionPlan_MainContract; - } - set - { - this._ActionPlan_MainContract.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContractApprove_Person_Persons", Storage="_ActionPlan_MainContractApprove", ThisKey="PersonId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] public EntitySet ActionPlan_MainContractApprove { @@ -160210,18 +160084,6 @@ namespace Model entity.Person_Persons = null; } - private void attach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Person_Persons = this; - } - - private void detach_ActionPlan_MainContract(ActionPlan_MainContract entity) - { - this.SendPropertyChanging(); - entity.Person_Persons = null; - } - private void attach_ActionPlan_MainContractApprove(ActionPlan_MainContractApprove entity) { this.SendPropertyChanging(); From f45fed15aab5c7cb30a923885ab3c3ee22e340b8 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 6 Sep 2023 16:25:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BA=A7=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-09-06.sql | 24 ++ .../0-2大数据中心（Menu_DigData）.sql | 25 +- .../1-10大数据中心（Menu_PDigData）.sql | 16 +- SGGL/BLL/BLL.csproj | 4 + SGGL/BLL/DigData/CQMSDataDWService .cs | 68 +++ SGGL/BLL/DigData/HSEDataDWService.cs | 68 +++ SGGL/BLL/DigData/HTGLDataDWService.cs | 78 ++++ SGGL/BLL/DigData/JDGLDataDWService.cs | 65 +++ SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx | 90 ++++ SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.cs | 116 ++++++ .../DigData/CQMSDataDW.aspx.designer.cs | 161 ++++++++ SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx | 91 +++++ SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.cs | 141 +++++++ .../DigData/HSEDataDW.aspx.designer.cs | 161 ++++++++ SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx | 121 ++++++ SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs | 141 +++++++ .../DigData/HTGLDataDW.aspx.designer.cs | 161 ++++++++ SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx | 81 ++++ SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.cs | 116 ++++++ .../DigData/JDGLDataDW.aspx.designer.cs | 161 ++++++++ SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx | 189 +++++++++ .../DigData/ProjectDataDW.aspx.cs | 187 +++++++++ .../DigData/ProjectDataDW.aspx.designer.cs | 386 ++++++++++++++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 40 ++ SGGL/FineUIPro.Web/common/Menu_DigData.xml | 12 +- SGGL/FineUIPro.Web/common/Menu_PDigData.xml | 6 +- SGGL/SGGL.sln | 4 +- 27 files changed, 2685 insertions(+), 28 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-09-06.sql create mode 100644 SGGL/BLL/DigData/CQMSDataDWService .cs create mode 100644 SGGL/BLL/DigData/HSEDataDWService.cs create mode 100644 SGGL/BLL/DigData/HTGLDataDWService.cs create mode 100644 SGGL/BLL/DigData/JDGLDataDWService.cs create mode 100644 SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx create mode 100644 SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx create mode 100644 SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx create mode 100644 SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx create mode 100644 SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx create mode 100644 SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_V2023-09-06.sql b/DataBase/版本日志/SGGLDB_V2023-09-06.sql new file mode 100644 index 00000000..4d5b69f6 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-06.sql @@ -0,0 +1,24 @@ +DELETE FROM Sys_Menu WHERE MenuId IN +('4911D344-3182-4B46-B01F-B10DB058E550','4F7C556C-DAC1-4BC4-BCF6-1B401F771204','D01D3916-743A-4F97-9ADB-815712A89FAC','0443E704-45F4-40BE-8069-13E5554F5700') +GO +UPDATE Sys_Menu SET Url='DigData/ProjectDataDW.aspx',IsEnd=1 WHERE MenuId='775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC' +GO + +--ȫݿ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('E1ABD1B1-1563-433A-972B-555076A96D06','ȫݿ','DigData/HSEDataDW.aspx',5,'AA670914-6EAA-4CFA-8BD6-E0648F8FD21C','Menu_DigData',1,1,1) +GO +--ݿ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('15D01AB6-F959-4ABD-B861-C5C2EE6FA906','ݿ','DigData/CQMSDataDW.aspx',10,'7EC74F30-B2F7-454E-B0AE-8E993211F763','Menu_DigData',1,1,1) +GO + +--ݿ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('44D51E89-267D-4D72-AB6D-1F4CA4E7D19D','ݿ','DigData/JDGLDataDW.aspx',10,'E7F7BC38-7357-49C0-9242-68289031F618','Menu_DigData',1,1,1) +GO + +--ͬݿ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('ABC4323E-2F6F-4147-AA7A-8726131D7044','ͬݿ','DigData/JDGLDataDW.aspx',10,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1) +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql b/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql index 42fbcd01..6529578c 100644 --- a/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql +++ b/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql @@ -14,7 +14,11 @@ GO GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('AA670914-6EAA-4CFA-8BD6-E0648F8FD21C','ȫݿ','',10,'92B50285-30BD-4B62-9E23-A0D6B4BA1577','Menu_DigData',1,0,1) - GO + GO + --ȫݿ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('E1ABD1B1-1563-433A-972B-555076A96D06','ȫݿ','DigData/HSEDataDW.aspx',5,'AA670914-6EAA-4CFA-8BD6-E0648F8FD21C','Menu_DigData',1,1,1) + GO --ȫճ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('04B182E4-D31E-449F-9803-322F3F380D89','HSEճ','DigData/DailyProblemAnalysis.aspx',10,'AA670914-6EAA-4CFA-8BD6-E0648F8FD21C','Menu_DigData',1,1,1) @@ -29,13 +33,28 @@ GO GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('7EC74F30-B2F7-454E-B0AE-8E993211F763','ݿ','',20,'92B50285-30BD-4B62-9E23-A0D6B4BA1577','Menu_DigData',1,0,1) - GO + GO + --ݿ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('15D01AB6-F959-4ABD-B861-C5C2EE6FA906','ݿ','DigData/CQMSDataDW.aspx',10,'7EC74F30-B2F7-454E-B0AE-8E993211F763','Menu_DigData',1,1,1) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('E7F7BC38-7357-49C0-9242-68289031F618','ݿ','',30,'92B50285-30BD-4B62-9E23-A0D6B4BA1577','Menu_DigData',1,0,1) - GO + GO + --ݿ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('44D51E89-267D-4D72-AB6D-1F4CA4E7D19D','ݿ','DigData/JDGLDataDW.aspx',10,'E7F7BC38-7357-49C0-9242-68289031F618','Menu_DigData',1,1,1) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('381A4608-2CDE-42AF-BC4D-FF554785B9F8','ͬݿ','',40,'92B50285-30BD-4B62-9E23-A0D6B4BA1577','Menu_DigData',1,0,1) GO + --ͬݿ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('ABC4323E-2F6F-4147-AA7A-8726131D7044','ͬݿ','DigData/HTGLDataDW.aspx',10,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1) + GO + --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('5BE7F83B-C02D-4481-815F-153279B44C39','ݿ','',50,'92B50285-30BD-4B62-9E23-A0D6B4BA1577','Menu_DigData',1,0,1) --GO diff --git a/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql b/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql index 1f1e3f6e..e9c1c558 100644 --- a/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql +++ b/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql @@ -7,20 +7,8 @@ VALUES('5704B651-2172-45D3-8206-448612C5BA11','WBS GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC','Ŀݲֿ','',20,'0','Menu_PDigData',1,0,1) -GO - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('4911D344-3182-4B46-B01F-B10DB058E550','ȫ','',10,'775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC','Menu_PDigData',1,0,1) - GO - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('4F7C556C-DAC1-4BC4-BCF6-1B401F771204','','',20,'775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC','Menu_PDigData',1,0,1) - GO - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('D01D3916-743A-4F97-9ADB-815712A89FAC','','',30,'775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC','Menu_PDigData',1,0,1) - GO - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('0443E704-45F4-40BE-8069-13E5554F5700','ͬ','',40,'775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC','Menu_PDigData',1,0,1) - GO +VALUES('775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC','Ŀݲֿ','DigData/ProjectDataDW.aspx',20,'0','Menu_PDigData',1,1,1) +GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('D9252E0B-3956-473A-8ECC-12C0933469C3','ݷ','',30,'0','Menu_PDigData',1,0,1) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 6037c38e..6b379922 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -339,6 +339,10 @@ + + + + diff --git a/SGGL/BLL/DigData/CQMSDataDWService .cs b/SGGL/BLL/DigData/CQMSDataDWService .cs new file mode 100644 index 00000000..1c2127c5 --- /dev/null +++ b/SGGL/BLL/DigData/CQMSDataDWService .cs @@ -0,0 +1,68 @@ +using FineUIPro; +using System; +using System.Collections; +using System.Linq; + +namespace BLL +{ + /// + /// 质量数据仓库 + /// + public static class CQMSDataDWService + { + public static Model.SGGLDB db = Funs.DB; + + #region 质量数据仓库 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.Base_Project + select x; + + /// + /// 质量数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) + { + var getDataList = from x in Funs.DB.Base_Project select x; + if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) + { + getDataList = getDataList.Where(x => x.ProjectId == projectId); + } + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.ProjectId, + x.ProjectName, + x.ProjectCode, + Rate1 = "0%", //质量验收问题整改率 + Rate2 = "0%", //控制点完成率 + Rate3 = "0%", //质量检查问题整改率 + Rate4 = "0%", //管道焊接一次合格率 + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/BLL/DigData/HSEDataDWService.cs b/SGGL/BLL/DigData/HSEDataDWService.cs new file mode 100644 index 00000000..3805288c --- /dev/null +++ b/SGGL/BLL/DigData/HSEDataDWService.cs @@ -0,0 +1,68 @@ +using FineUIPro; +using System; +using System.Collections; +using System.Linq; + +namespace BLL +{ + /// + /// 安全数据仓库 + /// + public static class HSEDataDWService + { + public static Model.SGGLDB db = Funs.DB; + + #region 安全数据仓库 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.Base_Project + select x; + + /// + /// 安全数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) + { + var getDataList = from x in Funs.DB.Base_Project select x; + if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) + { + getDataList = getDataList.Where(x => x.ProjectId == projectId); + } + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.ProjectId, + x.ProjectName, + x.ProjectCode, + Count1=0, //人员数量 + Count2 =0, //安全人工时 + Count3 =0, //安全培训次数 + ProblemRate = "0%", //安全巡检整改率 + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/BLL/DigData/HTGLDataDWService.cs b/SGGL/BLL/DigData/HTGLDataDWService.cs new file mode 100644 index 00000000..e646a5c2 --- /dev/null +++ b/SGGL/BLL/DigData/HTGLDataDWService.cs @@ -0,0 +1,78 @@ +using FineUIPro; +using System; +using System.Collections; +using System.Linq; + +namespace BLL +{ + /// + /// 合同管理数据仓库 + /// + public static class HTGLDataDWService + { + public static Model.SGGLDB db = Funs.DB; + + #region 合同管理数据仓库 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.Base_Project + select x; + + /// + /// 合同管理数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) + { + var getDataList = from x in Funs.DB.Base_Project select x; + if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) + { + getDataList = getDataList.Where(x => x.ProjectId == projectId); + } + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.ProjectId, + x.ProjectName, + x.ProjectCode, + Count1=0, + Count2 =0, + Count3 =0, + Count4 = 0, + Count5 = 0, + Count6 = 0, + Count7 = 0, + Count8 = 0, + Count9 = 0, + Count10 = 0, + Count11 = 0, + Count12 = 0, + Count13 = 0, + Count14 = 0, + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/BLL/DigData/JDGLDataDWService.cs b/SGGL/BLL/DigData/JDGLDataDWService.cs new file mode 100644 index 00000000..be372d94 --- /dev/null +++ b/SGGL/BLL/DigData/JDGLDataDWService.cs @@ -0,0 +1,65 @@ +using FineUIPro; +using System; +using System.Collections; +using System.Linq; + +namespace BLL +{ + /// + /// 进度数据仓库 + /// + public static class JDGLDataDWService + { + public static Model.SGGLDB db = Funs.DB; + + #region 进度数据仓库 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.Base_Project + select x; + + /// + /// 进度数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) + { + var getDataList = from x in Funs.DB.Base_Project select x; + if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) + { + getDataList = getDataList.Where(x => x.ProjectId == projectId); + } + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.ProjectId, + x.ProjectName, + x.ProjectCode, + JDRate = "0%", //项目进度完成百分比 + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx b/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx new file mode 100644 index 00000000..2450ad19 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx @@ -0,0 +1,90 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CQMSDataDW.aspx.cs" + Inherits="FineUIPro.Web.DigData.CQMSDataDW" %> + + + + + + 质量数据库 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.cs new file mode 100644 index 00000000..b0661adb --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.cs @@ -0,0 +1,116 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DigData +{ + public partial class CQMSDataDW : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ProjectService.InitProjectDropDownList(this.drpProject, false); + Funs.FineUIPleaseSelect(drpProject, "请选择项目"); + // 绑定表格 + this.BindGrid(); + } + } + #endregion + + #region 绑定数据Grid1 + /// + /// 绑定数据Grid1 + /// + private void BindGrid() + { + var getData =CQMSDataDWService.getDataDWList( this.drpProject.SelectedValue, + Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1); + Grid1.RecordCount = CQMSDataDWService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + /// + /// 查询 + /// + /// + /// + protected void btSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("质量数据仓库" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.designer.cs new file mode 100644 index 00000000..ed635b97 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class CQMSDataDW + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + } +} diff --git a/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx b/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx new file mode 100644 index 00000000..a8bdfc9c --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx @@ -0,0 +1,91 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HSEDataDW.aspx.cs" + Inherits="FineUIPro.Web.DigData.HSEDataDW" %> + + + + + + HSE数据库 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.cs new file mode 100644 index 00000000..4acf6af5 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.cs @@ -0,0 +1,141 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DigData +{ + public partial class HSEDataDW : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ProjectService.InitProjectDropDownList(this.drpProject, false); + Funs.FineUIPleaseSelect(drpProject, "请选择项目"); + // 绑定表格 + this.BindGrid(); + } + } + #endregion + + #region 绑定数据Grid1 + /// + /// 绑定数据Grid1 + /// + private void BindGrid() + { + var getData = HSEDataDWService.getDataDWList( this.drpProject.SelectedValue, + Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1); + Grid1.RecordCount = HSEDataDWService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + this.OutputSummaryData(); ///取合计值 + } + + /// + /// 计算合计 + /// + private void OutputSummaryData( ) + { + int aCount1 = 0, aCount2 = 0, aCount3 = 0; + for (int i = 0; i < Grid1.Rows.Count(); i++) + { + aCount1 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[3].ToString()); + aCount2 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[4].ToString()); + aCount3 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[5].ToString()); + } + + JObject summary = new JObject + { + { "ProjectName", "合计" }, + { "Count1", aCount1.ToString() }, + { "Count2", aCount2.ToString() }, + { "Count3", aCount3.ToString() }, + }; + Grid1.SummaryData = summary; + } + + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + /// + /// 查询 + /// + /// + /// + protected void btSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("HSE数据仓库" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.designer.cs new file mode 100644 index 00000000..6a5c5055 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class HSEDataDW + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + } +} diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx new file mode 100644 index 00000000..a00b65f1 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx @@ -0,0 +1,121 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HTGLDataDW.aspx.cs" + Inherits="FineUIPro.Web.DigData.HTGLDataDW" %> + + + + + + 合同数据库 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs new file mode 100644 index 00000000..b151d5dc --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs @@ -0,0 +1,141 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DigData +{ + public partial class HTGLDataDW : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ProjectService.InitProjectDropDownList(this.drpProject, false); + Funs.FineUIPleaseSelect(drpProject, "请选择项目"); + // 绑定表格 + this.BindGrid(); + } + } + #endregion + + #region 绑定数据Grid1 + /// + /// 绑定数据Grid1 + /// + private void BindGrid() + { + var getData = HTGLDataDWService.getDataDWList( this.drpProject.SelectedValue, + Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1); + Grid1.RecordCount = HTGLDataDWService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + this.OutputSummaryData(); ///取合计值 + } + + /// + /// 计算合计 + /// + private void OutputSummaryData( ) + { + int aCount1 = 0, aCount2 = 0, aCount3 = 0; + for (int i = 0; i < Grid1.Rows.Count(); i++) + { + aCount1 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[3].ToString()); + aCount2 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[4].ToString()); + aCount3 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[5].ToString()); + } + + JObject summary = new JObject + { + { "ProjectName", "合计" }, + { "Count1", aCount1.ToString() }, + { "Count2", aCount2.ToString() }, + { "Count3", aCount3.ToString() }, + }; + Grid1.SummaryData = summary; + } + + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + /// + /// 查询 + /// + /// + /// + protected void btSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同数据仓库" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs new file mode 100644 index 00000000..83094669 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class HTGLDataDW + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + } +} diff --git a/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx b/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx new file mode 100644 index 00000000..5c77240f --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx @@ -0,0 +1,81 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JDGLDataDW.aspx.cs" + Inherits="FineUIPro.Web.DigData.JDGLDataDW" %> + + + + + + 进度数据库 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.cs new file mode 100644 index 00000000..65f5c7a7 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.cs @@ -0,0 +1,116 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DigData +{ + public partial class JDGLDataDW : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ProjectService.InitProjectDropDownList(this.drpProject, false); + Funs.FineUIPleaseSelect(drpProject, "请选择项目"); + // 绑定表格 + this.BindGrid(); + } + } + #endregion + + #region 绑定数据Grid1 + /// + /// 绑定数据Grid1 + /// + private void BindGrid() + { + var getData = JDGLDataDWService.getDataDWList( this.drpProject.SelectedValue, + Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1); + Grid1.RecordCount = JDGLDataDWService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + /// + /// 查询 + /// + /// + /// + protected void btSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("进度数据仓库" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.designer.cs new file mode 100644 index 00000000..c320aeb8 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class JDGLDataDW + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + } +} diff --git a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx new file mode 100644 index 00000000..aac4ef7d --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx @@ -0,0 +1,189 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectDataDW.aspx.cs" Inherits="FineUIPro.Web.DigData.ProjectDataDW" %> + + + + + + 项目WBS数据仓库 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs new file mode 100644 index 00000000..3972dcb0 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs @@ -0,0 +1,187 @@ +using BLL; +using System; +using System.Data; +using System.Linq; + +namespace FineUIPro.Web.DigData +{ + public partial class ProjectDataDW : PageBase + { + /// + /// 项目ID + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + } + } + + + /// + /// + /// + /// + /// + protected void ckType_SelectedIndexChanged(object sender, EventArgs e) + { + this.gpHSSE.Hidden = true; + this.gpCQMS.Hidden = true; + this.gpJDGL.Hidden = true; + this.gpHTGL.Hidden = true; + this.gpLW.Hidden = true; + SetData(); + } + + /// + /// 数据展示 + /// + private void SetData() + { + if (!string.IsNullOrEmpty(this.ProjectId)) + { + foreach (var item in this.ckType.SelectedValueArray) + { + if (item == "HSSE") + { + this.gpHSSE.Hidden = false; + this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem + join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId + where y.ProjectId == this.ProjectId + && y.States == Const.State_1 + + select x).Count().ToString(); + this.lbAccident.Text = (from x in Funs.DB.Accident_AccidentPersonRecord + where x.ProjectId == this.ProjectId + && x.States == Const.State_2 + + select x).Count().ToString(); + } + if (item == "CQMS") + { + this.gpCQMS.Hidden = false; + //// 实体验收 资料验收 + var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail + join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode + where y.ProjectId == this.ProjectId + && y.State == "8" + select x; + int all = getSpotCheckDetail.Count(); + // this.lbSpotCheck1.Text = all.ToString(); + int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格 + // this.lbSpotCheck2.Text= okCount.ToString(); + + this.lbSpotCheckRate.Text= all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString()+"%" : "0%"; + + /// 资料验收合格项目 + var getOKSpotCheckDetail = getSpotCheckDetail.Where(x => x.IsOK == true); + int okYSCount = getOKSpotCheckDetail.Count(); //验收合格 + int okDateCount = getSpotCheckDetail.Where(x => x.IsDataOK == "1").Count(); //资料合格 + this.lbSpotCheckDataRate.Text = okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%"; + + ///实体质量问题整改率 + //int allNoOk = all - onesOKCount; ///问题数 + //int oKCount = getSpotCheckDetail.Where(x => x.IsOK == true).Count(); //合格数 + //int zgCount = oKCount - onesOKCount; ///整改数 + //this.lbSpotCheckOkRate.Text = allNoOk > 0 ? Math.Round(zgCount * 100.0 / (allNoOk * 1.0)).ToString() + "%" : "0%"; + + ////控制点 + //var getControlItemAndCycle=from x in Funs.DB.WBS_ControlItemAndCycle + // where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) + // && (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId)) + // && x.ControlPoint.Contains("A") && x.CheckNum >0 + // select x; + /////A级控制点总量 + //int allControlItemCount = getControlItemAndCycle.Count(); + /////已完成A级控制点数 + //var getOKSpotCheckDetailCheckNum = from x in getOKSpotCheckDetail + // group x by x.ControlItemAndCycleId + // into g select new { g.First().ControlItemAndCycleId, num = g.Count() }; + + //var getOKControlItemAndCycle = from x in getControlItemAndCycle + // join y in getOKSpotCheckDetailCheckNum on x.ControlItemAndCycleId equals y.ControlItemAndCycleId + // where x.CheckNum == y.num + // select x; + //int okControlItemCount= getOKControlItemAndCycle.Count(); + //this.lbControlItemRate.Text = allControlItemCount > 0 ? Math.Round(okControlItemCount * 100.0 / (allControlItemCount * 1.0)).ToString() + "%" : "0%"; + } + if (item == "JDGL") + { + this.gpJDGL.Hidden = false; + + //double totalSJCost = 0; ////累计实际费用 + //decimal totalPlanCost = 0; ////计划费用 + //var getWorkPackageDetail = Funs.DB.WBS_WorkPackageDetail.FirstOrDefault(x => x.WorkPackageId == workPackageId); + //if (getWorkPackageDetail != null) + //{ + // ///末级节点 + // var getMaxSJCost = Funs.DB.View_WBS_WorkPackageDetail.Where(x => x.WorkPackageId == workPackageId).OrderByDescending(x => x.Months).FirstOrDefault(); + // if (getMaxSJCost != null) + // { + // totalSJCost = getMaxSJCost.TotalThisValue ?? 0; + // totalPlanCost = getMaxSJCost.PlanCost ?? 0; + // } + //} + //else + //{ + // ///非末级节点 + // var getMaxSJCost = Funs.DB.View_WBS_WorkPackageParentDetail.Where(x =>x.ProjectId == this.ProjectId + // && x.ParentId == workPackageId).OrderByDescending(x => x.Months).FirstOrDefault(); + // if (getMaxSJCost != null) + // { + // totalSJCost = getMaxSJCost.TotalThisValue ?? 0; + // totalPlanCost = getMaxSJCost.PlanCost ?? 0; + // } + //} + ////// 根 节点 建筑工程 安装工程 + //if (workPackageId == "1" || workPackageId == "2") + //{ + // var getUnitWorkByType = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.ProjectId && x.ProjectType == workPackageId select x; + // if (getUnitWorkByType.Count() > 0) + // { + // totalPlanCost = getUnitWorkByType.Sum(x => x.PlanCost ?? 0); + // } + //} + + //var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.UnitWorkId == workPackageId); + //if (getUnitWork != null) + //{ + // totalPlanCost= getUnitWork.PlanCost ?? 0; + //} + + /////项目进度完成百分比 + //decimal s = Convert.ToDecimal(totalSJCost); + //this.lbJDRate.Text = totalPlanCost > 0 ? Math.Round(s / totalPlanCost).ToString() + "%" : "0%"; + + } + if (item == "HTGL") + { + this.gpHTGL.Hidden = false; + } + if (item == "LW") + { + this.gpLW.Hidden = false; + } + } + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs new file mode 100644 index 00000000..25d324cd --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs @@ -0,0 +1,386 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class ProjectDataDW + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ckType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList ckType; + + /// + /// gpHSSE 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel gpHSSE; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbExpertArgument 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbExpertArgument; + + /// + /// lbAccident 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbAccident; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// Label7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label7; + + /// + /// Label8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label8; + + /// + /// Label9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label9; + + /// + /// gpCQMS 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel gpCQMS; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lbSpotCheckRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheckRate; + + /// + /// lbSpotCheckDataRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheckDataRate; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// Label10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label10; + + /// + /// gpJDGL 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel gpJDGL; + + /// + /// Form3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form3; + + /// + /// lbJDRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbJDRate; + + /// + /// gpHTGL 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel gpHTGL; + + /// + /// Form4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form4; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// Label11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label11; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// Label12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label12; + + /// + /// Label13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label13; + + /// + /// Label14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label14; + + /// + /// Label15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label15; + + /// + /// Label16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label16; + + /// + /// Label17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label17; + + /// + /// Label18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label18; + + /// + /// Label19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label19; + + /// + /// gpLW 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel gpLW; + + /// + /// Form5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form5; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 40fcdd75..03dc5e8f 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -525,6 +525,11 @@ + + + + + @@ -7603,6 +7608,41 @@ WorkingHoursItem.aspx + + CQMSDataDW.aspx + ASPXCodeBehind + + + CQMSDataDW.aspx + + + HSEDataDW.aspx + ASPXCodeBehind + + + HSEDataDW.aspx + + + HTGLDataDW.aspx + ASPXCodeBehind + + + HTGLDataDW.aspx + + + JDGLDataDW.aspx + ASPXCodeBehind + + + JDGLDataDW.aspx + + + ProjectDataDW.aspx + ASPXCodeBehind + + + ProjectDataDW.aspx + ShowProjectWBS.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index bf060031..3ac7eb46 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -3,13 +3,17 @@ - + + - - - + + + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_PDigData.xml b/SGGL/FineUIPro.Web/common/Menu_PDigData.xml index f1829be3..e9c0d7fc 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PDigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PDigData.xml @@ -2,11 +2,7 @@ - - - - - + \ No newline at end of file diff --git a/SGGL/SGGL.sln b/SGGL/SGGL.sln index 721038cf..e128e1ef 100644 --- a/SGGL/SGGL.sln +++ b/SGGL/SGGL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.2017 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33927.249 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" EndProject