From 4242a6af4992feab90ea2241d1fbc3dab3c134b8 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 18 Mar 2025 16:34:06 +0800 Subject: [PATCH] =?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 --- .../SGGLDB_V2025-03-17-001-gaofei.sql | 32 + .../API/CQMS/APIQuantityManagementService.cs | 2 +- .../DayInputStatistics.aspx | 8 +- .../DayInputStatistics.aspx.cs | 69 +- .../DayInputStatistics.aspx.designer.cs | 4 +- .../DataOut/工程量日常统计表.xlsx | Bin 12156 -> 12182 bytes .../ProjectData/TeamGroupEdit.aspx.cs | 2 +- SGGL/Model/Model.cs | 1362 +---------------- 8 files changed, 97 insertions(+), 1382 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-03-17-001-gaofei.sql diff --git a/DataBase/版本日志/SGGLDB_V2025-03-17-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-03-17-001-gaofei.sql new file mode 100644 index 0000000..c0ea97e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-03-17-001-gaofei.sql @@ -0,0 +1,32 @@ + +ALTER VIEW [dbo].[View_QuantityManagement_DayInput] +AS +/********ճͳƱ********/ + +select distinct C.BaseId,C.ProjectId,case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end as WorkSection,case when a.DrawingNo is not null then a.DrawingNo else b.ChangeNo end as DrawingNo, + case when a.DrawingName is not null then a.DrawingName else b.ChangeName end as DrawingName,ba.State, + case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major,ba.DrawingId + Part,ProjectContent,Unit,Amount,t.TeamGroupName as WorkTeam,C.WorkTeam as WorkTeamId + from QuantityManagement_DayInput C + left join QuantityManagement_Base ba on ba.BaseId=C.BaseId + left join QuantityManagement_Drawing a on a.DrawingId=ba.DrawingId + left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major + left join QuantityManagement_Change b on b.ChangeId=ba.DrawingId + left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major + left join ProjectData_TeamGroup t on t.TeamGroupId=C.WorkTeam +union +select BaseId,C.ProjectId,case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end as WorkSection,case when a.DrawingNo is not null then a.DrawingNo else b.ChangeNo end as DrawingNo, + case when a.DrawingName is not null then a.DrawingName else b.ChangeName end as DrawingName,C.State, + case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major,C.DrawingId + Part,ProjectContent,Unit,Amount,t.TeamGroupName as WorkTeam,C.WorkTeam as WorkTeamId + from QuantityManagement_Base C + left join QuantityManagement_Drawing a on a.DrawingId=C.DrawingId + left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major + left join QuantityManagement_Change b on b.ChangeId=C.DrawingId + left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major + left join ProjectData_TeamGroup t on t.TeamGroupId=C.WorkTeam + + +GO + + diff --git a/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs b/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs index 9676a94..40a85e3 100644 --- a/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs +++ b/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs @@ -121,7 +121,7 @@ namespace BLL newDayInput.CompileMan = dayInput.CompileMan; newDayInput.CompileDate = DateTime.Now; db.SubmitChanges(); - SaveUrl(dayInput.DayInputId, BLL.Const.DayInputMenuId, dayInput.Url); + SaveUrl(newDayInput.DayInputId, BLL.Const.DayInputMenuId, dayInput.Url); } return respone; } diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx index b854c41..8826869 100644 --- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx +++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx @@ -25,7 +25,8 @@ - + + @@ -55,6 +56,9 @@ + + @@ -103,7 +107,7 @@