From 7a938af2012345bc0457af9c62945d0d638a89ba Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 28 Mar 2024 10:14:38 +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_WH_2024-03-25-gaofei.sql | 395 +++ SGGL/FineUIPro.Web/ErrLog.txt | 261 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 144 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../LawRegulationIdentifyEdit.aspx | 2 +- ...LawRegulationIdentifyEdit.aspx.designer.cs | 2 +- .../InspectWanderAboutList.aspx.cs | 2 +- .../TestRun/BeforeTestRun/SubInspectTerm.aspx | 1 + .../BeforeTestRun/TailTermHandleList.aspx.cs | 4 +- .../Feeding/FeedingRunApplication.aspx | 134 + .../Feeding/FeedingRunApplication.aspx.cs | 450 ++++ .../FeedingRunApplication.aspx.designer.cs | 134 + .../TestRun/Feeding/InspectTailTermEdit.aspx | 181 ++ .../Feeding/InspectTailTermEdit.aspx.cs | 393 +++ .../InspectTailTermEdit.aspx.designer.cs | 269 ++ .../TestRun/Feeding/InspectTailTermList.aspx | 189 ++ .../Feeding/InspectTailTermList.aspx.cs | 365 +++ .../InspectTailTermList.aspx.designer.cs | 233 ++ .../TestRun/Feeding/InspectTemplate.aspx | 66 + .../TestRun/Feeding/InspectTemplate.aspx.cs | 113 + .../Feeding/InspectTemplate.aspx.designer.cs | 125 + .../TestRun/Feeding/InspectTemplateEdit.aspx | 71 + .../Feeding/InspectTemplateEdit.aspx.cs | 84 + .../InspectTemplateEdit.aspx.designer.cs | 143 ++ .../Feeding/InspectWanderAboutAllPass.aspx | 119 + .../Feeding/InspectWanderAboutAllPass.aspx.cs | 156 ++ ...InspectWanderAboutAllPass.aspx.designer.cs | 197 ++ .../InspectWanderAboutAllPassList.aspx | 137 + .../InspectWanderAboutAllPassList.aspx.cs | 173 ++ ...ectWanderAboutAllPassList.aspx.designer.cs | 152 ++ .../Feeding/InspectWanderAboutConfirm.aspx | 137 + .../Feeding/InspectWanderAboutConfirm.aspx.cs | 651 +++++ ...InspectWanderAboutConfirm.aspx.designer.cs | 233 ++ .../Feeding/InspectWanderAboutList.aspx | 139 ++ .../Feeding/InspectWanderAboutList.aspx.cs | 192 ++ .../InspectWanderAboutList.aspx.designer.cs | 152 ++ .../TestRun/Feeding/SelectTailTermList.aspx | 44 + .../Feeding/SelectTailTermList.aspx.cs | 89 + .../SelectTailTermList.aspx.designer.cs | 71 + .../TestRun/Feeding/SubInspectTerm.aspx | 158 ++ .../TestRun/Feeding/SubInspectTerm.aspx.cs | 633 +++++ .../Feeding/SubInspectTerm.aspx.designer.cs | 224 ++ .../TestRun/Feeding/SubInspectTermEdit.aspx | 65 + .../Feeding/SubInspectTermEdit.aspx.cs | 91 + .../SubInspectTermEdit.aspx.designer.cs | 125 + .../TestRun/Feeding/SubWorkInspect.aspx | 121 + .../TestRun/Feeding/SubWorkInspect.aspx.cs | 439 ++++ .../Feeding/SubWorkInspect.aspx.designer.cs | 143 ++ .../TestRun/Feeding/TailTermApprove.aspx | 153 ++ .../TestRun/Feeding/TailTermApprove.aspx.cs | 233 ++ .../Feeding/TailTermApprove.aspx.designer.cs | 278 +++ .../TestRun/Feeding/TailTermApproveList.aspx | 146 ++ .../Feeding/TailTermApproveList.aspx.cs | 202 ++ .../TailTermApproveList.aspx.designer.cs | 161 ++ .../TestRun/Feeding/TailTermHandle.aspx | 131 + .../TestRun/Feeding/TailTermHandle.aspx.cs | 192 ++ .../Feeding/TailTermHandle.aspx.designer.cs | 260 ++ .../TestRun/Feeding/TailTermHandleList.aspx | 147 ++ .../Feeding/TailTermHandleList.aspx.cs | 196 ++ .../TailTermHandleList.aspx.designer.cs | 161 ++ .../TestRun/Report/PreRunSchedule.aspx | 2 + .../TestRun/Report/PreRunSchedule.aspx.cs | 53 +- .../TestRun/Report/ScheduleSetUp.aspx | 26 +- .../TestRun/Report/ScheduleSetUp.aspx.cs | 60 +- .../Report/ScheduleSetUp.aspx.designer.cs | 18 + .../TestRun/Report/TestRunSchedule.aspx | 2 + .../TestRun/Report/TestRunSchedule.aspx.cs | 92 +- .../TestRunManage/InspectTemplate.aspx.cs | 12 +- .../InspectWanderAboutConfirm.aspx | 3 +- .../InspectWanderAboutConfirm.aspx.cs | 7 +- .../InspectWanderAboutList.aspx.cs | 10 +- SGGL/FineUIPro.Web/Web.config | 4 +- .../TestRunMonthSummaryReport.aspx | 2 +- .../TestRunMonthSummaryReport.aspx.cs | 186 ++ .../TestRunMonthSummaryReportEdit.aspx | 65 + .../TestRunMonthSummaryReportEdit.aspx.cs | 246 ++ ...RunMonthSummaryReportEdit.aspx.designer.cs | 96 + .../TestRunPerformanceMonthReportEdit.aspx.cs | 14 +- SGGL/FineUIPro.Web/common/Menu_TestRun.xml | 10 +- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 1 + SGGL/Model/Model.cs | 2213 +++++++++++++++++ SGGL/WebAPI/WebAPI.csproj.user | 2 +- 82 files changed, 13644 insertions(+), 144 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-03-25-gaofei.sql create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx create mode 100644 SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-25-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-25-gaofei.sql new file mode 100644 index 00000000..f26927ff --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-03-25-gaofei.sql @@ -0,0 +1,395 @@ +--cd C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools +--SqlMetal /views /server:WQ /database:SGGLDB_WH /code:C:\Model.cs /namespace:Model + +delete Sys_Menu where MenuId='EE7E37CA-384F-41B3-BAEE-89CBD9954AB3' +delete Sys_Menu where MenuId='E9EF7C6D-7F0A-4FBA-8A79-474D4E61AF27' +delete Sys_Menu where MenuId='9ACDF513-BD63-48F5-BFA3-B9B1B7FA19E1' +delete Sys_Menu where MenuId='3D554109-D95F-4051-8A6C-5616A7A95C94' +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('EE7E37CA-384F-41B3-BAEE-89CBD9954AB3','ԤԳ',null,'TestRun/Report/PreRunSchedule.aspx',1,'2BF9C16D-536F-4F89-AA59-49ED1A1A164C','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('E9EF7C6D-7F0A-4FBA-8A79-474D4E61AF27','Ķ',null,'TestRun/Report/FourDecisionSchedule.aspx',2,'2BF9C16D-536F-4F89-AA59-49ED1A1A164C','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('9ACDF513-BD63-48F5-BFA3-B9B1B7FA19E1','Գ',null,'TestRun/Report/TestRunSchedule.aspx',3,'2BF9C16D-536F-4F89-AA59-49ED1A1A164C','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('3D554109-D95F-4051-8A6C-5616A7A95C94','ҳ',null,'TestRun/Report/ScheduleSetUp.aspx',4,'2BF9C16D-536F-4F89-AA59-49ED1A1A164C','Menu_TestRun',0,1,1) +go + +--==ԤԳ/Գ/Ķ +if object_id(N'Run_ScheduleSetUp',N'U') is not null +drop table dbo.Run_ScheduleSetUp +CREATE TABLE dbo.Run_ScheduleSetUp( + ScheduleId varchar(50) NOT NULL,-- + WorkPackId varchar(50) NULL,-- + LevelName varchar(50) NULL,--Ķ + ProjectId varchar(50) NULL,--Ŀ + States int null,--1:ԤԳ2:Գ3:Ķ + AllNum int null,--ȫ + ProgressNum int NULL,-- + CompleteNum int NULL,-- + NotStartedNum int NULL,--δʼ + CompleteRate decimal(18,2) NULL,-- + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + Sort int NULL,-- + CONSTRAINT PK_Run_ScheduleSetUp PRIMARY KEY CLUSTERED +( + ScheduleId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + + +--cd C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools +--SqlMetal /views /server:WQ /database:SGGLDB_WH /code:C:\Model.cs /namespace:Model + +delete Sys_Menu where MenuId='B148D864-DA22-43C5-8D52-F38C0D34C7D5' +delete Sys_Menu where MenuId='AB9AD56B-574E-41DC-8E89-5982A287C358' +delete Sys_Menu where MenuId='A11DDC01-8F1F-4D09-A85C-1C459741DDB3' +delete Sys_Menu where MenuId='AC20AFEE-6B0D-45D1-8BA5-80904DA4CFFE' +delete Sys_Menu where MenuId='7C1E0ED5-518D-4C5B-8910-A25859A9C7EB' +delete Sys_Menu where MenuId='0AC1D5B3-9E0B-4AC4-BB24-0A9F3953316C' +delete Sys_Menu where MenuId='81162C96-2E10-4936-A2AD-B221B7966C85' +delete Sys_Menu where MenuId='0BF6BC64-8F72-47EA-A5B9-60ACC14619AC' +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('B148D864-DA22-43C5-8D52-F38C0D34C7D5','ģ',null,'TestRun/Feeding/InspectTemplate.aspx',2,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AB9AD56B-574E-41DC-8E89-5982A287C358','ͶԳ',null,'TestRun/Feeding/SubInspectTerm.aspx',3,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('A11DDC01-8F1F-4D09-A85C-1C459741DDB3','ͶԳȷ',null,'TestRun/Feeding/SubWorkInspect.aspx',4,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AC20AFEE-6B0D-45D1-8BA5-80904DA4CFFE','β',null,'TestRun/Feeding/InspectTailTermList.aspx',5,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('7C1E0ED5-518D-4C5B-8910-A25859A9C7EB','β',null,'TestRun/Feeding/TailTermHandleList.aspx',6,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('0AC1D5B3-9E0B-4AC4-BB24-0A9F3953316C','β',null,'TestRun/Feeding/TailTermApproveList.aspx',7,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('81162C96-2E10-4936-A2AD-B221B7966C85','ǩ',null,'TestRun/Feeding/InspectWanderAboutList.aspx',8,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('0BF6BC64-8F72-47EA-A5B9-60ACC14619AC','תȫͨ',null,'TestRun/Feeding/InspectWanderAboutAllPassList.aspx',9,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('0BF6BC64-8F72-47EA-A5B9-60ACC14619AC','ͶԳ',null,'TestRun/Feeding/FeedingRunApplication.aspx',10,'81CE1758-5BBC-4709-AF4B-DDF6CB345571','Menu_TestRun',0,1,1) +go + +--==ͶԳģϢ +if object_id(N'FeedingRun_WorkInspectTemplate',N'U') is not null +drop table dbo.FeedingRun_WorkInspectTemplate +CREATE TABLE dbo.FeedingRun_WorkInspectTemplate( + WorkInspectId varchar(50) NOT NULL,-- + WorkInspectName varchar(500) NULL,-- + Remark nvarchar(150) NULL,--ע + GroupName varchar(50) NULL,-- + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + Sort int NULL,-- + CONSTRAINT PK_FeedingRun_WorkInspectTemplate PRIMARY KEY CLUSTERED +( + WorkInspectId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO +--==豸ܵϵͳ +delete FeedingRun_WorkInspectTemplate where WorkInspectId='B92C0CE3-F42E-48E9-90A4-8B949459B24E' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='9B01E80A-E6E8-405B-9D14-DB9A68907899' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='A4FA80D2-D39A-4FB6-A9CA-08116B0AEF36' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='3085EB15-1C91-4371-AC4F-459FE1557146' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='CE222946-EA4F-4DB2-A1E1-D98F7BF59DED' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='3EC36453-D235-49C1-ABD3-9A1BDC3ED24E' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='124F2849-CCCC-4589-BF5A-66EDF3CE8548' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='73AAEBD4-B65E-4BD0-9D45-FCD6018CC483' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='E3F13A3C-E3A4-46F8-A6A8-B56D93EEB5F1' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='A40B8BD5-2C39-4811-ABDA-EFE68548B60A' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='DAABBEC3-E010-4FCB-95CC-E633271C432A' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='0EE9EC41-E468-4E78-9358-0903FD24A2A8' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='BE2C3723-B68F-4B61-BD9F-C0662D08D969' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='077EFE01-8FD0-4596-B56D-34A3F177F14B' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='B94CBA06-9D3E-4C3C-BB43-AC9A5A09C253' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='2A32519C-5B9C-4788-AEAD-48551C183F0C' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='D19D7E82-033F-47F0-B7A2-1A33BC341F3D' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='C0B50D95-8487-401D-9C6B-6054B1F85A4C' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('B92C0CE3-F42E-48E9-90A4-8B949459B24E','豸ܵװɣʩչ淶Ҫ','','豸ܵϵͳ','',GETDATE(),1) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('9B01E80A-E6E8-405B-9D14-DB9A68907899','¡ɣʩչ淶Ҫ','','豸ܵϵͳ','',GETDATE(),2) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('A4FA80D2-D39A-4FB6-A9CA-08116B0AEF36','ĶȱϣӰͶβ','','豸ܵϵͳ','',GETDATE(),3) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('3085EB15-1C91-4371-AC4F-459FE1557146','豸ܵѹϸ','','豸ܵϵͳ','',GETDATE(),4) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('CE222946-EA4F-4DB2-A1E1-D98F7BF59DED','豸ܵѧϴϸ','','豸ܵϵͳ','',GETDATE(),5) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('3EC36453-D235-49C1-ABD3-9A1BDC3ED24E','ϵͳϴɨϸ','','豸ܵϵͳ','',GETDATE(),6) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('124F2849-CCCC-4589-BF5A-66EDF3CE8548','ҵ¯¯ϸ','','豸ܵϵͳ','',GETDATE(),7) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('73AAEBD4-B65E-4BD0-9D45-FCD6018CC483','ҵ¯¯ϸ','','豸ܵϵͳ','',GETDATE(),8) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('E3F13A3C-E3A4-46F8-A6A8-B56D93EEB5F1','ϡɸ߻װϸ','','豸ܵϵͳ','',GETDATE(),9) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('A40B8BD5-2C39-4811-ABDA-EFE68548B60A','ȫϸ񡢴Ͷ״̬','','豸ܵϵͳ','',GETDATE(),10) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('DAABBEC3-E010-4FCB-95CC-E633271C432A','ư尲װȷͶ״̬','','豸ܵϵͳ','',GETDATE(),11) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('0EE9EC41-E468-4E78-9358-0903FD24A2A8','8ä崦ȷλá','','豸ܵϵͳ','',GETDATE(),12) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('BE2C3723-B68F-4B61-BD9F-C0662D08D969','֧ܰװҪ','','豸ܵϵͳ','',GETDATE(),13) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('077EFE01-8FD0-4596-B56D-34A3F177F14B','֧ܵϸ񡢴Ͷ״̬','','豸ܵϵͳ','',GETDATE(),14) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('B94CBA06-9D3E-4C3C-BB43-AC9A5A09C253','ϵͳϸڲѹ£','','豸ܵϵͳ','',GETDATE(),15) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('2A32519C-5B9C-4788-AEAD-48551C183F0C','Գϸ','','豸ܵϵͳ','',GETDATE(),16) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('D19D7E82-033F-47F0-B7A2-1A33BC341F3D','ѭˮϵͳԤĤϸ񣬸ָҪ','','豸ܵϵͳ','',GETDATE(),17) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('C0B50D95-8487-401D-9C6B-6054B1F85A4C','ϵͳԳɣ¶Ѵ','','豸ܵϵͳ','',GETDATE(),18) +go +--==ϵͳ +delete FeedingRun_WorkInspectTemplate where WorkInspectId='1109473C-D1E4-4E9B-8A66-2A298AA86418' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='022A14CF-2496-4E34-9A81-3DDB8337AC84' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='B68A9BFE-F237-4C32-B99B-366717778F0B' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='5829644C-344D-45D7-9A9F-99F9C8B7F637' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='F9563CAD-D5E2-45A5-BF97-BDF2E97FED17' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='B84388E6-FEB5-4F42-AC1A-9260EB6C110F' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='E1242BD0-92D6-4AF2-98B8-FD8FE4690372' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='8A1A24D3-BEDE-47B3-88E4-7E7354AC6243' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('1109473C-D1E4-4E9B-8A66-2A298AA86418','DZװʩչ淶Ҫ','','ϵͳ','',GETDATE(),19) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('022A14CF-2496-4E34-9A81-3DDB8337AC84','豸ļ̵;ԵѺϸ','','ϵͳ','',GETDATE(),20) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('B68A9BFE-F237-4C32-B99B-366717778F0B','׷ʩԺϸ񡢿ɿ','','ϵͳ','',GETDATE(),21) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('5829644C-344D-45D7-9A9F-99F9C8B7F637','ԿDZԺϸָʾơֵ̬Ժϸ','','ϵͳ','',GETDATE(),22) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('F9563CAD-D5E2-45A5-BF97-BDF2E97FED17','ɢϵͳУ߼ӵصԷϹ涨ӲϵͳҪ','','ϵͳ','',GETDATE(),23) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('B84388E6-FEB5-4F42-AC1A-9260EB6C110F','ɱ߼װõԺϸֵ׼ȷɿ','','ϵͳ','',GETDATE(),24) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('E1242BD0-92D6-4AF2-98B8-FD8FE4690372','ϵͳϸ񡢿ɿ','','ϵͳ','',GETDATE(),25) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('8A1A24D3-BEDE-47B3-88E4-7E7354AC6243','ԶDZԺϸƺϸ','','ϵͳ','',GETDATE(),26) +go +--==ϵͳ +delete FeedingRun_WorkInspectTemplate where WorkInspectId='11FAF5F3-F658-401A-B2DB-62CFF2D1FD69' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='DDB6A90E-699B-4C0D-BBDF-5538EFFE529F' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='AA10911E-24B5-4CD1-8F71-A018D20DF3CA' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='7F8D020F-3C26-4FD9-91CB-39234DBEB08B' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('11FAF5F3-F658-401A-B2DB-62CFF2D1FD69','ˮ硢DZȿɰֵ֤Ӧ','','ϵͳ','',GETDATE(),27) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('DDB6A90E-699B-4C0D-BBDF-5538EFFE529F','ɰֵ֤Ӧ','','ϵͳ','',GETDATE(),28) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('AA10911E-24B5-4CD1-8F71-A018D20DF3CA','ԭϡȼϼԭϡ֬ȱ룬Ҫָص㡣','','ϵͳ','',GETDATE(),29) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('7F8D020F-3C26-4FD9-91CB-39234DBEB08B','ϵͳ߱ʹ궨ϸ','','ϵͳ','',GETDATE(),30) +go +--==ȫϵͳ +delete FeedingRun_WorkInspectTemplate where WorkInspectId='70A152F1-6990-4689-86B9-CB1AB14CB989' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='4EB2C35C-A6D4-4936-987A-C244621BC69F' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='A423531C-2CDB-4314-A45B-6C28129EDC21' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='57E47D49-F0A1-4073-9CF5-B472F83045E7' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='B4FCB05F-5B31-405A-AFA2-87EBFDA79FBE' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='48DC92A0-9CEC-4613-BF43-21E7193C82EB' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='214C5DFD-A5AB-45F7-81E2-981848CDF110' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='466D5F4E-2AA4-4246-A8B9-D9B2335F7AB4' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='F00B0F0D-97DF-449B-94CC-C586CC2CBF91' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='A80AF744-AD43-494F-BDD2-6873A31AE71E' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='F85C5F64-78EB-42A8-9DD9-1EED976880DF' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='E189A48A-D91E-4D8E-AF71-3A731BEF2FC8' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='4A41BCC6-1EAE-4877-A70A-B59E52BD68E5' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='26D81F27-B1D1-4222-A020-615AE561C96B' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('70A152F1-6990-4689-86B9-CB1AB14CB989','ˮϵͳԺϸ񣬴Ͷ״̬','','ȫϵͳ','',GETDATE(),31) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('4EB2C35C-A6D4-4936-987A-C244621BC69F','ĭɷ̼ۡԺϸ񣬴Ͷ״̬','','ȫϵͳ','',GETDATE(),32) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('A423531C-2CDB-4314-A45B-6C28129EDC21','ȼ屨ж屨ֱϵͳȵԺϸ񣬴Ͷ״̬','','ȫϵͳ','',GETDATE(),33) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('57E47D49-F0A1-4073-9CF5-B472F83045E7','HSEϣƶӦİȫʩͣ¹Ԥ','','ȫϵͳ','',GETDATE(),34) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('B4FCB05F-5B31-405A-AFA2-87EBFDA79FBE','ƶȡƶȡƶȵȰȫලƶѽ','','ȫϵͳ','',GETDATE(),35) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('48DC92A0-9CEC-4613-BF43-21E7193C82EB','·ͨб־־ʾ־ȫԳѻ','','ȫϵͳ','',GETDATE(),36) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('214C5DFD-A5AB-45F7-81E2-981848CDF110','λġѱ룬˻á','','ȫϵͳ','',GETDATE(),37) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('466D5F4E-2AA4-4246-A8B9-D9B2335F7AB4','Ȼʩʵйϰ','','ȫϵͳ','',GETDATE(),38) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('F00B0F0D-97DF-449B-94CC-C586CC2CBF91','ֳվѽоȻȣʵ24 Сʱֵࡣ','','ȫϵͳ','',GETDATE(),39) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('A80AF744-AD43-494F-BDD2-6873A31AE71E','ϵͳɣʱʩҪ','','ȫϵͳ','',GETDATE(),40) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('F85C5F64-78EB-42A8-9DD9-1EED976880DF','äר˸𣬽ж̨̬ʣֳơ','','ȫϵͳ','',GETDATE(),41) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('E189A48A-D91E-4D8E-AF71-3A731BEF2FC8','ֳʵ֯Աͨߵȣ','','ȫϵͳ','',GETDATE(),42) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('4A41BCC6-1EAE-4877-A70A-B59E52BD68E5','·ͨ޹','','ȫϵͳ','',GETDATE(),43) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('26D81F27-B1D1-4222-A020-615AE561C96B','ϴװѾ߱Ͷ','','ȫϵͳ','',GETDATE(),44) +go +--== +delete FeedingRun_WorkInspectTemplate where WorkInspectId='7AFC8355-1216-4179-BCDE-8BD1E7001D58' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='955DD47A-DE0C-46B5-B92E-849688B51EF0' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='5EC53FA6-87D3-4D1A-8212-75D011D1DEFB' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='B2DEC6CE-B3CE-414E-BEED-9DC1CB263837' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('7AFC8355-1216-4179-BCDE-8BD1E7001D58','лҡѽƶȣȷ','','','',GETDATE(),45) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('955DD47A-DE0C-46B5-B92E-849688B51EF0','ʩԼ׼ҺѱãҪ','','','',GETDATE(),46) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('5EC53FA6-87D3-4D1A-8212-75D011D1DEFB','ȷߡʵ','','','',GETDATE(),47) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('B2DEC6CE-B3CE-414E-BEED-9DC1CB263837','ģģ','','','',GETDATE(),48) +go +--==֯ԱͨѶ涨 +delete FeedingRun_WorkInspectTemplate where WorkInspectId='9DE2BBE1-E626-4BF6-92F9-A3AF50F8BFEF' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='2EC0EF93-1D55-46EB-9596-F891FD4A7937' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='72B4AF8C-9467-488C-A48D-0D66BD877F1B' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='07DBD283-DD4D-4009-B1CA-CE7514BDA749' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='60AEE8E8-FFEB-4DA6-AFE0-AC273926E47D' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='A326DEF3-8A7F-40A2-B162-156DB80A9B42' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='332E6B45-B972-4A8E-B22C-5213ADA2E4E7' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='A99B4DE2-6647-4AD5-8238-D7E2E6C5ACED' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='F29A52BF-3209-4180-BE6F-1F20508B6AF2' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('9DE2BBE1-E626-4BF6-92F9-A3AF50F8BFEF','Գָ֯ѾԱ룬ѰҪϸڡ','','֯ԱͨѶ涨','',GETDATE(),49) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('2EC0EF93-1D55-46EB-9596-F891FD4A7937','ԳϵͳС','','֯ԱͨѶ涨','',GETDATE(),50) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('72B4AF8C-9467-488C-A48D-0D66BD877F1B','װԱѾȫ','','֯ԱͨѶ涨','',GETDATE(),51) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('07DBD283-DD4D-4009-B1CA-CE7514BDA749','ָϵͳͨѶͨ','','֯ԱͨѶ涨','',GETDATE(),52) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('60AEE8E8-FFEB-4DA6-AFE0-AC273926E47D','λֱͨ绰ѿͨá','','֯ԱͨѶ涨','',GETDATE(),53) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('A326DEF3-8A7F-40A2-B162-156DB80A9B42','ȡ𾯡ȵ绰ɿá','','֯ԱͨѶ涨','',GETDATE(),54) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('332E6B45-B972-4A8E-B22C-5213ADA2E4E7','ߵ绰','','֯ԱͨѶ涨','',GETDATE(),55) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('A99B4DE2-6647-4AD5-8238-D7E2E6C5ACED','Գ涨ȫ̵̡ȼ׼䷢','','֯ԱͨѶ涨','',GETDATE(),56) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('F29A52BF-3209-4180-BE6F-1F20508B6AF2','λ¼Գרñ׼ȫ','','֯ԱͨѶ涨','',GETDATE(),57) +go +--==ˡڱ +delete FeedingRun_WorkInspectTemplate where WorkInspectId='4BC591DA-1188-45FA-884C-AA49D71B9396' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='51F178FB-E61F-4853-B1A4-931345C09335' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='10396FC3-AB9B-4E40-99E1-61D3FD388C2B' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='2CBB0275-90FA-48E9-83DC-4862E8F8E382' +delete FeedingRun_WorkInspectTemplate where WorkInspectId='BAD731C2-2AC3-40E4-A3AA-69FFD13F8C0B' +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('4BC591DA-1188-45FA-884C-AA49D71B9396','˶ɣΧȷ','','ˡڱ','',GETDATE(),58) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('51F178FB-E61F-4853-B1A4-931345C09335','硢Աϸڡ','','ˡڱ','',GETDATE(),59) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('10396FC3-AB9B-4E40-99E1-61D3FD388C2B','װʵ','','ˡڱ','',GETDATE(),60) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('2CBB0275-90FA-48E9-83DC-4862E8F8E382','౸Ʒרùߵѱ롣','','ˡڱ','',GETDATE(),61) +INSERT INTO dbo.FeedingRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,GroupName,AddUser,AddTime,Sort) +VALUES('BAD731C2-2AC3-40E4-A3AA-69FFD13F8C0B','ڷʵ','','ˡڱ','',GETDATE(),62) +go + +--== +if object_id(N'FeedingRun_SubInspectTerm',N'U') is not null +drop table dbo.FeedingRun_SubInspectTerm +CREATE TABLE dbo.FeedingRun_SubInspectTerm( + SubInspectId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + InstallationId varchar(50) NULL,--װ + DriverCharge varchar(50) null,--װÿ + DrivingManager varchar(50) null,-- + ProjectManager varchar(50) null,--Ŀ + DriverChargeIsAllPass int NULL,--װÿǷͨ0/null:δͨ 1:ͨ + DrivingManagerIsAllPass int NULL,--Ƿͨ0/null:δͨ 1:ͨ + ProjectManagerIsAllPass int NULL,--ĿǷͨ0/null:δͨ 1:ͨ + DriverChargeAllPassData datetime null,--װÿͨ + DrivingManagerAllPassData datetime null,--ͨ + ProjectManagerAllPassData datetime null,--Ŀͨ + InspectionIsAllPass int NULL,--0/null:δͨ 1:ͨ + WanderIsComplete int null,--תǷȫͨ0:δͨ1:ͨ + WanderCompleteData datetime null,--ת + IsUnifyWanderAbout int null,--Ƿͳһת0:1: + UnifyWanderAboutData datetime null,--ͳһתʱ + UnifyWanderAboutOpinion varchar(max) null,--ͳһתע + InspectIsClose int null,--Ƿر0:δر1:ѹر + InspectCloseData datetime null,--񵥹ر + InspectTime datetime NULL,--ʱ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_FeedingRun_SubInspectTerm PRIMARY KEY CLUSTERED +( + SubInspectId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--== +if object_id(N'FeedingRun_SubInspectTermItem',N'U') is not null +drop table dbo.FeedingRun_SubInspectTermItem +CREATE TABLE dbo.FeedingRun_SubInspectTermItem( + TermItemId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + InstallationId varchar(50) NULL,--װ + SubInspectId varchar(50) NULL,-- + GroupName varchar(50) NULL,-- + WorkInspectId varchar(50) NOT NULL,--ģ + WorkInspectName varchar(500) NULL,-- + InspectedUser varchar(50) NULL,-- + InspectionResults int NULL,--0:δͨ 1:ͨ + InspectionIllustrate varchar(200) NULL,--˵ + DriverCharge varchar(50) null,--װÿ + DrivingManager varchar(50) null,-- + ProjectManager varchar(50) null,--Ŀ + DriverChargeIsPass int NULL,--װÿǷͨ0/null:δͨ 1:ͨ + DrivingManagerIsPass int NULL,--Ƿͨ0/null:δͨ 1:ͨ + ProjectManagerIsPass int NULL,--ĿǷͨ0/null:δͨ 1:ͨ + DriverChargeRemark varchar(1000) NULL,--װÿ˱ע + DrivingManagerRemark varchar(1000) NULL,--ע + ProjectManagerRemark varchar(1000) NULL,--Ŀע + Remark varchar(200) NULL,--ע + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + Sort int NULL,-- + CONSTRAINT PK_FeedingRun_SubInspectTermItem PRIMARY KEY CLUSTERED +( + TermItemId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--==β +if object_id(N'FeedingRun_InspectTailTerm',N'U') is not null +drop table dbo.FeedingRun_InspectTailTerm +CREATE TABLE dbo.FeedingRun_InspectTailTerm( + TailTermId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + ProjectName varchar(50) NULL,--Ŀ + TailTermCode varchar(50) NULL,--Ѳ + ConstructionUnit varchar(50) NULL,--ʩλ + SubInspectId varchar(50) NULL,-- + TermItemId varchar(50) NULL,-- + QuestionDesc varchar(max) NULL,-- + RectifyOpinion varchar(max) NULL,-- + RectifyTime datetime NULL,--βʱ + InspectUser varchar(50) NULL,-- + HandleUser varchar(50) NULL,-- + ApproveUser varchar(50) NULL,-- + AdjustCompleteTime datetime NULL,--Ҫʱ + ApproveState int NULL,--0:ύ1:2:˻3:˻4:5:ͨ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_FeedingRun_InspectTailTerm PRIMARY KEY CLUSTERED +( + TailTermId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--==/˼¼ +if object_id(N'FeedingRun_InspectTermApproveRecords',N'U') is not null +drop table dbo.FeedingRun_InspectTermApproveRecords +CREATE TABLE dbo.FeedingRun_InspectTermApproveRecords( + InspectTermId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + TermItemId varchar(50) NULL,-- + TailTermId varchar(50) NULL,--β + ApproveOpinion varchar(max) NULL,-- + ApproveTime datetime NULL,--ʱ + ApproveUser varchar(50) NULL,-- + ApproveType int NULL,--¼0:¼1:˼¼ + ApproveState int NULL,--0:˻1:ͨ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_FeedingRun_InspectTermApproveRecords PRIMARY KEY CLUSTERED +( + InspectTermId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..f7b0779a 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,261 @@ + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ZHGL\TestRunPerformance\TestRunMonthSummaryReport.aspx(24): error CS1061: “ASP.zhgl_testrunperformance_testrunmonthsummaryreport_aspx”不包含“TextBox_TextChanged”的定义，并且找不到可接受类型为“ASP.zhgl_testrunperformance_testrunmonthsummaryreport_aspx”的第一个参数的扩展方法“TextBox_TextChanged”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:03/25/2024 09:28:04 +出错文件:http://localhost:8579/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx +IP地址:::1 + +出错时间:03/25/2024 09:28:04 + + +错误信息开始=====> +错误类型:HttpException +错误信息:文件“/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx”不存在。 +错误堆栈: + 在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:03/25/2024 09:34:30 +出错文件:http://localhost:8579/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx +IP地址:::1 + +出错时间:03/25/2024 09:34:30 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180 +出错时间:03/25/2024 12:20:30 +出错时间:03/25/2024 12:20:30 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045 +出错时间:03/25/2024 12:20:30 +出错时间:03/25/2024 12:20:30 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941 +出错时间:03/25/2024 12:20:30 +出错时间:03/25/2024 12:20:30 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883 +出错时间:03/25/2024 12:20:30 +出错时间:03/25/2024 12:20:30 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180 +出错时间:03/25/2024 14:20:29 +出错时间:03/25/2024 14:20:29 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045 +出错时间:03/25/2024 14:20:29 +出错时间:03/25/2024 14:20:29 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941 +出错时间:03/25/2024 14:20:29 +出错时间:03/25/2024 14:20:29 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883 +出错时间:03/25/2024 14:20:29 +出错时间:03/25/2024 14:20:30 + + +错误信息开始=====> +错误类型:HttpException +错误信息:找到多个具有相同 ID“ftpl_efe04d84-3138-4a9f-b1fc-16eb8af69df5_5”的控件。FindControl 要求控件具有唯一的 ID。 +错误堆栈: + 在 System.Web.UI.Control.FillNamedControlsTable(Control namingContainer, ControlCollection controls) + 在 System.Web.UI.Control.FindControl(String id, Int32 pathOffset) + 在 System.Web.UI.Control.FindControl(String id, Int32 pathOffset) + 在 System.Web.UI.Control.FindControl(String id, Int32 pathOffset) + 在 System.Web.UI.Page.FindControl(String id) + 在 System.Web.UI.Page.ProcessPostData(NameValueCollection postData, Boolean fBeforeLoad) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/26/2024 10:58:48 +出错文件:http://localhost:8579/HSSE/InformationProject/CreateLawRegulationIdentify.aspx?LawRegulationIds= +IP地址:::1 +操作人员:JT + +出错时间:03/26/2024 10:58:48 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 8a009968..64eb053d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1801,6 +1801,23 @@ + + + + + + + + + + + + + + + + + @@ -2070,6 +2087,7 @@ + @@ -16194,6 +16212,125 @@ FeedingTestRunEdit.aspx + + FeedingRunApplication.aspx + ASPXCodeBehind + + + FeedingRunApplication.aspx + + + InspectTailTermEdit.aspx + ASPXCodeBehind + + + InspectTailTermEdit.aspx + + + InspectTailTermList.aspx + ASPXCodeBehind + + + InspectTailTermList.aspx + + + InspectTemplate.aspx + ASPXCodeBehind + + + InspectTemplate.aspx + + + InspectTemplateEdit.aspx + ASPXCodeBehind + + + InspectTemplateEdit.aspx + + + InspectWanderAboutAllPass.aspx + ASPXCodeBehind + + + InspectWanderAboutAllPass.aspx + + + InspectWanderAboutAllPassList.aspx + ASPXCodeBehind + + + InspectWanderAboutAllPassList.aspx + + + InspectWanderAboutConfirm.aspx + ASPXCodeBehind + + + InspectWanderAboutConfirm.aspx + + + InspectWanderAboutList.aspx + ASPXCodeBehind + + + InspectWanderAboutList.aspx + + + SelectTailTermList.aspx + ASPXCodeBehind + + + SelectTailTermList.aspx + + + SubInspectTerm.aspx + ASPXCodeBehind + + + SubInspectTerm.aspx + + + SubInspectTermEdit.aspx + ASPXCodeBehind + + + SubInspectTermEdit.aspx + + + SubWorkInspect.aspx + ASPXCodeBehind + + + SubWorkInspect.aspx + + + TailTermApprove.aspx + ASPXCodeBehind + + + TailTermApprove.aspx + + + TailTermApproveList.aspx + ASPXCodeBehind + + + TailTermApproveList.aspx + + + TailTermHandle.aspx + ASPXCodeBehind + + + TailTermHandle.aspx + + + TailTermHandleList.aspx + ASPXCodeBehind + + + TailTermHandleList.aspx + Feedback.aspx ASPXCodeBehind @@ -18077,6 +18214,13 @@ TestRunMonthSummaryReport.aspx + + TestRunMonthSummaryReportEdit.aspx + ASPXCodeBehind + + + TestRunMonthSummaryReportEdit.aspx + TestRunPerformanceMonthReport.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 9e91deff..63ca13cc 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true false diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx b/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx index 70e761cc..5caa030b 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx @@ -48,7 +48,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx.designer.cs index 3705582d..fc68d211 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentifyEdit.aspx.designer.cs @@ -109,7 +109,7 @@ namespace FineUIPro.Web.HSSE.InformationProject { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hdLawRegulationId; + protected global::FineUIPro.TextBox hdLawRegulationId; /// /// labNumber 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs index d15b1ba0..e73d7000 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); - var inspectTerms = Funs.DB.PreRun_SubInspectTerm.Where(x => (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.ContractorIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.SupervisionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.OwnerIsAllPass == 1)).ToList(); + var inspectTerms = Funs.DB.PreRun_SubInspectTerm.Where(x => (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.InspectionIsAllPass == 1)).ToList(); if (inspectTerms.Count == 0) return; var subSystemIds = inspectTerms.ConvertAll(x => x.SubSystemId); var workPackIds = inspectTerms.ConvertAll(x => x.WorkPackId); diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx index 494cbc42..34dd7003 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx @@ -169,6 +169,7 @@ var valid = true, modifiedData = grid1.getMergedData(); $.each(modifiedData, function (index, rowData) { + debugger; if (rowData.status === 'deleted') { return true; // continue } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs index 1dd36e2f..032a9492 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs @@ -38,12 +38,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); var termIds = new List(); - var tailTerms = Funs.DB.PreRun_InspectTailTerm.Where(x => x.HandleUser == this.CurrUser.UserId).ToList(); + var tailTerms = Funs.DB.PreRun_InspectTailTerm.Where(x => x.HandleUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); if (tailTerms.Count > 0) { termIds = tailTerms.ConvertAll(x => x.TermItemId); } - var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId)).ToList(); + var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId) && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); if (userSubInspects.Count == 0) return; var subSystemIds = userSubInspects.ConvertAll(x => x.SubSystemId); var workPackIds = userSubInspects.ConvertAll(x => x.WorkPackId); diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx new file mode 100644 index 00000000..b2117977 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx @@ -0,0 +1,134 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FeedingRunApplication.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.FeedingRunApplication" %> + + + + + + + + + 投料试车申请 + + + +
+ + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs new file mode 100644 index 00000000..f346ae2e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.cs @@ -0,0 +1,450 @@ +using BLL; +using NPOI.SS.UserModel; +using NPOI.SS.Util; +using NPOI.XSSF.UserModel; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class FeedingRunApplication : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + InitTreeMenu(); + } + } + + + #region 数加载 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var inspectTerms = Funs.DB.FeedingRun_SubInspectTerm.Where(x => x.InspectIsClose == 1).ToList(); + if (inspectTerms.Count == 0) return; + var subInstallationIds = inspectTerms.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 树点击 + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 数据绑定 + + /// + /// 绑定数据 + /// + public void BindGrid() + { + List listStr = new List(); + string sqlStr = $"select a.SubInspectId,a.ProjectId,a.InstallationId,a.DriverCharge,c.UserName as DriverChargeName,a.DrivingManager,d.UserName as DrivingManagerName,a.ProjectManager,e.UserName as ProjectManagerName,a.WanderIsComplete,a.WanderCompleteData,a.IsUnifyWanderAbout,a.UnifyWanderAboutData,a.InspectIsClose,a.InspectCloseData,b.ProjectCode,b.ProjectName from FeedingRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId inner join Sys_User as c on c.UserId=a.DriverCharge inner join Sys_User as d on d.UserId=a.DrivingManager inner join Sys_User as e on e.UserId=a.ProjectManager where a.InspectIsClose=1 and a.ProjectId=@projectid "; + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + if(!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + sqlStr += $"and a.InstallationId=@InstallationId "; + listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); + } + sqlStr += " order by a.InspectCloseData desc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(sqlStr, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮和事件 + + /// + /// 查询 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 导出投料试车申请表 + /// + protected void btnExport_Click(object sender, EventArgs e) + { + //string rootPath = Server.MapPath("~/") + Const.ExcelUrl; + ////导出文件 + //string filePath = rootPath + DateTime.Now.ToString("yyyyMMddhhmmss") + "\\"; + //if (!Directory.Exists(filePath)) + //{ + // Directory.CreateDirectory(filePath); + //} + //string ReportFileName = filePath + "投料试车申请.xlsx"; + ////获取工作包检查表 + //var termData = from a in Funs.DB.FeedingRun_SubInspectTerm + // join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId + // join zz in Funs.DB.PreRun_SysDevice on a.InstallationId equals zz.PreRunId//装置 + // select new { a.SubInspectId, a.ProjectId, b.ProjectName, b.ShortName, b.ProjectCode, a.InstallationId, a.DriverCharge, a.DrivingManager, a.ProjectManager, a.InspectionIsAllPass, a.DriverChargeIsAllPass, a.DrivingManagerIsAllPass, a.ProjectManagerIsAllPass, a.InspectTime, a.AddUser, a.AddTime, zzName = zz.PreRunName }; + //if (termData != null) + //{ + // var termModel = termData.FirstOrDefault(); + // //获取工作包检查项表 + // var termItems = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList(); + // int rowIndex = 0; + // XSSFWorkbook hssfworkbook = new XSSFWorkbook(); + // XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet("投料试车申请"); + + // #region 列宽 + + // ws.SetColumnWidth(0, (7 * 256)); + // ws.SetColumnWidth(1, (4 * 256)); + // ws.SetColumnWidth(2, (4 * 256)); + // ws.SetColumnWidth(3, (4 * 256)); + // ws.SetColumnWidth(4, (10 * 256)); + // ws.SetColumnWidth(5, (10 * 256)); + // ws.SetColumnWidth(6, (10 * 256)); + // ws.SetColumnWidth(7, (10 * 256)); + // ws.SetColumnWidth(8, (3 * 256)); + // ws.SetColumnWidth(9, (3 * 256)); + // ws.SetColumnWidth(10, (3 * 256)); + // ws.SetColumnWidth(11, (3 * 256)); + // ws.SetColumnWidth(12, (3 * 256)); + // ws.SetColumnWidth(13, (3 * 256)); + // ws.SetColumnWidth(14, (3 * 256)); + // ws.SetColumnWidth(15, (3 * 256)); + // ws.SetColumnWidth(16, (3 * 256)); + // ws.SetColumnWidth(17, (3 * 256)); + + // #endregion + + // #region 样式 + // //头部样式居中 + // ICellStyle titleStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 14, true, true); + // //头部样式靠左 + // ICellStyle leftTitleStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 14, true, true); + // //公共样式 + // ICellStyle style = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 10.5, true); + // //公共样式靠左 + // ICellStyle leftStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 10.5, true); + // //公共样式靠左上对其 + // ICellStyle leftTopStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Top, HorizontalAlignment.Left, 10.5, true); + // //公共样式加粗 + // ICellStyle styleBold = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 10.5, true, true); + + // #endregion + + // #region 头部 + + // ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex, rowIndex + 5, 0, 17); + // //行1 + // var region = new CellRangeAddress(rowIndex, rowIndex + 2, 0, 0); + // ws.AddMergedRegion(region); + // byte[] bytes = File.ReadAllBytes(Server.MapPath("~/") + "Images\\Template.png"); + // int pictureIdx = hssfworkbook.AddPicture(bytes, PictureType.JPEG); + // IDrawing patriarch = ws.CreateDrawingPatriarch(); + // IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 0, rowIndex, 1, rowIndex + 2); + // IPicture pict = patriarch.CreatePicture(anchor, pictureIdx); + // //pict.Resize(); + // region = new CellRangeAddress(rowIndex, rowIndex + 2, 1, 3); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex).GetCell(1).SetCellValue("中国五环工程有限公司"); + // ws.GetRow(rowIndex).GetCell(1).CellStyle = + // ws.GetRow(rowIndex).GetCell(2).CellStyle = + // ws.GetRow(rowIndex).GetCell(3).CellStyle = leftTitleStyle; + // region = new CellRangeAddress(rowIndex, rowIndex, 4, 7); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex).GetCell(4).SetCellValue(termModel.ProjectName); + // ws.GetRow(rowIndex).GetCell(4).CellStyle = style; + // region = new CellRangeAddress(rowIndex, rowIndex, 8, 12); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex).GetCell(8).SetCellValue("项目号"); + // ws.GetRow(rowIndex).GetCell(8).CellStyle = style; + // region = new CellRangeAddress(rowIndex, rowIndex, 13, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex).GetCell(13).SetCellValue(termModel.ProjectCode); + // ws.GetRow(rowIndex).GetCell(13).CellStyle = style; + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 4, 7); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(4).SetCellValue($"（{termModel.zzName}）"); + // ws.GetRow(rowIndex + 1).GetCell(4).CellStyle = style; + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 8, 12); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(8).SetCellValue("（文件号）"); + // ws.GetRow(rowIndex + 1).GetCell(8).CellStyle = style; + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 13, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(13).SetCellValue(""); + // ws.GetRow(rowIndex + 1).GetCell(13).CellStyle = style; + // region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 4, 7); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 2).GetCell(4).SetCellValue($"投料试车条件检查表"); + // ws.GetRow(rowIndex + 2).GetCell(4).CellStyle = titleStyle; + // region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 8, 12); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 2).GetCell(8).SetCellValue("第 1 页"); + // ws.GetRow(rowIndex + 2).GetCell(8).CellStyle = style; + // region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 13, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 2).GetCell(13).SetCellValue("共 1 页"); + // ws.GetRow(rowIndex + 2).GetCell(13).CellStyle = style; + // //行4,行5 + // region = new CellRangeAddress(rowIndex + 3, rowIndex + 4, 0, 2); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 3).GetCell(0).CellStyle = style; + // ws.GetRow(rowIndex + 3).GetCell(0).SetCellValue(""); + // region = new CellRangeAddress(rowIndex + 3, rowIndex + 4, 3, 11); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 3).GetCell(3).CellStyle = leftStyle; + // ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue(""); + // region = new CellRangeAddress(rowIndex + 3, rowIndex + 3, 12, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 3).GetCell(12).CellStyle = style; + // ws.GetRow(rowIndex + 3).GetCell(12).SetCellValue("检查日期"); + // region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 12, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 4).GetCell(12).CellStyle = style; + // ws.GetRow(rowIndex + 4).GetCell(12).SetCellValue(DateTime.Now.ToString("yyyy年MM月dd日")); + // //行6 + // ws.GetRow(rowIndex + 5).GetCell(0).CellStyle = styleBold; + // ws.GetRow(rowIndex + 5).GetCell(0).SetCellValue("序号"); + // region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 1, 7); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 5).GetCell(1).CellStyle = styleBold; + // ws.GetRow(rowIndex + 5).GetCell(1).SetCellValue("检查项目"); + // region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 8, 12); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 5).GetCell(8).CellStyle = styleBold; + // ws.GetRow(rowIndex + 5).GetCell(8).SetCellValue("结果"); + // region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 13, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 5).GetCell(13).CellStyle = styleBold; + // ws.GetRow(rowIndex + 5).GetCell(13).SetCellValue("备注"); + + // #endregion + + // #region 表格 + + // var start = rowIndex + 6; + // var end = rowIndex + 5 + termItems.Count; + + // ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 17); + + // //合并单元格 + // for (int hb = start; hb <= end; hb++) + // { + // region = new CellRangeAddress(hb, hb, 1, 7); + // ws.AddMergedRegion(region); + // region = new CellRangeAddress(hb, hb, 8, 12); + // ws.AddMergedRegion(region); + // region = new CellRangeAddress(hb, hb, 13, 17); + // ws.AddMergedRegion(region); + // } + + // //数据 + // int num = 1; + // var dataIndex = 6; + // foreach (var item in termItems) + // { + // //序号 + // ws.GetRow(dataIndex).GetCell(0).SetCellValue(num); + // //检查项目 + // ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.WorkInspectName); + // ws.GetRow(dataIndex).GetCell(1).CellStyle = leftStyle; + // //结果 + // ws.GetRow(dataIndex).GetCell(8).SetCellValue(""); + // //备注 + // ws.GetRow(dataIndex).GetCell(13).SetCellValue(""); + // dataIndex++; + // num++; + // } + // rowIndex = start + termItems.Count; + + // #endregion + + // #region 尾部 + + // ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex, rowIndex, 0, 17, 100); + // //行1 + // ws.GetRow(rowIndex).GetCell(0).SetCellValue("结论"); + // region = new CellRangeAddress(rowIndex, rowIndex, 1, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex).GetCell(1).SetCellValue("是否同意进行（包括整改意见）："); + // ws.GetRow(rowIndex).GetCell(1).CellStyle = leftTopStyle; + // //行2 + // ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex + 1, rowIndex + 1, 0, 17, 80); + // ws.GetRow(rowIndex + 1).GetCell(0).SetCellValue("检查人员"); + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 1, 4); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(1).SetCellValue("施工单位："); + // ws.GetRow(rowIndex + 1).GetCell(1).CellStyle = leftTopStyle; + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 5, 6); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(5).SetCellValue("装置开车负责人："); + // ws.GetRow(rowIndex + 1).GetCell(5).CellStyle = leftTopStyle; + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 7, 11); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(7).SetCellValue("开车经理："); + // ws.GetRow(rowIndex + 1).GetCell(7).CellStyle = leftTopStyle; + // region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 12, 17); + // ws.AddMergedRegion(region); + // ws.GetRow(rowIndex + 1).GetCell(12).SetCellValue("项目经理："); + // ws.GetRow(rowIndex + 1).GetCell(12).CellStyle = leftTopStyle; + + // #endregion + + // ws.PrintSetup.Landscape = false; + // ws.PrintSetup.PaperSize = 9; + // ws.ForceFormulaRecalculation = true; + // using (FileStream filess = File.OpenWrite(ReportFileName)) + // { + // hssfworkbook.Write(filess); + // } + // FileInfo filet = new FileInfo(ReportFileName); + // Response.Clear(); + // Response.Charset = "GB2312"; + // Response.ContentEncoding = System.Text.Encoding.UTF8; + // // 添加头信息，为"文件下载/另存为"对话框指定默认文件名 + // Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode("投料试车申请.xlsx")); + // // 添加头信息，指定文件大小，让浏览器能够显示下载进度 + // Response.AddHeader("Content-Length", filet.Length.ToString()); + // // 指定返回的是一个不能被客户端读取的流，必须被下载 + // Response.ContentType = "application/ms-excel"; + // // 把文件流发送到客户端 + // Response.WriteFile(filet.FullName); + // // 停止页面的执行 + // Response.End(); + //} + } + + /// + /// 右击导出投料试车申请表 + /// + protected void btnMenuExport_Click(object sender, EventArgs e) + { + btnExport_Click(null, null); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnExport_Click(null, null); + } + + #endregion + + + + #region 私有方法 + + /// + /// 创建样式 + /// + /// + public static ICellStyle SetExcelStyle(XSSFWorkbook wb, BorderStyle Bottom, BorderStyle Left, BorderStyle Right, BorderStyle Top, VerticalAlignment VerAig, HorizontalAlignment HorAig, double FontSize, bool WrapText = true, bool Bold = false, string FontName = "宋体") + { + ICellStyle style = wb.CreateCellStyle(); + style.BorderBottom = Bottom; + style.BorderLeft = Left; + style.BorderRight = Right; + style.BorderTop = Top; + style.VerticalAlignment = VerAig; + style.Alignment = HorAig; + IFont font = wb.CreateFont(); + font.FontHeightInPoints = FontSize; + font.IsBold = Bold; + font.FontName = FontName; + style.SetFont(font); + style.WrapText = WrapText; + return style; + } + + /// + /// 创建头部 + /// + /// + private XSSFSheet ExcelCreateRowTitle(XSSFSheet ws, XSSFWorkbook hssfworkbook, ICellStyle style, int sRows, int eRows, int cStart, int cEnd, float height = 21) + { + for (int i = sRows; i <= eRows; i++) + { + ws.CreateRow(i); + ws.GetRow(i).HeightInPoints = height; + for (int j = cStart; j <= cEnd; j++) + { + ws.GetRow(i).CreateCell(j); + ws.GetRow(i).CreateCell(j).CellStyle = style; + } + } + return ws; + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.designer.cs new file mode 100644 index 00000000..768b8013 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/FeedingRunApplication.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class FeedingRunApplication + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuExport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuExport; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx new file mode 100644 index 00000000..c9c2e641 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx @@ -0,0 +1,181 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectTailTermEdit" %> + + + + + + 质量巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.cs new file mode 100644 index 00000000..e4a7d562 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.cs @@ -0,0 +1,393 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectTailTermEdit : PageBase + { + /// + /// 检查表尾项主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 检查项主键 + /// + public string TermItemId + { + get { return (string)ViewState["TermItemId"]; } + set { ViewState["TermItemId"] = value; } + } + + /// + /// 是否查看 + /// + public bool IsView + { + get { return (bool)ViewState["IsView"]; } + set { ViewState["IsView"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.TermItemId = Request["TermItemId"]; + //是否查看 + this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); + //数据绑定 + PageInit(); + //处理和审批意见绑定 + gvRecordBrid(); + //判断是否查看 + if (IsView) + { + btnSave.Hidden = true; + btnSubmit.Hidden = true; + QuestionEditImg = -1; + txtTailTermCode.Enabled = false; + ddlConstructionUnit.Enabled = false; + ddlTermItemId.Enabled = false; + txtQuestionDesc.Enabled = false; + txtRectifyOpinion.Enabled = false; + ddlApproveUser.Enabled = false; + ddlHandleUser.Enabled = false; + } + } + } + + + /// + /// 默认绑定 + /// + public void PageInit() + { + QuestionEditImg = 0; + //施工单位 + UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + //检查人绑定 + var userList = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); + var users = userList.ToList(); + if (addUserList.Count() > 0) + { + users.AddRange(addUserList); + } + //检查人和审核人 + if (users.Count() > 0) + { + //处理人 + ddlHandleUser.DataTextField = "UserName"; + ddlHandleUser.DataValueField = "UserId"; + ddlHandleUser.DataSource = users; + ddlHandleUser.DataBind(); + ddlHandleUser.SelectedValue = this.CurrUser.UserId; + //审核人 + ddlApproveUser.DataTextField = "UserName"; + ddlApproveUser.DataValueField = "UserId"; + ddlApproveUser.DataSource = users; + ddlApproveUser.DataBind(); + ddlApproveUser.SelectedValue = this.CurrUser.UserId; + } + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model != null) + { + //项目名称 + txtProjectName.Text = model.ProjectName; + //巡检编号 + txtTailTermCode.Text = model.TailTermCode; + //施工单位 + ddlConstructionUnit.SelectedValue = model.ConstructionUnit; + //提出人 + var inspectModel = users.FirstOrDefault(x => x.UserId == model.InspectUser); + if (inspectModel != null) + { + lblInspectUser.Text = inspectModel.UserName; + hidInspectUserId.Text = inspectModel.UserId; + } + //绑定检查项 + var list = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.InspectedUser == this.CurrUser.UserId).ToList(); + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + //检查项 + ddlTermItemId.SelectedValue = model.TermItemId; + //问题描述 + txtQuestionDesc.Text = model.QuestionDesc; + //整改意见 + txtRectifyOpinion.Text = model.RectifyOpinion; + //提出时间 + lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd") : string.Empty; + //处理人 + ddlHandleUser.SelectedValue = model.HandleUser; + //审核人 + ddlApproveUser.SelectedValue = model.ApproveUser; + //整改完成日期 + txtAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd") : string.Empty; + if (model.ApproveState > 1) + { + QuestionEditImg = -1; + } + } + else + { + this.TailTermId = Guid.NewGuid().ToString(); + var projectModel = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == this.CurrUser.LoginProjectId); + if (projectModel != null) + { + txtProjectName.Text = projectModel.ProjectName; + string code = projectModel.ProjectCode + "-06-CM03-XJ-"; + txtTailTermCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.FeedingRun_InspectTailTerm", "TailTermCode", code); + } + if (!string.IsNullOrWhiteSpace(this.TermItemId)) + { + var itemTerm = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.InspectedUser == this.CurrUser.UserId && x.TermItemId == this.TermItemId); + if (itemTerm != null) + { + var list = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId && (x.InspectionResults == 0 || x.TermItemId == this.TermItemId)); + ddlTermItemId.Items.Clear(); + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + else + { + ddlTermItemId.Items.Insert(0, new ListItem("==无数据==", "")); + } + + //检查项 + ddlTermItemId.SelectedValue = itemTerm.TermItemId; + //提出人 + var inspectModel = users.FirstOrDefault(x => x.UserId == itemTerm.InspectedUser); + if (inspectModel != null) + { + lblInspectUser.Text = inspectModel.UserName; + hidInspectUserId.Text = inspectModel.UserId; + } + //提出时间 + lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); + } + } + } + } + + /// + /// 处理和审批意见绑定 + /// + public void gvRecordBrid() + { + string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from FeedingRun_InspectTermApproveRecords as a inner join FeedingRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join FeedingRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@TailTermId", this.TailTermId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + //处理意见 + var handleTb = tb.AsEnumerable().Where(row => row.Field("ApproveType") == 0); + gvHandle.DataSource = handleTb; + gvHandle.DataBind(); + //审批意见 + var approveTb = tb.AsEnumerable().Where(row => row.Field("ApproveType") == 1); + gvApprove.DataSource = approveTb; + gvApprove.DataBind(); + } + + #region 按钮 + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("请选择施工单位!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("请选择检查项!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue)) + { + ShowNotify("请选择处理人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("请选择审核人!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new FeedingRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(lblRectifyTime.Text); + model.InspectUser = hidInspectUserId.Text; + model.HandleUser = ddlHandleUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text); + model.ApproveState = 0; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + if (isAdd) + { + Funs.DB.FeedingRun_InspectTailTerm.InsertOnSubmit(model); + } + //判断尾项是否保存 + var itemModel = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId && x.InspectedUser == this.CurrUser.UserId); + if (itemModel != null) itemModel.InspectionResults = 0; + Funs.DB.SubmitChanges(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 保存并提交 + /// + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("请选择施工单位!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("请选择检查项!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue)) + { + ShowNotify("请选择处理人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("请选择审核人!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new FeedingRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(lblRectifyTime.Text); + model.InspectUser = hidInspectUserId.Text; + model.HandleUser = ddlHandleUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text); + model.ApproveState = 1; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + if (isAdd) + { + Funs.DB.FeedingRun_InspectTailTerm.InsertOnSubmit(model); + } + //判断尾项是否保存 + var itemModel = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId && x.InspectedUser == this.CurrUser.UserId); + if (itemModel != null) itemModel.InspectionResults = 0; + Funs.DB.SubmitChanges(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + #endregion + + #region 事件 + + /// + /// 检查项 + /// + protected void ddlTermItemId_SelectedIndexChanged(object sender, EventArgs e) + { + var itemUserTerm = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == ddlTermItemId.SelectedValue); + if (itemUserTerm != null) + { + //提出人 + var inspectModel = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == itemUserTerm.InspectedUser); + if (inspectModel != null) + { + lblInspectUser.Text = inspectModel.UserName; + hidInspectUserId.Text = inspectModel.UserId; + } + //提出时间 + lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.designer.cs new file mode 100644 index 00000000..38d67af9 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermEdit.aspx.designer.cs @@ -0,0 +1,269 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectTailTermEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTailTermCode; + + /// + /// ddlConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlConstructionUnit; + + /// + /// ddlTermItemId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlTermItemId; + + /// + /// txtQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtQuestionDesc; + + /// + /// txtRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRectifyOpinion; + + /// + /// lblInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblRectifyTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyTime; + + /// + /// hidInspectUserId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hidInspectUserId; + + /// + /// ddlHandleUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlHandleUser; + + /// + /// ddlApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveUser; + + /// + /// txtAdjustCompleteTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtAdjustCompleteTime; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvHandle 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvHandle; + + /// + /// plApprove3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove3; + + /// + /// gvApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvApprove; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx new file mode 100644 index 00000000..7fcb30bb --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx @@ -0,0 +1,189 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectTailTermList" %> + + + + + + + + + 检查表尾项管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs new file mode 100644 index 00000000..da7fff7d --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs @@ -0,0 +1,365 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectTailTermList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + InitTreeMenu(); + } + } + + #region 树绑定 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId && x.InspectionResults == 0).ToList(); + if (userSubInspects.Count == 0) return; + var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 点击TreeView + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + + #endregion + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交处理' when 1 then '待处理' when 2 then '处理退回' when 3 then '审核退回' when 4 then '待审核' when 5 then '审核通过' else '' end) as ApproveStateName,a.AddTime,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from FeedingRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join FeedingRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where 1=1 and a.ProjectId=@projectid and a.InspectUser=@InspectUser"; + + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@InspectUser", this.CurrUser.UserId)); + if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + strSql += " and c.InstallationId=@InstallationId"; + listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and a.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + //开始时间 + if (!string.IsNullOrWhiteSpace(txtStartTime.Text)) + { + strSql += $" and a.RectifyTime>='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 00:00:00'"; + } + //结束时间 + if (!string.IsNullOrWhiteSpace(txtEndTime.Text)) + { + strSql += $" and a.RectifyTime<='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'"; + } + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 行数据处理事件 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + DataRowView row = e.DataItem as DataRowView; + + // 入学年份 + int diffDay = Convert.ToInt32(row["AdjustDiffDay"]); + TemplateField AdjustDiffDay = Grid1.FindColumn("AdjustDiffDay") as TemplateField; + int approveState = int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()); + if (approveState != 5) + { + if (diffDay > 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color1"; + } + else if (diffDay == 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color2"; + } + else if (diffDay < 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color3"; + } + } + } + + #endregion + + #region 按钮 + + /// + /// 修改 + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + var passLs = new List() { 0, 2 }; + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (!passLs.Contains(model.ApproveState.Value)) + { + Alert.ShowInTop("只可编辑“待提交处理”和“处理退回”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// 编辑 + /// + protected void btnModify_Click(object sender, EventArgs e) + { + btnMenuModify_Click(null, null); + } + + /// + /// 新增 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId=", "新增 - "))); + } + + /// + /// 查看 + /// + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?IsView=true&TailTermId={0}", Grid1.SelectedRowID, "查看 - "))); + } + + /// + /// 删除 + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 0) + { + Alert.ShowInTop("只可删除待提交的记录！", MessageBoxIcon.Warning); + return; + } + + Funs.DB.FeedingRun_InspectTailTerm.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); + } + } + + /// + /// 查询 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 弹框关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 提交处理 + /// + protected void btnSubmitReview_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var passLs = new List() { 0, 2 }; + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + //0:待提交处理1:待处理2:处理退回3:审核退回4:待审核5:审核通过 + if (!passLs.Contains(model.ApproveState.Value)) + { + Alert.ShowInTop("只可提交“待提交处理”和“处理退回”的记录！", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 1; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("提交成功！", MessageBoxIcon.Success); + } + } + + /// + /// 撤回提交 + /// + protected void btnwithdraw_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + //0:待提交处理1:待处理2:处理退回3:审核退回4:待审核5:审核通过 + if (model.ApproveState != 1) + { + Alert.ShowInTop("只可撤回“待处理”的记录！", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 0; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("撤回成功！", MessageBoxIcon.Success); + } + } + + #endregion + + #region 私有方法 + + /// + /// 是否逾期返回 + /// + /// + public string IsOverdue(object diffDayVal, object approveStateVal) + { + var result = string.Empty; + var diffDay = 0; + var approveState = 0; + if (diffDayVal != null) diffDay = int.Parse(diffDayVal.ToString()); + if (approveStateVal != null) approveStateVal = int.Parse(approveStateVal.ToString()); + if (approveState != 5) + { + if (diffDay > 0) + { + result = "未逾期"; + } + else if (diffDay == 0) + { + result = "即将逾期"; + } + else if (diffDay < 0) + { + result = "已逾期"; + } + } + else + { + result = "整改完毕"; + } + return result; + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.designer.cs new file mode 100644 index 00000000..939a5a5a --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.designer.cs @@ -0,0 +1,233 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectTailTermList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnModify; + + /// + /// btnSubmitReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmitReview; + + /// + /// btnwithdraw 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnwithdraw; + + /// + /// lblIsOverdue 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblIsOverdue; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx new file mode 100644 index 00000000..52ea933e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx @@ -0,0 +1,66 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTemplate.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectTemplate" %> + + + + + + 工作包模板管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.cs new file mode 100644 index 00000000..51240e83 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.cs @@ -0,0 +1,113 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectTemplate : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.BindGrid();//加载树 + } + } + + #region 数据绑定 + + /// + /// 绑定数据 + /// + public void BindGrid() + { + if (!string.IsNullOrWhiteSpace(txtsWorkInspectName.Text)) + { + var list = Funs.DB.FeedingRun_WorkInspectTemplate.Where(x => x.WorkInspectName.Contains(txtsWorkInspectName.Text)).OrderBy(x => x.Sort); + Grid1.DataSource = list; + } + else + { + var list = Funs.DB.FeedingRun_WorkInspectTemplate.OrderBy(x => x.Sort); + Grid1.DataSource = list; + } + Grid1.DataBind(); + } + + /// + /// 搜索 + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 行按钮事件 + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "Delete") + { + string rowID = e.RowID; + var model = Funs.DB.FeedingRun_WorkInspectTemplate.FirstOrDefault(p => p.WorkInspectId == rowID); + if (model != null) + { + Funs.DB.FeedingRun_WorkInspectTemplate.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("删除成功!"); + } + else + { + ShowNotify("删除错误!"); + } + } + } + + #endregion + + /// + /// 新增 + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + this.hidSelectedNodeID.Text = string.Empty; + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hidSelectedNodeID.ClientID) + + Window1.GetShowReference($"InspectTemplateEdit.aspx?WorkInspectId=", "新增")); + } + + /// + /// 编辑 + /// + protected void btnEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + ShowNotify("请选择一条数据!", MessageBoxIcon.Warning); + return; + } + var rowIndex = Grid1.SelectedRowIndex; + var rowId = Grid1.DataKeys[rowIndex][0].ToString(); + this.hidSelectedNodeID.Text = string.Empty; + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hidSelectedNodeID.ClientID) + + Window1.GetShowReference($"InspectTemplateEdit.aspx?WorkInspectId={rowId}", "编辑")); + } + + /// + /// 新增/编辑关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + if (!string.IsNullOrWhiteSpace(hidSelectedNodeID.Text)) + { + BindGrid(); + } + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.designer.cs new file mode 100644 index 00000000..0b5d4a64 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplate.aspx.designer.cs @@ -0,0 +1,125 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectTemplate + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtsWorkInspectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtsWorkInspectName; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// ToolbarFill 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// btnEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnEdit; + + /// + /// hidSelectedNodeID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hidSelectedNodeID; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx new file mode 100644 index 00000000..6772b6bc --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx @@ -0,0 +1,71 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTemplateEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectTemplateEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.cs new file mode 100644 index 00000000..608c5e31 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.cs @@ -0,0 +1,84 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectTemplateEdit : PageBase + { + /// + /// 主键 + /// + public string WorkInspectId + { + get { return (string)ViewState["WorkInspectId"]; } + set { ViewState["WorkInspectId"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.WorkInspectId = Request.Params["WorkInspectId"]; + PageInit(); + } + } + + /// + /// 默认绑定 + /// + public void PageInit() + { + if (!string.IsNullOrWhiteSpace(this.WorkInspectId)) + { + var model = Funs.DB.FeedingRun_WorkInspectTemplate.FirstOrDefault(x => x.WorkInspectId == this.WorkInspectId); + if (model != null) + { + txtWorkInspectName.Text = model.WorkInspectName; + txtRemark.Text = model.Remark; + ddlGroup.SelectedValue = model.GroupName; + txtSort.Text = model.Sort != null ? model.Sort.ToString() : Funs.DB.FeedingRun_WorkInspectTemplate.Count().ToString(); + } + } + else + { + txtSort.Text = (Funs.DB.FeedingRun_WorkInspectTemplate.Count() + 1).ToString(); + } + } + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + var model = Funs.DB.FeedingRun_WorkInspectTemplate.FirstOrDefault(x => x.WorkInspectId == this.WorkInspectId); + if (model == null) model = new Model.FeedingRun_WorkInspectTemplate(); + model.WorkInspectName = txtWorkInspectName.Text; + model.GroupName = ddlGroup.SelectedValue; + model.Remark = txtRemark.Text; + model.Sort = int.Parse(txtSort.Text); + if (string.IsNullOrWhiteSpace(this.WorkInspectId)) + { + model.WorkInspectId = Guid.NewGuid().ToString(); + this.WorkInspectId = model.WorkInspectId; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.FeedingRun_WorkInspectTemplate.InsertOnSubmit(model); + } + Funs.DB.SubmitChanges(); + ShowNotify("保存成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.WorkInspectId) + ActiveWindow.GetHidePostBackReference()); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.designer.cs new file mode 100644 index 00000000..65426163 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectTemplateEdit.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectTemplateEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtWorkInspectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtWorkInspectName; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// txtSort 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtSort; + + /// + /// ddlGroup 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlGroup; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx new file mode 100644 index 00000000..448e23ed --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx @@ -0,0 +1,119 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutAllPass.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectWanderAboutAllPass" %> + + + + + + 全部通过 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.cs new file mode 100644 index 00000000..7bcdc8b1 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.cs @@ -0,0 +1,156 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectWanderAboutAllPass : PageBase + { + /// + /// 检查表主键 + /// + public string SubInspectId + { + get { return (string)ViewState["SubInspectId"]; } + set { ViewState["SubInspectId"] = value; } + } + + /// + /// 统一处理附件 + /// + public int UnifyImg + { + get { return (int)ViewState["UnifyImg"]; } + set { ViewState["UnifyImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.UnifyImg = 0; + this.SubInspectId = Request["SubInspectId"]; + PageInit(); + } + } + + + /// + /// 绑定数据 + /// + public void PageInit() + { + var data = from term in Funs.DB.FeedingRun_SubInspectTerm + join pro in Funs.DB.Base_Project on term.ProjectId equals pro.ProjectId + join ua in Funs.DB.Sys_User on term.DriverCharge equals ua.UserId + join ub in Funs.DB.Sys_User on term.DrivingManager equals ub.UserId + join uc in Funs.DB.Sys_User on term.ProjectManager equals uc.UserId + where term.SubInspectId == this.SubInspectId + select new + { + term.SubInspectId, + term.ProjectId, + pro.ProjectName, + pro.ProjectCode, + term.AddUser, + term.AddTime, + DriverChargeName = ua.UserName, + DrivingManagerName = ub.UserName, + ProjectManagerName = uc.UserName, + term.IsUnifyWanderAbout, + term.UnifyWanderAboutData, + term.UnifyWanderAboutOpinion + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //项目名称 + lblProjectName.Text = model.ProjectName; + //项目号 + lblProjectCode.Text = model.ProjectCode; + //装置开车负责人 + lblDriverChargeName.Text = model.DriverChargeName; + //开车经理 + lblDrivingManagerName.Text = model.DrivingManagerName; + //项目经理 + lblProjectManagerName.Text = model.ProjectManagerName; + //是否统一流转 + rblIsUnifyWanderAbout.SelectedValue = model.IsUnifyWanderAbout != null ? model.IsUnifyWanderAbout.ToString() : "1"; + //审核意见 + txtUnifyWanderAboutOpinion.Text = model.UnifyWanderAboutOpinion; + } + } + + /// + /// 确认 + /// + protected void btnConfirm_Click(object sender, EventArgs e) + { + try + { + if (Funs.DB.AttachFile.Count(x => x.ToKeyId == this.SubInspectId + "_unify" && x.AttachUrl != null && x.AttachUrl != "") == 0) + { + ShowNotify("请上传附件！", MessageBoxIcon.Warning); + return; + } + var term = Funs.DB.FeedingRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId); + if (term != null) + { + var isPass = int.Parse(rblIsUnifyWanderAbout.SelectedValue); + term.IsUnifyWanderAbout = isPass; + term.UnifyWanderAboutData = DateTime.Now; + term.UnifyWanderAboutOpinion = txtUnifyWanderAboutOpinion.Text; + term.DriverChargeIsAllPass = isPass; + term.DrivingManagerIsAllPass = isPass; + term.ProjectManagerIsAllPass = isPass; + term.WanderIsComplete = isPass; + term.InspectIsClose = isPass; + if (isPass == 1) + { + term.DriverChargeAllPassData = DateTime.Now; + term.DrivingManagerAllPassData = DateTime.Now; + term.ProjectManagerAllPassData = DateTime.Now; + term.WanderCompleteData = DateTime.Now; + term.InspectCloseData = DateTime.Now; + } + else + { + term.DriverChargeAllPassData = null; + term.DrivingManagerAllPassData = null; + term.ProjectManagerAllPassData = null; + term.WanderCompleteData = null; + term.InspectCloseData = null; + } + var termIetms = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).ToList(); + if (termIetms.Count > 0) + { + foreach (var item in termIetms) + { + item.DriverChargeIsPass = isPass; + item.DrivingManagerIsPass = isPass; + item.ProjectManagerIsPass = isPass; + Funs.DB.SubmitChanges(); + } + } + ShowNotify("确认成功!", MessageBoxIcon.Success); + } + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 附件上传 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", UnifyImg, this.SubInspectId + "_unify", Const.TestRunMenuId))); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.designer.cs new file mode 100644 index 00000000..3b4bc8b6 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPass.aspx.designer.cs @@ -0,0 +1,197 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectWanderAboutAllPass + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectCode; + + /// + /// lblDriverChargeName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblDriverChargeName; + + /// + /// lblDrivingManagerName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblDrivingManagerName; + + /// + /// lblProjectManagerName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectManagerName; + + /// + /// lblWorkPackName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblWorkPackName; + + /// + /// txtUnifyWanderAboutOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtUnifyWanderAboutOpinion; + + /// + /// rblIsUnifyWanderAbout 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsUnifyWanderAbout; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnConfirm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnConfirm; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx new file mode 100644 index 00000000..a6faca55 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx @@ -0,0 +1,137 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutAllPassList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectWanderAboutAllPassList" %> + + + + + + + + + 检查表流转全部通过 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs new file mode 100644 index 00000000..9827ed08 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.cs @@ -0,0 +1,173 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectWanderAboutAllPassList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + InitTreeMenu(); + } + } + + #region 数加载 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var inspectTerms = Funs.DB.FeedingRun_SubInspectTerm.Where(x => x.InspectionIsAllPass == 1).ToList(); + if (inspectTerms.Count == 0) return; + var subInstallationIds = inspectTerms.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 树点击 + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 数据绑定 + + /// + /// 绑定数据 + /// + public void BindGrid() + { + string sqlStr = $"select a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.AddUser,a.AddTime,c.UserName as DriverChargeName,d.UserName as DrivingManagerName,e.UserName as ProjectManagerName,IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName from FeedingRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId inner join Sys_User as c on c.UserId=a.DriverCharge inner join Sys_User as d on d.UserId=a.DrivingManager inner join Sys_User as e on e.UserId = a.ProjectManager where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId='{this.CurrUser.LoginProjectId}' "; + if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + sqlStr += $"and a.InstallationId='{this.tvControlItem.SelectedNodeID}'"; + } + List listStr = new List(); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(sqlStr); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuAllPass_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮和事件 + + /// + /// 查询 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 检查全部通过 + /// + protected void btnAllPass_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择记录！", MessageBoxIcon.Warning); + return; + } + if (Grid1.SelectedRowIndexArray.Length > 1) + { + Alert.ShowInTop("只可选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectWanderAboutAllPass.aspx?SubInspectId={0}", Grid1.DataKeys[Grid1.SelectedRowIndex][0].ToString(), "检查全部通过 - "))); + } + + /// + /// 右击检查全部通过 + /// + protected void btnMenuAllPass_Click(object sender, EventArgs e) + { + btnAllPass_Click(null, null); + } + + /// + /// 关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.designer.cs new file mode 100644 index 00000000..b0c2557c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutAllPassList.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectWanderAboutAllPassList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnAllPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAllPass; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuAllPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuAllPass; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx new file mode 100644 index 00000000..7e8af176 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx @@ -0,0 +1,137 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutConfirm.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectWanderAboutConfirm" %> + + + + + + 签字确认 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.cs new file mode 100644 index 00000000..1acd2add --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.cs @@ -0,0 +1,651 @@ +using BLL; +using Newtonsoft.Json.Linq; +using NPOI.SS.UserModel; +using NPOI.SS.Util; +using NPOI.XSSF.UserModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectWanderAboutConfirm : PageBase + { + /// + /// 检查表主键 + /// + public string SubInspectId + { + get { return (string)ViewState["SubInspectId"]; } + set { ViewState["SubInspectId"] = value; } + } + + /// + /// 类型 + /// + public int ConfirmType + { + get { return (int)ViewState["ConfirmType"]; } + set { ViewState["ConfirmType"] = value; } + } + + /// + /// 类型名称 + /// + public string ConfirmTypeName + { + get { return (string)ViewState["ConfirmTypeName"]; } + set { ViewState["ConfirmTypeName"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + + if (!IsPostBack) + { + this.SubInspectId = Request.Params["SubInspectId"]; + this.ConfirmType = int.Parse(Request.Params["ConfirmType"]); + + if (this.ConfirmType == 1) + { + this.ConfirmTypeName = "装置开车负责人"; + } + if (this.ConfirmType == 2) + { + this.ConfirmTypeName = "开车经理"; + } + if (this.ConfirmType == 3) + { + this.ConfirmTypeName = "项目经理"; + } + this.BindGrid(); + } + } + + + #region 数据绑定 + + /// + /// 绑定数据 + /// + public void BindGrid(int isPass = -1) + { + var term = Funs.DB.FeedingRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId); + if (term != null) + { + lblIsUnifyWanderAbout.Text = term.IsUnifyWanderAbout == 1 ? "是" : "否"; + lblUnifyWanderAboutData.Text = term.UnifyWanderAboutData != null ? term.UnifyWanderAboutData.Value.ToString("yyyy-MM-dd") : string.Empty; + unifyfile.Hidden = term.IsUnifyWanderAbout == 1 ? false : true; + } + var data = new List(); + var queryData = from a in Funs.DB.FeedingRun_SubInspectTermItem + join b in Funs.DB.Sys_User on a.InspectedUser equals b.UserId + where a.SubInspectId == this.SubInspectId + select new { a, b }; + if (queryData.Count() > 0) + { + var list = queryData.ToList(); + foreach (var item in list) + { + var model = new ConfirmIsPass(); + model.TermItemId = item.a.TermItemId; + model.SubInspectId = item.a.SubInspectId; + model.WorkInspectName = item.a.WorkInspectName; + model.ConfirmType = this.ConfirmType; + model.ConfirmTypeName = this.ConfirmTypeName; + model.InspectedUser = item.a.InspectedUser; + model.InspectedUserName = item.b.UserName; + model.InspectionResults = item.a.InspectionResults.Value; + //1=装置开车负责人=开车经理=项目经理 + if (this.ConfirmType == 1) + { + model.IsPass = isPass != -1 ? isPass : item.a.DriverChargeIsPass; + model.Remark = item.a.DriverChargeRemark; + } + if (this.ConfirmType == 2) + { + model.IsPass = isPass != -1 ? isPass : item.a.DrivingManagerIsPass; + model.Remark = item.a.DrivingManagerRemark; + } + if (this.ConfirmType == 3) + { + model.IsPass = isPass != -1 ? isPass : item.a.ProjectManagerIsPass; + model.Remark = item.a.ProjectManagerRemark; + } + data.Add(model); + } + } + Grid1.DataSource = data; + Grid1.DataBind(); + titleName.Title = this.ConfirmType == 1 ? "装置开车负责人确认签字" : this.ConfirmType == 2 ? "开车经理确认签字" : this.ConfirmType == 3 ? "项目经理确认签字" : ""; + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + #endregion + + #region 按钮和事件 + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + GridRow row = Grid1.Rows[i]; + System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)row.FindControl("rblIsPass"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var inspectedUser = this.Grid1.Rows[i].DataKeys[1].ToString(); + var model = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId && x.InspectedUser == inspectedUser); + if (model != null) + { + if (!string.IsNullOrWhiteSpace(rblIsPass.SelectedValue)) + { + //1=装置开车负责人=开车经理=项目经理 + if (this.ConfirmType == 1) + { + model.DriverChargeIsPass = int.Parse(rblIsPass.SelectedValue); + model.DriverChargeRemark = values.Value("Remark"); + } + else if (this.ConfirmType == 2) + { + model.DrivingManagerIsPass = int.Parse(rblIsPass.SelectedValue); + model.DrivingManagerRemark = values.Value("Remark"); + } + else if (this.ConfirmType == 3) + { + model.ProjectManagerIsPass = int.Parse(rblIsPass.SelectedValue); + model.ProjectManagerRemark = values.Value("Remark"); + } + } + Funs.DB.SubmitChanges(); + } + } + var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString(); + var subModel = Funs.DB.FeedingRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId); + if (subModel != null) + { + //1=装置开车负责人=开车经理=项目经理 + if (this.ConfirmType == 1) + { + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.DriverChargeIsPass.GetValueOrDefault() != 1) == 0) + { + subModel.DriverChargeIsAllPass = 1; + subModel.DriverChargeAllPassData = DateTime.Now; + } + else + { + subModel.DriverChargeIsAllPass = 0; + subModel.DriverChargeAllPassData = null; + } + } + else if (this.ConfirmType == 2) + { + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.DrivingManagerIsPass.GetValueOrDefault() != 1) == 0) + { + subModel.DrivingManagerIsAllPass = 1; + subModel.DrivingManagerAllPassData = DateTime.Now; + } + else + { + subModel.DrivingManagerIsAllPass = 0; + subModel.DrivingManagerAllPassData = null; + } + } + else if (this.ConfirmType == 3) + { + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.ProjectManagerIsPass.GetValueOrDefault() != 1) == 0) + { + subModel.ProjectManagerIsAllPass = 1; + subModel.ProjectManagerAllPassData = DateTime.Now; + } + else + { + subModel.ProjectManagerIsAllPass = 0; + subModel.ProjectManagerAllPassData = null; + } + } + //判断是否全部通过 + if (subModel.DriverChargeIsAllPass == 1 && subModel.DrivingManagerIsAllPass == 1 && subModel.ProjectManagerIsAllPass == 1) + { + subModel.InspectIsClose = 1; + subModel.InspectCloseData = DateTime.Now; + subModel.WanderIsComplete = 1; + subModel.WanderCompleteData = DateTime.Now; + } + else + { + subModel.InspectIsClose = 0; + subModel.InspectCloseData = null; + subModel.WanderIsComplete = 0; + subModel.WanderCompleteData = null; + } + } + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("保存成功!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 导出 + /// + protected void btnExport_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/") + Const.ExcelUrl; + //导出文件 + string filePath = rootPath + DateTime.Now.ToString("yyyyMMddhhmmss") + "\\"; + if (!Directory.Exists(filePath)) + { + Directory.CreateDirectory(filePath); + } + string ReportFileName = filePath + this.ConfirmTypeName + "确认签字.xlsx"; + //获取工作包检查表 + var termData = from a in Funs.DB.FeedingRun_SubInspectTerm + join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId + join zz in Funs.DB.PreRun_SysDevice on a.InstallationId equals zz.PreRunId//装置 + select new { a.SubInspectId, a.ProjectId, b.ProjectName, b.ShortName, b.ProjectCode, a.InstallationId, a.DriverCharge, a.DrivingManager, a.ProjectManager, a.InspectionIsAllPass, a.DriverChargeIsAllPass, a.DrivingManagerIsAllPass, a.ProjectManagerIsAllPass, a.InspectTime, a.AddUser, a.AddTime, zzName = zz.PreRunName }; + if (termData != null) + { + var termModel = termData.FirstOrDefault(); + //获取工作包检查项表 + var termItems = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList(); + int rowIndex = 0; + XSSFWorkbook hssfworkbook = new XSSFWorkbook(); + XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet(this.ConfirmTypeName + "确认签字"); + + #region 列宽 + + ws.SetColumnWidth(0, (7 * 256)); + ws.SetColumnWidth(1, (4 * 256)); + ws.SetColumnWidth(2, (4 * 256)); + ws.SetColumnWidth(3, (4 * 256)); + ws.SetColumnWidth(4, (10 * 256)); + ws.SetColumnWidth(5, (10 * 256)); + ws.SetColumnWidth(6, (10 * 256)); + ws.SetColumnWidth(7, (10 * 256)); + ws.SetColumnWidth(8, (3 * 256)); + ws.SetColumnWidth(9, (3 * 256)); + ws.SetColumnWidth(10, (3 * 256)); + ws.SetColumnWidth(11, (3 * 256)); + ws.SetColumnWidth(12, (3 * 256)); + ws.SetColumnWidth(13, (3 * 256)); + ws.SetColumnWidth(14, (3 * 256)); + ws.SetColumnWidth(15, (3 * 256)); + ws.SetColumnWidth(16, (3 * 256)); + ws.SetColumnWidth(17, (3 * 256)); + + #endregion + + #region 样式 + //头部样式居中 + ICellStyle titleStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 14, true, true); + //头部样式靠左 + ICellStyle leftTitleStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 14, true, true); + //公共样式 + ICellStyle style = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 10.5, true); + //公共样式靠左 + ICellStyle leftStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 10.5, true); + //公共样式靠左上对其 + ICellStyle leftTopStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Top, HorizontalAlignment.Left, 10.5, true); + //公共样式加粗 + ICellStyle styleBold = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 10.5, true, true); + + #endregion + + #region 头部 + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex, rowIndex + 5, 0, 17); + //行1 + var region = new CellRangeAddress(rowIndex, rowIndex + 2, 0, 0); + ws.AddMergedRegion(region); + byte[] bytes = File.ReadAllBytes(Server.MapPath("~/") + "Images\\Template.png"); + int pictureIdx = hssfworkbook.AddPicture(bytes, PictureType.JPEG); + IDrawing patriarch = ws.CreateDrawingPatriarch(); + IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 0, rowIndex, 1, rowIndex + 2); + IPicture pict = patriarch.CreatePicture(anchor, pictureIdx); + //pict.Resize(); + region = new CellRangeAddress(rowIndex, rowIndex + 2, 1, 3); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(1).SetCellValue("中国五环工程有限公司"); + ws.GetRow(rowIndex).GetCell(1).CellStyle = + ws.GetRow(rowIndex).GetCell(2).CellStyle = + ws.GetRow(rowIndex).GetCell(3).CellStyle = leftTitleStyle; + region = new CellRangeAddress(rowIndex, rowIndex, 4, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(4).SetCellValue(termModel.ProjectName); + ws.GetRow(rowIndex).GetCell(4).CellStyle = style; + region = new CellRangeAddress(rowIndex, rowIndex, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(8).SetCellValue("项目号"); + ws.GetRow(rowIndex).GetCell(8).CellStyle = style; + region = new CellRangeAddress(rowIndex, rowIndex, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(13).SetCellValue(termModel.ProjectCode); + ws.GetRow(rowIndex).GetCell(13).CellStyle = style; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 4, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(4).SetCellValue($"（{termModel.zzName}）"); + ws.GetRow(rowIndex + 1).GetCell(4).CellStyle = style; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(8).SetCellValue("（文件号）"); + ws.GetRow(rowIndex + 1).GetCell(8).CellStyle = style; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(13).SetCellValue(""); + ws.GetRow(rowIndex + 1).GetCell(13).CellStyle = style; + region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 4, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 2).GetCell(4).SetCellValue($"投料试车条件检查表"); + ws.GetRow(rowIndex + 2).GetCell(4).CellStyle = titleStyle; + region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 2).GetCell(8).SetCellValue("第 1 页"); + ws.GetRow(rowIndex + 2).GetCell(8).CellStyle = style; + region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 2).GetCell(13).SetCellValue("共 1 页"); + ws.GetRow(rowIndex + 2).GetCell(13).CellStyle = style; + //行4,行5 + region = new CellRangeAddress(rowIndex + 3, rowIndex + 4, 0, 2); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 3).GetCell(0).CellStyle = style; + ws.GetRow(rowIndex + 3).GetCell(0).SetCellValue(""); + region = new CellRangeAddress(rowIndex + 3, rowIndex + 4, 3, 11); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 3).GetCell(3).CellStyle = leftStyle; + ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue(""); + region = new CellRangeAddress(rowIndex + 3, rowIndex + 3, 12, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 3).GetCell(12).CellStyle = style; + ws.GetRow(rowIndex + 3).GetCell(12).SetCellValue("检查日期"); + region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 12, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 4).GetCell(12).CellStyle = style; + ws.GetRow(rowIndex + 4).GetCell(12).SetCellValue(DateTime.Now.ToString("yyyy年MM月dd日")); + //行6 + ws.GetRow(rowIndex + 5).GetCell(0).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(0).SetCellValue("序号"); + region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 1, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 5).GetCell(1).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(1).SetCellValue("检查项目"); + region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 5).GetCell(8).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(8).SetCellValue("结果"); + region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 5).GetCell(13).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(13).SetCellValue("备注"); + + #endregion + + #region 表格 + + var start = rowIndex + 6; + var end = rowIndex + 5 + termItems.Count; + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 17); + + //合并单元格 + for (int hb = start; hb <= end; hb++) + { + region = new CellRangeAddress(hb, hb, 1, 7); + ws.AddMergedRegion(region); + region = new CellRangeAddress(hb, hb, 8, 12); + ws.AddMergedRegion(region); + region = new CellRangeAddress(hb, hb, 13, 17); + ws.AddMergedRegion(region); + } + + //数据 + int num = 1; + var dataIndex = 6; + foreach (var item in termItems) + { + //序号 + ws.GetRow(dataIndex).GetCell(0).SetCellValue(num); + //检查项目 + ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.WorkInspectName); + ws.GetRow(dataIndex).GetCell(1).CellStyle = leftStyle; + //结果 + ws.GetRow(dataIndex).GetCell(8).SetCellValue(""); + //备注 + ws.GetRow(dataIndex).GetCell(13).SetCellValue(""); + dataIndex++; + num++; + } + rowIndex = start + termItems.Count; + + #endregion + + #region 尾部 + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex, rowIndex, 0, 17, 100); + //行1 + ws.GetRow(rowIndex).GetCell(0).SetCellValue("结论"); + region = new CellRangeAddress(rowIndex, rowIndex, 1, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(1).SetCellValue("是否同意进行（包括整改意见）："); + ws.GetRow(rowIndex).GetCell(1).CellStyle = leftTopStyle; + //行2 + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex + 1, rowIndex + 1, 0, 17, 80); + ws.GetRow(rowIndex + 1).GetCell(0).SetCellValue("检查人员"); + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 1, 4); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(1).SetCellValue("施工单位："); + ws.GetRow(rowIndex + 1).GetCell(1).CellStyle = leftTopStyle; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 5, 6); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(5).SetCellValue("装置开车负责人："); + ws.GetRow(rowIndex + 1).GetCell(5).CellStyle = leftTopStyle; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 7, 11); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(7).SetCellValue("开车经理："); + ws.GetRow(rowIndex + 1).GetCell(7).CellStyle = leftTopStyle; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 12, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(12).SetCellValue("项目经理："); + ws.GetRow(rowIndex + 1).GetCell(12).CellStyle = leftTopStyle; + + #endregion + + ws.PrintSetup.Landscape = false; + ws.PrintSetup.PaperSize = 9; + ws.ForceFormulaRecalculation = true; + using (FileStream filess = File.OpenWrite(ReportFileName)) + { + hssfworkbook.Write(filess); + } + FileInfo filet = new FileInfo(ReportFileName); + Response.Clear(); + Response.Charset = "GB2312"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + // 添加头信息，为"文件下载/另存为"对话框指定默认文件名 + Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode(this.ConfirmTypeName + "确认签字.xlsx")); + // 添加头信息，指定文件大小，让浏览器能够显示下载进度 + Response.AddHeader("Content-Length", filet.Length.ToString()); + // 指定返回的是一个不能被客户端读取的流，必须被下载 + Response.ContentType = "application/ms-excel"; + // 把文件流发送到客户端 + Response.WriteFile(filet.FullName); + // 停止页面的执行 + Response.End(); + } + } + + /// + /// 行加载事件 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)Grid1.Rows[e.RowIndex].FindControl("rblIsPass"); + int isPass = 1; + if (Grid1.DataKeys[e.RowIndex][4] != null) isPass = int.Parse(Grid1.DataKeys[e.RowIndex][4].ToString()); + rblIsPass.SelectedValue = isPass.ToString(); + if (rblIsPass.SelectedValue != "1") + { + rblIsAllPass.SelectedValue = "0"; + } + } + + /// + /// 实体绑定 + /// + public class ConfirmIsPass + { + /// + /// 检查项主键 + /// + public string TermItemId { get; set; } + /// + /// 检查表主键 + /// + public string SubInspectId { get; set; } + /// + /// 检查人 + /// + public string InspectedUser { get; set; } + /// + /// 检查人名称 + /// + public string InspectedUserName { get; set; } + /// + /// 检查结果 + /// + public int InspectionResults { get; set; } + /// + /// 名称 + /// + public string WorkInspectName { get; set; } + /// + /// 确认类型1=装置开车负责人2=开车经理3=项目经理 + /// + public int ConfirmType { get; set; } + /// + /// 确认类型名称 + /// + public string ConfirmTypeName { get; set; } + /// + /// 是否通过 + /// + public int? IsPass { get; set; } + /// + /// 备注 + /// + public string Remark { get; set; } + + } + + /// + /// 检查项确认事件 + /// + protected void rblIsPass_SelectedIndexChanged(object sender, EventArgs e) + { + for (int i = 0; i < Grid1.Rows.Count; i++) + { + System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)Grid1.Rows[i].FindControl("rblIsPass"); + if (rblIsPass.SelectedValue != "1") + { + rblIsAllPass.SelectedValue = "0"; + } + } + } + + /// + /// 是否同意进行预试车活动事件 + /// + protected void rblIsAllPass_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(int.Parse(rblIsAllPass.SelectedValue)); + } + + /// + /// 附件上传 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", $"{this.SubInspectId}_{this.ConfirmType}", Const.TestRunMenuId))); + } + + /// + /// 统一流转通过附件查看 + /// + protected void btnUnifyUpload_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", this.SubInspectId + "_unify", Const.TestRunMenuId))); + } + + #endregion + + #region 私有方法 + + /// + /// 创建样式 + /// + /// + public static ICellStyle SetExcelStyle(XSSFWorkbook wb, BorderStyle Bottom, BorderStyle Left, BorderStyle Right, BorderStyle Top, VerticalAlignment VerAig, HorizontalAlignment HorAig, double FontSize, bool WrapText = true, bool Bold = false, string FontName = "宋体") + { + ICellStyle style = wb.CreateCellStyle(); + style.BorderBottom = Bottom; + style.BorderLeft = Left; + style.BorderRight = Right; + style.BorderTop = Top; + style.VerticalAlignment = VerAig; + style.Alignment = HorAig; + IFont font = wb.CreateFont(); + font.FontHeightInPoints = FontSize; + font.IsBold = Bold; + font.FontName = FontName; + style.SetFont(font); + style.WrapText = WrapText; + return style; + } + + /// + /// 创建头部 + /// + /// + private XSSFSheet ExcelCreateRowTitle(XSSFSheet ws, XSSFWorkbook hssfworkbook, ICellStyle style, int sRows, int eRows, int cStart, int cEnd, float height = 21) + { + for (int i = sRows; i <= eRows; i++) + { + ws.CreateRow(i); + ws.GetRow(i).HeightInPoints = height; + for (int j = cStart; j <= cEnd; j++) + { + ws.GetRow(i).CreateCell(j); + ws.GetRow(i).CreateCell(j).CellStyle = style; + } + } + return ws; + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.designer.cs new file mode 100644 index 00000000..40e4309b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutConfirm.aspx.designer.cs @@ -0,0 +1,233 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectWanderAboutConfirm + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// titleName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel titleName; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnExport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnExport; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// rblIsPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.RadioButtonList rblIsPass; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// rblIsAllPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsAllPass; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// lblIsUnifyWanderAbout 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblIsUnifyWanderAbout; + + /// + /// lblUnifyWanderAboutData 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblUnifyWanderAboutData; + + /// + /// unifyfile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow unifyfile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// btnUnifyUpload 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnUnifyUpload; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx new file mode 100644 index 00000000..6cd548f6 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx @@ -0,0 +1,139 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.InspectWanderAboutList" %> + + + + + + + + + 检查表流转 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs new file mode 100644 index 00000000..7ecbe513 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.cs @@ -0,0 +1,192 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class InspectWanderAboutList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + InitTreeMenu(); + } + } + + + #region 数加载 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var inspectTerms = Funs.DB.FeedingRun_SubInspectTerm.Where(x => (x.DriverCharge == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.DrivingManager == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.ProjectManager == this.CurrUser.UserId && x.InspectionIsAllPass == 1)).ToList(); + if (inspectTerms.Count == 0) return; + var subInstallationIds = inspectTerms.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + var ids = list.Select(x => x.ProcessesId).ToList(); + ids.AddRange(list.Select(x => x.PreRunId).ToList()); + ids = ids.Distinct().ToList(); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => ids.Contains(x.PreRunId)).ToList(); + if (syslist.Count > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + } + + /// + /// 树点击 + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 数据绑定 + + /// + /// 绑定数据 + /// + public void BindGrid() + { + //装置开车负责人 + string driverChargeStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.DriverCharge,a.DrivingManager,a.ProjectManager,1 as ConfirmType,'装置开车负责人' as ConfirmName,(select count (1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.DriverChargeIsPass is null) as WaitConfirmNum,(select count (1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.DriverChargeIsPass=1) as PassConfirmNum,(select count (1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.DriverChargeIsPass=0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.InstallationId from FeedingRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.InspectionIsAllPass=1 and a.ProjectId='{this.CurrUser.LoginProjectId}' and a.DriverCharge='{this.CurrUser.UserId}' "; + //开车经理 + string drivingManagerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.DriverCharge,a.DrivingManager,a.ProjectManager,2 as ConfirmType,'开车经理' as ConfirmName,(select count(1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.DrivingManagerIsPass is null) as WaitConfirmNum,(select count(1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.DrivingManagerIsPass = 1) as PassConfirmNum,(select count(1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.DrivingManagerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.InstallationId from FeedingRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.DrivingManager = '{this.CurrUser.UserId}' "; + //项目经理 + string projectManagerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.DriverCharge,a.DrivingManager,a.ProjectManager,3 as ConfirmType,'项目经理' as ConfirmName,(select count(1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ProjectManagerIsPass is null) as WaitConfirmNum,(select count(1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ProjectManagerIsPass = 1) as PassConfirmNum,(select count(1) from FeedingRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ProjectManagerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.InstallationId from FeedingRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.ProjectManager = '{this.CurrUser.UserId}' "; + + if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + var systemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + driverChargeStr += $"and a.InstallationId='{systemId}'"; + drivingManagerStr += $"and a.InstallationId='{systemId}'"; + projectManagerStr += $"and a.InstallationId='{systemId}'"; + } + var allSql = $"select * from ({driverChargeStr} union all {drivingManagerStr} union all {projectManagerStr}) as t order by t.ConfirmType asc"; + List listStr = new List(); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(allSql); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuConfirmation_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮和事件 + + /// + /// 查询 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 检查确认 + /// + protected void btnConfirmation_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择记录！", MessageBoxIcon.Warning); + return; + } + if (Grid1.SelectedRowIndexArray.Length > 1) + { + Alert.ShowInTop("只可选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectWanderAboutConfirm.aspx?SubInspectId={0}&ConfirmType={1}", Grid1.DataKeys[Grid1.SelectedRowIndex][1].ToString(), Grid1.DataKeys[Grid1.SelectedRowIndex][2].ToString(), "编辑 - "))); + } + + /// + /// 右击检查确认 + /// + protected void btnMenuConfirmation_Click(object sender, EventArgs e) + { + btnConfirmation_Click(null, null); + } + + /// + /// 关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.designer.cs new file mode 100644 index 00000000..ddb935d7 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/InspectWanderAboutList.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class InspectWanderAboutList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnConfirmation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnConfirmation; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuConfirmation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuConfirmation; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx new file mode 100644 index 00000000..21657a76 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx @@ -0,0 +1,44 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectTailTermList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.SelectTailTermList" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.cs new file mode 100644 index 00000000..8142b1c5 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.cs @@ -0,0 +1,89 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class SelectTailTermList : PageBase + { + /// + /// 检查项主键 + /// + public string TermItemId + { + get { return (string)ViewState["TermItemId"]; } + set { ViewState["TermItemId"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TermItemId = Request["TermItemId"]; + DataBrid(); + } + } + + + /// + /// 数据绑定 + /// + public void DataBrid() + { + var list = from a in Funs.DB.FeedingRun_InspectTailTerm + join b in Funs.DB.Base_Unit on a.ConstructionUnit equals b.UnitId + where a.TermItemId == this.TermItemId && a.ApproveState == 0 + orderby a.AddTime + select new + { + a.TailTermId, + a.AddTime, + a.TailTermCode, + ConstructionUnit = b.UnitName, + a.AdjustCompleteTime + }; + Grid1.RecordCount = list.Count(); + Grid1.DataSource = list; + Grid1.DataBind(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + DataBrid(); + } + + #region 确认 + + /// + /// 确认 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(Grid1.SelectedRowID) + ActiveWindow.GetHidePostBackReference()); + } + + #endregion + + /// + /// 表格双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(Grid1.SelectedRowID) + ActiveWindow.GetHidePostBackReference()); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.designer.cs new file mode 100644 index 00000000..18437b4b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SelectTailTermList.aspx.designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class SelectTailTermList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx new file mode 100644 index 00000000..1c62f005 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx @@ -0,0 +1,158 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SubInspectTerm.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.SubInspectTerm" %> + + + + + + 投料试车管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs new file mode 100644 index 00000000..0ea4804e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.cs @@ -0,0 +1,633 @@ +using BLL; +using Model; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class SubInspectTerm : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.InitTreeMenu();//加载树 + PageInit(); + } + } + + + #region 树绑定 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var list = Funs.DB.PreRun_SysDevice.Where(a => a.ProjectId == this.CurrUser.LoginProjectId && a.PreRunLevel == 1); + if (list.Count() > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 点击TreeView + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + + #endregion + + #region 数据绑定 + + /// + /// 绑定下拉框 + /// + public void PageInit() + { + //检查人绑定 + var userList = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); + var users = userList.ToList(); + if (addUserList.Count() > 0) + { + users.AddRange(addUserList); + } + if (users.Count() > 0) + { + ddlDriverCharge.DataTextField = "UserName"; + ddlDriverCharge.DataValueField = "UserId"; + ddlDriverCharge.DataSource = users; + ddlDriverCharge.DataBind(); + + ddlDrivingManager.DataTextField = "UserName"; + ddlDrivingManager.DataValueField = "UserId"; + ddlDrivingManager.DataSource = users; + ddlDrivingManager.DataBind(); + + ddlProjectManager.DataTextField = "UserName"; + ddlProjectManager.DataValueField = "UserId"; + ddlProjectManager.DataSource = users; + ddlProjectManager.DataBind(); + } + } + + /// + /// 绑定数据 + /// + public void BindGrid(List ulist = null) + { + var result = new List(); + if (ulist != null) + { + #region 新增修改检查项 + + var groups = ulist.GroupBy(x => x.GroupName); + int gnum = 1; + foreach (var itemGroup in groups) + { + //添加一级节点 + var firstModel = new FeedingRun_SubInspectTermItemData(); + firstModel.TermItemId = itemGroup.Key; + firstModel.GroupName = itemGroup.Key; + firstModel.Sort = gnum; + firstModel.GroupSort = gnum; + firstModel.Level = 1; + result.Add(firstModel); + gnum++; + + //获取此分组的检查项 + var groupTermItems = ulist.Where(x => x.GroupName == itemGroup.Key); + foreach (var itemTerm in groupTermItems) + { + var model = new FeedingRun_SubInspectTermItemData(); + model.TermItemId = itemTerm.TermItemId; + model.ParentId = itemGroup.Key; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = itemTerm.WorkInspectId; + model.WorkInspectName = itemTerm.WorkInspectName; + model.InspectedUser = itemTerm.InspectedUser; + model.InspectedUser = itemTerm.InspectedUser; + model.InspectionIllustrate = itemTerm.InspectionIllustrate; + model.GroupName = itemTerm.GroupName; + model.Sort = itemTerm.Sort; + model.GroupSort = itemTerm.GroupSort; + model.Level = 2; + result.Add(model); + } + } + + #endregion + } + else + { + var list = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InstallationId == this.tvControlItem.SelectedNodeID).OrderBy(x => x.Sort); + if (list.Count() > 0) + { + var groups = list.GroupBy(x => new { x.GroupName }); + int firstnum = 1; + foreach (var itemGroup in groups) + { + //添加一级节点 + var firstModel = new FeedingRun_SubInspectTermItemData(); + firstModel.TermItemId = itemGroup.Key.GroupName; + firstModel.GroupName = itemGroup.Key.GroupName; + firstModel.Sort = firstnum; + firstModel.GroupSort = firstnum; + firstModel.Level = 1; + result.Add(firstModel); + firstnum++; + //获取此分组的检查项 + var groupTermItems = list.Where(x => x.GroupName == itemGroup.Key.GroupName); + foreach (var itemTerm in groupTermItems) + { + var model = new FeedingRun_SubInspectTermItemData(); + model.TermItemId = itemTerm.TermItemId; + model.ParentId = itemGroup.Key.GroupName; + model.ProjectId = itemTerm.ProjectId; + model.WorkInspectId = itemTerm.WorkInspectId; + model.WorkInspectName = itemTerm.WorkInspectName; + model.InspectedUser = itemTerm.InspectedUser; + model.InspectedUser = itemTerm.InspectedUser; + model.GroupName = itemTerm.GroupName; + model.Sort = itemTerm.Sort.Value; + model.GroupSort = itemTerm.Sort.Value; + model.InspectionIllustrate = itemTerm.InspectionIllustrate; + model.Level = 2; + result.Add(model); + } + } + + var itemModel = list.FirstOrDefault(); + ddlDriverCharge.SelectedValue = itemModel.DriverCharge; + ddlDrivingManager.SelectedValue = itemModel.DrivingManager; + ddlProjectManager.SelectedValue = itemModel.ProjectManager; + } + else + { + ddlDriverCharge.SelectedValue = ""; + ddlDrivingManager.SelectedValue = ""; + ddlProjectManager.SelectedValue = ""; + var defaultDatas = Funs.DB.FeedingRun_WorkInspectTemplate.OrderBy(x => x.Sort); + if (defaultDatas.Count() > 0) + { + var groups = defaultDatas.GroupBy(x => x.GroupName); + int firstnum = 1; + foreach (var itemGroup in groups) + { + //添加一级节点 + var firstModel = new FeedingRun_SubInspectTermItemData(); + firstModel.TermItemId = itemGroup.Key; + firstModel.GroupName = itemGroup.Key; + firstModel.Sort = firstnum; + firstModel.GroupSort = firstnum; + firstModel.Level = 1; + result.Add(firstModel); + firstnum++; + //获取此分组的检查项 + var groupTermItems = defaultDatas.Where(x => x.GroupName == itemGroup.Key); + foreach (var itemTerm in groupTermItems) + { + var model = new FeedingRun_SubInspectTermItemData(); + model.TermItemId = Guid.NewGuid().ToString(); + model.ParentId = itemGroup.Key; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = itemTerm.WorkInspectId; + model.WorkInspectName = itemTerm.WorkInspectName; + model.GroupName = itemTerm.GroupName; + model.Sort = itemTerm.Sort.Value; + model.GroupSort = itemTerm.Sort.Value; + model.Level = 2; + result.Add(model); + } + } + } + } + } + + Grid1.DataSource = result; + Grid1.DataBind(); + //检查人绑定 + var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); + var data = userList.ToList(); + if (addUserList.Count() > 0) + { + data.AddRange(addUserList); + } + DropDownList ddlInspectedUser = Grid1.FindColumn("InspectedUser").FindControl("ddlInspectedUser") as DropDownList; + ddlInspectedUser.DataTextField = "UserName"; + ddlInspectedUser.DataValueField = "UserId"; + ddlInspectedUser.DataSource = data; + ddlInspectedUser.DataBind(); + } + + /// + /// 行按钮事件 + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "Delete") + { + string rowID = e.RowID; + var level = int.Parse(this.Grid1.Rows[e.RowIndex].DataKeys[4].ToString()); + if (level == 1) + { + var groupName = this.Grid1.Rows[e.RowIndex].DataKeys[3].ToString(); + var deletelist = Funs.DB.FeedingRun_SubInspectTermItem.Where(p => p.GroupName == groupName && p.InstallationId == this.tvControlItem.SelectedNodeID); + if (deletelist.Count() > 0) + { + Funs.DB.FeedingRun_SubInspectTermItem.DeleteAllOnSubmit(deletelist); + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("删除成功!"); + } + else + { + + var list = gvList(); + list.RemoveAll(x => x.GroupName == groupName); + Grid1.DataSource = list; + Grid1.DataBind(); + ShowNotify("删除成功!"); + } + } + else + { + var model = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(p => p.TermItemId == rowID); + if (model != null) + { + if (model.InspectionResults != null) + { + ShowNotify("已存在检查结果，无法删除!", MessageBoxIcon.Warning); + return; + } + Funs.DB.FeedingRun_SubInspectTermItem.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("删除成功!"); + } + else + { + var list = gvList(); + list.RemoveAll(x => x.TermItemId == rowID); + Grid1.DataSource = list; + Grid1.DataBind(); + ShowNotify("删除成功!"); + } + } + } + } + + #endregion + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(ddlDriverCharge.SelectedValue)) + { + ShowNotify("请选择装置开车负责人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlDrivingManager.SelectedValue)) + { + ShowNotify("请选择开车经理!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlProjectManager.SelectedValue)) + { + ShowNotify("请选择项目经理!", MessageBoxIcon.Warning); + return; + } + List subTrems = new List(); + List subTremItems = new List(); + var subTrem = Funs.DB.FeedingRun_SubInspectTerm.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InstallationId == this.tvControlItem.SelectedNodeID); + var termItems = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InstallationId == this.tvControlItem.SelectedNodeID).ToList(); + if (termItems.Count > 0 && termItems.Count(x => x.InspectionResults == null) == 0) + { + ShowNotify("所有检查项已存在检查结果，无法保存！", MessageBoxIcon.Warning); + return; + } + int itemnum = 1; + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var workInspectId = IsNullStr(this.Grid1.Rows[i].DataKeys[1]); + var groupName = IsNullStr(this.Grid1.Rows[i].DataKeys[3]); + var level = IsNullStr(this.Grid1.Rows[i].DataKeys[4]); + if (level == "1") continue; + + //获取系统信息 + var list = new List(); + //检查表 + if (subTrem == null) + { + subTrem = new FeedingRun_SubInspectTerm(); + subTrem.SubInspectId = Guid.NewGuid().ToString(); + subTrem.ProjectId = this.CurrUser.LoginProjectId; + subTrem.DriverCharge = ddlDriverCharge.SelectedValue; + subTrem.DrivingManager = ddlDrivingManager.SelectedValue; + subTrem.ProjectManager = ddlProjectManager.SelectedValue; + subTrem.InstallationId = this.tvControlItem.SelectedNodeID; + subTrem.AddUser = this.CurrUser.UserId; + subTrem.AddTime = DateTime.Now; + subTrems.Add(subTrem); + } + else + { + subTrem.DriverCharge = ddlDriverCharge.SelectedValue; + subTrem.DrivingManager = ddlDrivingManager.SelectedValue; + subTrem.ProjectManager = ddlProjectManager.SelectedValue; + Funs.DB.SubmitChanges(); + } + //检查项表 + var model = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId); + if (model == null) + { + model = new FeedingRun_SubInspectTermItem(); + model.TermItemId = termItemId; + model.SubInspectId = subTrem.SubInspectId; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = workInspectId; + model.WorkInspectName = values.Value("WorkInspectName"); + model.InspectedUser = values.Value("InspectedUser"); + model.GroupName = groupName; + model.DriverCharge = ddlDriverCharge.SelectedValue; + model.DrivingManager = ddlDrivingManager.SelectedValue; + model.ProjectManager = ddlProjectManager.SelectedValue; + model.InstallationId = this.tvControlItem.SelectedNodeID; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = itemnum; + subTremItems.Add(model); + itemnum++; + } + else + { + model.GroupName = groupName; + model.InspectedUser = IsNullStr(values.Value("InspectedUser")); + model.WorkInspectName = values.Value("WorkInspectName"); + Funs.DB.SubmitChanges(); + } + } + if (subTrems != null) Funs.DB.FeedingRun_SubInspectTerm.InsertAllOnSubmit(subTrems); + if (subTremItems.Count > 0) Funs.DB.FeedingRun_SubInspectTermItem.InsertAllOnSubmit(subTremItems); + Funs.DB.SubmitChanges(); + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == subTrem.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0) + { + subTrem.InspectionIsAllPass = 1; + } + else + { + subTrem.InspectionIsAllPass = 0; + } + Funs.DB.SubmitChanges(); + ShowNotify("保存成功!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 新增 + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + this.hidRequestNodeID.Text = string.Empty; + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hidRequestNodeID.ClientID) + Window1.GetShowReference($"SubInspectTermEdit.aspx?TermItemId=&WorkInspectId=&InstallationId=" + this.tvControlItem.SelectedNodeID + "", "新增")); + } + + /// + /// 修改 + /// + protected void btnModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择记录！", MessageBoxIcon.Warning); + return; + } + if (Grid1.SelectedRowIndexArray.Length > 1) + { + Alert.ShowInTop("只可选择一条记录！", MessageBoxIcon.Warning); + return; + } + var level = int.Parse(this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[4].ToString()); + if (level == 1) + { + Alert.ShowInTop("一级节点无法修改！", MessageBoxIcon.Warning); + return; + } + var workInspectId = IsNullStr(this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[1]); + var groupName = IsNullStr(this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[3]); + var workInspectName = IsNullStr(this.Grid1.Rows[Grid1.SelectedRowIndex].DataKeys[6]); + this.hidRequestNodeID.Text = string.Empty; + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hidRequestNodeID.ClientID) + Window1.GetShowReference($"SubInspectTermEdit.aspx?TermItemId={Grid1.SelectedRowID}&WorkInspectId={workInspectId}&GroupName={groupName}&WorkInspectName={workInspectName}&InstallationId={this.tvControlItem.SelectedNodeID}", "编辑")); + } + + /// + /// 右击新增 + /// + protected void btnMenuParentAdd_Click(object sender, EventArgs e) + { + btnAdd_Click(sender, e); + } + + /// + /// 右击修改 + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + btnModify_Click(sender, e); + } + + /// + /// 获取集合 + /// + private List gvList() + { + List list = new List(); + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var workInspectId = IsNullStr(this.Grid1.Rows[i].DataKeys[1]); + var subInspectId = IsNullStr(this.Grid1.Rows[i].DataKeys[2]); + var groupName = IsNullStr(this.Grid1.Rows[i].DataKeys[3]); + var level = IsNullStr(this.Grid1.Rows[i].DataKeys[4]); + var parentId = IsNullStr(this.Grid1.Rows[i].DataKeys[5]); + var groupSort = IsNullStr(this.Grid1.Rows[i].DataKeys[7]); + var inspectionResults = IsNullStr(this.Grid1.Rows[i].DataKeys[8]); + var inspectionIllustrate = IsNullStr(this.Grid1.Rows[i].DataKeys[9]); + + + var model = new FeedingRun_SubInspectTermItemData(); + model.TermItemId = termItemId; + model.SubInspectId = subInspectId; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = workInspectId; + model.WorkInspectName = values.Value("WorkInspectName"); + model.InstallationId = this.tvControlItem.SelectedNodeID; + model.GroupName = groupName; + model.GroupSort = !string.IsNullOrWhiteSpace(groupSort) ? int.Parse(groupSort) : 0; + model.Level = !string.IsNullOrWhiteSpace(level) ? int.Parse(level) : 0; + model.ParentId = parentId; + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + if (!string.IsNullOrWhiteSpace(inspectionResults)) + { + model.InspectionResults = int.Parse(inspectionResults); + } + model.InspectionIllustrate = inspectionIllustrate; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i + 1; + list.Add(model); + } + return list; + } + + /// + /// 检测结果 + /// + /// + public string Results(object value) + { + var result = string.Empty; + + if (value != null) + { + var intVal = int.Parse(value.ToString()); + if (intVal == 1) + { + result = "通过"; + } + else if (intVal == 0) + { + result = "未通过"; + } + } + + return result; + } + + /// + /// 数据绑定实体 + /// + public class FeedingRun_SubInspectTermItemData : FeedingRun_SubInspectTermItem + { + /// + /// 上级主键 + /// + public string ParentId { get; set; } + /// + /// 分组排序 + /// + public int GroupSort { get; set; } + /// + /// 级别 + /// + public int Level { get; set; } + } + + /// + /// 关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + if (!string.IsNullOrWhiteSpace(hidRequestNodeID.Text)) + { + var list = gvList(); + string termItemId = hidRequestNodeID.Text.Split('|')[0]; + string workInspectName = hidRequestNodeID.Text.Split('|')[1]; + string groupName = hidRequestNodeID.Text.Split('|')[2]; + string installationId = hidRequestNodeID.Text.Split('|')[3]; + + var model = new FeedingRun_SubInspectTermItemData(); + model.TermItemId = Guid.NewGuid().ToString(); + model.ParentId = groupName; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = string.Empty; + model.WorkInspectName = workInspectName; + model.GroupName = groupName; + model.InstallationId = installationId; + model.Sort = list.Count + 1; + model.Level = 2; + list.Add(model); + list.RemoveAll(x => x.Level == 1); + list = list.OrderBy(x => x.Sort).ToList(); + BindGrid(list); + } + } + + /// + /// 行加载事件 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + var level = int.Parse(this.Grid1.Rows[e.RowIndex].DataKeys[4].ToString()); + RenderField InspectedUser = Grid1.FindColumn("InspectedUser") as RenderField; + if (level == 1) + { + e.CellAttributes[InspectedUser.ColumnIndex]["data-color"] = "color"; + } + } + + /// + /// 字符串处理 + /// + /// + private string IsNullStr(object value) + { + var result = string.Empty; + if (value == null) return result; + return value.ToString(); + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.designer.cs new file mode 100644 index 00000000..23915556 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTerm.aspx.designer.cs @@ -0,0 +1,224 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class SubInspectTerm + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// btnModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnModify; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hidRequestNodeID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hidRequestNodeID; + + /// + /// txtWorkInspectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkInspectName; + + /// + /// ddlInspectedUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlInspectedUser; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// ddlDriverCharge 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlDriverCharge; + + /// + /// ddlDrivingManager 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlDrivingManager; + + /// + /// ddlProjectManager 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProjectManager; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuParentAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuParentAdd; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx new file mode 100644 index 00000000..2d4c74d8 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx @@ -0,0 +1,65 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SubInspectTermEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.SubInspectTermEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.cs new file mode 100644 index 00000000..b242ff95 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.cs @@ -0,0 +1,91 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class SubInspectTermEdit : PageBase + { + /// + /// 主键 + /// + public string TermItemId + { + get { return (string)ViewState["TermItemId"]; } + set { ViewState["TermItemId"] = value; } + } + + /// + /// 分组主键 + /// + public string GroupName + { + get { return (string)ViewState["GroupName"]; } + set { ViewState["GroupName"] = value; } + } + + /// + /// 检查项名称 + /// + public string WorkInspectName + { + get { return (string)ViewState["WorkInspectName"]; } + set { ViewState["WorkInspectName"] = value; } + } + + /// + /// 装置主键 + /// + public string InstallationId + { + get { return (string)ViewState["InstallationId"]; } + set { ViewState["InstallationId"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TermItemId = Request.Params["TermItemId"]; + this.GroupName = Request.Params["GroupName"]; + this.WorkInspectName = Request.Params["WorkInspectName"]; + this.InstallationId = Request.Params["InstallationId"]; + PageInit(); + } + } + + /// + /// 默认绑定 + /// + public void PageInit() + { + if (!string.IsNullOrWhiteSpace(this.TermItemId)) + { + txtWorkInspectName.Text = this.WorkInspectName; + ddlGroup.SelectedValue = this.GroupName; + } + } + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + string groupName = this.ddlGroup.SelectedValue; + var requestStr = this.TermItemId + "|" + this.txtWorkInspectName.Text + "|" + groupName + "|" + this.InstallationId; + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(requestStr) + ActiveWindow.GetHidePostBackReference()); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.designer.cs new file mode 100644 index 00000000..584294fe --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubInspectTermEdit.aspx.designer.cs @@ -0,0 +1,125 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class SubInspectTermEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtWorkInspectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtWorkInspectName; + + /// + /// ddlGroup 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlGroup; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx new file mode 100644 index 00000000..23090807 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx @@ -0,0 +1,121 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SubWorkInspect.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.SubWorkInspect" %> + + + + + + 投料试车工作包检查 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs new file mode 100644 index 00000000..84f4156b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.cs @@ -0,0 +1,439 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class SubWorkInspect : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.InitTreeMenu();//加载树 + } + } + + #region 树绑定 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId).ToList(); + if (userSubInspects.Count == 0) return; + var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 点击TreeView + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + + #endregion + + #region 数据绑定 + + /// + /// 绑定数据 + /// + public void BindGrid(bool istail = false) + { + + var subInstallationId = this.tvControlItem.SelectedNodeID; + //获取子系统 + var data = from termitem in Funs.DB.FeedingRun_SubInspectTermItem + join b in Funs.DB.FeedingRun_InspectTailTerm on termitem.TermItemId equals b.TermItemId into t + from tail in t.DefaultIfEmpty() + where termitem.InstallationId == subInstallationId + && termitem.InspectedUser == this.CurrUser.UserId + group termitem by new { termitem.TermItemId, termitem.SubInspectId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName, termitem.InstallationId, termitem.InspectedUser, termitem.InspectionResults, termitem.InspectionIllustrate, termitem.DriverCharge, termitem.DrivingManager, termitem.ProjectManager, termitem.DriverChargeIsPass, termitem.DrivingManagerIsPass, termitem.ProjectManagerIsPass, termitem.DriverChargeRemark, termitem.DrivingManagerRemark, termitem.ProjectManagerRemark, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 } into gt + orderby gt.Key.Sort + select new TermItemBridDto() + { + TermItemId = gt.Key.TermItemId, + SubInspectId = gt.Key.SubInspectId, + ProjectId = gt.Key.ProjectId, + WorkInspectId = gt.Key.WorkInspectId, + WorkInspectName = gt.Key.WorkInspectName, + InstallationId = gt.Key.InstallationId, + InspectedUser = gt.Key.InspectedUser, + InspectionResults = gt.Key.InspectionResults, + InspectionIllustrate = gt.Key.InspectionIllustrate, + DriverCharge = gt.Key.DriverCharge, + DrivingManager = gt.Key.DrivingManager, + ProjectManager = gt.Key.ProjectManager, + DriverChargeIsPass = gt.Key.DriverChargeIsPass, + DrivingManagerIsPass = gt.Key.DrivingManagerIsPass, + ProjectManagerIsPass = gt.Key.ProjectManagerIsPass, + DriverChargeRemark = gt.Key.DriverChargeRemark, + DrivingManagerRemark = gt.Key.DrivingManagerRemark, + ProjectManagerRemark = gt.Key.ProjectManagerRemark, + Remark = gt.Key.Remark, + AddUser = gt.Key.AddUser, + AddTime = gt.Key.AddTime, + Sort = gt.Key.Sort, + IsTailTerm = gt.Key.IsTailTerm + }; + var list = data.ToList(); + if (istail) + { + JArray mergedData = Grid1.GetMergedData(); + list.ForEach(a => + { + var itemRow = mergedData.FirstOrDefault(x => x.Value("id") == a.TermItemId); + JObject values = itemRow.Value("values"); + var inspectionResults = !string.IsNullOrWhiteSpace(values.Value("InspectionResults")) ? values.Value("InspectionResults") : string.Empty; + if (!string.IsNullOrWhiteSpace(inspectionResults)) + { + a.InspectionResults = int.Parse(inspectionResults); + } + }); + } + Grid1.DataSource = list; + Grid1.DataBind(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + #endregion + + #region 保存 + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + var subInspectId = this.Grid1.Rows[0].DataKeys[2].ToString(); + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && (x.DriverChargeIsPass != null || x.DrivingManagerIsPass != null || x.ProjectManagerIsPass != null)) > 0) + { + ShowNotify("已进入检查表流转，无法修改检查结果!", MessageBoxIcon.Warning); + return; + } + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + if (values.Value("InspectionResults") == "0") + { + if (Funs.DB.FeedingRun_InspectTailTerm.Count(x => x.TermItemId == termItemId) == 0) + { + ShowNotify("未通过的检查项请填写尾项!", MessageBoxIcon.Warning); + return; + } + } + } + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + //获取子系统信息 + var model = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId); + if (model != null) + { + model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value("InspectionIllustrate")) ? values.Value("InspectionIllustrate") : string.Empty; + if (!string.IsNullOrWhiteSpace(values.Value("InspectionResults"))) + { + model.InspectionResults = int.Parse(values.Value("InspectionResults")); + } + Funs.DB.SubmitChanges(); + } + } + var subModel = Funs.DB.FeedingRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId); + if (subModel != null) + { + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0) + { + subModel.InspectionIsAllPass = 1; + } + else + { + subModel.InspectionIsAllPass = 0; + } + } + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("保存成功!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + #endregion + + /// + /// 尾项数据绑定实体 + /// + public class TermItemBridDto + { + /// + /// 主键 + /// + public string TermItemId { get; set; } + /// + /// 检查项主键 + /// + public string SubItemId { get; set; } + /// + /// 检查表主键 + /// + public string SubInspectId { get; set; } + /// + /// 工作包主键 + /// + public string WorkPackId { get; set; } + /// + /// 项目主键 + /// + public string ProjectId { get; set; } + /// + /// 工作包模板项主键 + /// + public string WorkInspectId { get; set; } + /// + /// 检查事项名称 + /// + public string WorkInspectName { get; set; } + /// + /// 装置主键 + /// + public string InstallationId { get; set; } + /// + /// 工序主键 + /// + public string ProcessesId { get; set; } + /// + /// 系统主键 + /// + public string SystemId { get; set; } + /// + /// 子系统主键 + /// + public string SubSystemId { get; set; } + /// + /// 检查人主键 + /// + public string InspectedUser { get; set; } + /// + /// 检查结果0:未通过 1:通过 + /// + public int? InspectionResults { get; set; } + /// + /// 检查说明 + /// + public string InspectionIllustrate { get; set; } + /// + /// 装置开车负责人 + /// + public string DriverCharge { get; set; } + /// + /// 开车经理 + /// + public string DrivingManager { get; set; } + /// + /// 项目经理 + /// + public string ProjectManager { get; set; } + /// + /// 装置开车负责人是否通过0/null:未通过 1:通过 + /// + public int? DriverChargeIsPass { get; set; } + /// + /// 开车经理是否通过0/null:未通过 1:通过 + /// + public int? DrivingManagerIsPass { get; set; } + /// + /// 项目经理是否通过0/null:未通过 1:通过 + /// + public int? ProjectManagerIsPass { get; set; } + /// + /// 装置开车负责人备注 + /// + public string DriverChargeRemark { get; set; } + /// + /// 开车经理备注 + /// + public string DrivingManagerRemark { get; set; } + /// + /// 项目经理备注 + /// + public string ProjectManagerRemark { get; set; } + /// + /// 备注 + /// + public string Remark { get; set; } + /// + /// 添加人 + /// + public string AddUser { get; set; } + /// + /// 添加日期 + /// + public DateTime? AddTime { get; set; } + /// + /// 排序 + /// + public int? Sort { get; set; } + /// + /// 是否存在尾项0:不存在1:存在 + /// + public int IsTailTerm { get; set; } + } + + /// + /// 行内按钮事件 + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + //尾项申请 + if (e.CommandName == "TailTerm") + { + var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var inspectionResults = Grid1.DataKeys[e.RowIndex][1] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()) : -1; + if (inspectionResults == 0) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - "))); + } + else + { + JArray mergedData = Grid1.GetMergedData(); + var itemRow = mergedData[e.RowIndex].Value("values"); + if (itemRow.Value("InspectionResults") == "0") + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - "))); + } + else + { + ShowNotify("仅未通过检查项才可填写！", MessageBoxIcon.Warning); + } + } + } + //尾项修改 + if (e.CommandName == "TailTermUpdate") + { + var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var inspectionResults = Grid1.DataKeys[e.RowIndex][1] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()) : -1; + if (inspectionResults == 0) + { + var tails = Funs.DB.FeedingRun_InspectTailTerm.Where(x => x.TermItemId == termItemId).ToList(); + if (tails.Count > 0) + { + if (tails.Count(x => x.ApproveState == 0) == 0) + { + ShowNotify("申请的尾项非“待提交处理”状态，无法修改！", MessageBoxIcon.Warning); + return; + } + if (tails.Count(x => x.ApproveState == 0) > 1) + { + string window = $"SelectTailTermList.aspx?TermItemId={termItemId}"; + PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidTailTermId.ClientID) + Window2.GetShowReference(window)); + } + else + { + var tailModel = tails.FirstOrDefault(); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "编辑 - "))); + } + } + else + { + ShowNotify("请填写尾项申请！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("请填写尾项申请！", MessageBoxIcon.Warning); + } + } + } + + /// + /// 窗口关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(true); + } + + /// + /// 行绑定 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + var isTailTerm = Grid1.DataKeys[e.RowIndex][3].ToString(); + LinkButtonField TailTermUpdate = Grid1.FindColumn("TailTermUpdate") as LinkButtonField; + if (isTailTerm == "0") + { + e.CellCssClasses[TailTermUpdate.ColumnIndex] = "hidethis"; + } + } + + /// + /// 尾项选择关闭 + /// + /// + /// + protected void Window2_Close(object sender, WindowCloseEventArgs e) + { + if (!string.IsNullOrWhiteSpace(hidTailTermId.Text)) + { + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == hidTailTermId.Text); + if (model != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", hidTailTermId.Text, model.TermItemId, "编辑 - "))); + } + } + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.designer.cs new file mode 100644 index 00000000..64304440 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/SubWorkInspect.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class SubWorkInspect + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hidTailTermId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hidTailTermId; + + /// + /// txtInspectionIllustrate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtInspectionIllustrate; + + /// + /// ddlInspectionResults 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlInspectionResults; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx new file mode 100644 index 00000000..42ff246d --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx @@ -0,0 +1,153 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApprove.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.TailTermApprove" %> + + + + + + 质量巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.cs new file mode 100644 index 00000000..71e09b12 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.cs @@ -0,0 +1,233 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class TailTermApprove : PageBase + { + /// + /// 主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.QuestionEditImg = -1; + this.RectifyEditImg = -1; + //数据绑定 + PageInit(); + //处理意见绑定 + gvHandleBrid(); + } + } + + + /// + /// 绑定数据 + /// + public void PageInit() + { + var data = from tail in Funs.DB.FeedingRun_InspectTailTerm + join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId + join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId + join approuser in Funs.DB.Sys_User on tail.ApproveUser equals approuser.UserId + join termitem in Funs.DB.FeedingRun_SubInspectTermItem on tail.TermItemId equals termitem.TermItemId + where tail.TailTermId == this.TailTermId + select new + { + tail.ProjectName, + tail.TailTermCode, + unit.UnitName, + TermItemName = termitem.WorkInspectName, + tail.SubInspectId, + tail.QuestionDesc, + tail.RectifyOpinion, + tail.RectifyTime, + tail.InspectUser, + InspectUserName = inspuser.UserName, + tail.ApproveUser, + ApproveUserName = approuser.UserName, + tail.AdjustCompleteTime + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //项目名称 + lblProjectName.Text = model.ProjectName; + //巡检编号 + lblTailTermCode.Text = model.TailTermCode; + //施工单位 + lblConstructionUnit.Text = model.UnitName; + //检查项 + lblTermItemName.Text = model.TermItemName; + //问题描述 + lblQuestionDesc.Text = model.QuestionDesc; + //整改意见 + lblRectifyOpinion.Text = model.RectifyOpinion; + //要求整改完成时间 + lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //检查人 + lblInspectUser.Text = model.InspectUserName; + //审核人 + lblApproveUser.Text = model.ApproveUserName; + hidApproveUserId.Text = model.ApproveUser; + //审核时间 + lblApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); + } + } + + /// + /// 处理意见绑定 + /// + public void gvHandleBrid() + { + string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveState when 0 then '处理退回' when 1 then '处理完成' else '' end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from FeedingRun_InspectTermApproveRecords as a inner join FeedingRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join FeedingRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ApproveType=0 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@TailTermId", this.TailTermId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + gvHandle.DataSource = tb; + gvHandle.DataBind(); + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + /// + /// 退回 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 3; + var model = new FeedingRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:处理记录1:审核记录 + model.ApproveType = 1; + //0:退回1:通过 + model.ApproveState = 0; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.FeedingRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("退回成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 通过 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + //获取审核项 + if (Funs.DB.FeedingRun_InspectTailTerm.Count(x => x.TermItemId == tailTerm.TermItemId && x.ApproveState != 5 && x.TailTermId != this.TailTermId) == 0) + { + var termItemModel = Funs.DB.FeedingRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == tailTerm.TermItemId); + if (termItemModel != null) + { + termItemModel.InspectionResults = 1; + var subModel = Funs.DB.FeedingRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == termItemModel.SubInspectId); + if (subModel != null) + { + if (Funs.DB.FeedingRun_SubInspectTermItem.Count(x => x.SubInspectId == termItemModel.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1 && x.TermItemId != termItemModel.TermItemId) == 0) + { + subModel.InspectionIsAllPass = 1; + } + else + { + subModel.InspectionIsAllPass = 0; + } + } + } + } + tailTerm.ApproveState = 5; + var model = new FeedingRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:处理记录1:审核记录 + model.ApproveType = 1; + //0:退回1:通过 + model.ApproveState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.FeedingRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("审核成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.designer.cs new file mode 100644 index 00000000..39f4186e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApprove.aspx.designer.cs @@ -0,0 +1,278 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class TailTermApprove + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTailTermCode; + + /// + /// lblConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblConstructionUnit; + + /// + /// lblTermItemName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTermItemName; + + /// + /// lblQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyOpinion; + + /// + /// lblInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblAdjustCompleteTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAdjustCompleteTime; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvHandle 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvHandle; + + /// + /// lblApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblApproveUser; + + /// + /// hidApproveUserId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hidApproveUserId; + + /// + /// lblApproveTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblApproveTime; + + /// + /// txtApproveOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtApproveOpinion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx new file mode 100644 index 00000000..5ec8a172 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx @@ -0,0 +1,146 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApproveList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.TailTermApproveList" %> + + + + + + + + + 质量巡检审核 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs new file mode 100644 index 00000000..f6f6d357 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.cs @@ -0,0 +1,202 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class TailTermApproveList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //绑定数据 + InitTreeMenu(); + } + } + + + #region 树绑定 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var termIds = new List(); + var tailTerms = Funs.DB.FeedingRun_InspectTailTerm.Where(x => x.ApproveUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (tailTerms.Count > 0) + { + termIds = tailTerms.ConvertAll(x => x.TermItemId); + } + var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId) && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (userSubInspects.Count() == 0) return; + var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + var ids = list.Select(x => x.ProcessesId).ToList(); + ids.AddRange(list.Select(x => x.PreRunId).ToList()); + ids = ids.Distinct().ToList(); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => ids.Contains(x.PreRunId)).ToList(); + if (syslist.Count > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + } + + /// + /// 点击TreeView + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + + #endregion + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交处理' when 1 then '待处理' when 2 then '处理退回' when 3 then '审核退回' when 4 then '待审核' when 5 then '审核通过' else '' end) as ApproveStateName,a.AddTime,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from FeedingRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join FeedingRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where 1=1 and a.ProjectId=@projectid and a.ApproveUser=@ApproveUser and a.ApproveState>=3"; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@ApproveUser", this.CurrUser.UserId)); + if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + strSql += " and c.InstallationId=@InstallationId"; + listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and a.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮和操作 + + /// + /// 关闭弹框 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 审核 + /// + protected void btnReview_Click(object sender, EventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 审核 + /// + protected void btnMenuApprove_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 4) + { + Alert.ShowInTop("只可审核“待审核”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TailTermApprove.aspx?TailTermId={0}", Grid1.SelectedRowID, "审核 - "))); + } + + /// + /// 搜索 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.designer.cs new file mode 100644 index 00000000..36d72642 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermApproveList.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class TailTermApproveList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReview; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuApprove; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx new file mode 100644 index 00000000..fdc95b00 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx @@ -0,0 +1,131 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermHandle.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.TailTermHandle" %> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.cs new file mode 100644 index 00000000..837d88bb --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.cs @@ -0,0 +1,192 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class TailTermHandle : PageBase + { + /// + /// 主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.QuestionEditImg = -1; + this.RectifyEditImg = 0; + //数据绑定 + PageInit(); + } + } + + /// + /// 绑定数据 + /// + public void PageInit() + { + var data = from tail in Funs.DB.FeedingRun_InspectTailTerm + join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId + join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId + join handleuser in Funs.DB.Sys_User on tail.HandleUser equals handleuser.UserId + join termitem in Funs.DB.FeedingRun_SubInspectTermItem on tail.TermItemId equals termitem.TermItemId + where tail.TailTermId == this.TailTermId + select new + { + tail.ProjectName, + tail.TailTermCode, + unit.UnitName, + TermItemName = termitem.WorkInspectName, + tail.SubInspectId, + tail.QuestionDesc, + tail.RectifyOpinion, + tail.RectifyTime, + tail.InspectUser, + InspectUserName = inspuser.UserName, + tail.HandleUser, + HandleUserName = handleuser.UserName, + tail.AdjustCompleteTime + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //项目名称 + lblProjectName.Text = model.ProjectName; + //巡检编号 + lblTailTermCode.Text = model.TailTermCode; + //施工单位 + lblConstructionUnit.Text = model.UnitName; + //检查项 + lblTermItemName.Text = model.TermItemName; + //问题描述 + lblQuestionDesc.Text = model.QuestionDesc; + //整改意见 + lblRectifyOpinion.Text = model.RectifyOpinion; + //要求整改完成时间 + lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //检查人 + lblInspectUser.Text = model.InspectUserName; + //处理人 + lblApproveUser.Text = model.HandleUserName; + hidApproveUserId.Text = model.HandleUser; + //处理时间 + lblApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); + } + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + /// + /// 处理退回 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 2; + var model = new FeedingRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:处理记录1:审核记录 + model.ApproveType = 0; + //0:退回1:通过 + model.ApproveState = 0; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.FeedingRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("退回成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 处理通过并提交审核 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 4; + var model = new FeedingRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:处理记录1:审核记录 + model.ApproveType = 0; + //0:退回1:通过 + model.ApproveState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.FeedingRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("处理成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.designer.cs new file mode 100644 index 00000000..064b967d --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandle.aspx.designer.cs @@ -0,0 +1,260 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class TailTermHandle + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTailTermCode; + + /// + /// lblConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblConstructionUnit; + + /// + /// lblTermItemName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTermItemName; + + /// + /// lblQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyOpinion; + + /// + /// lblInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblAdjustCompleteTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAdjustCompleteTime; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// lblApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblApproveUser; + + /// + /// hidApproveUserId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hidApproveUserId; + + /// + /// lblApproveTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblApproveTime; + + /// + /// txtApproveOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtApproveOpinion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx new file mode 100644 index 00000000..e6667478 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx @@ -0,0 +1,147 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermHandleList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Feeding.TailTermHandleList" %> + + + + + + + + + 质量巡检处理确认 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs new file mode 100644 index 00000000..e4f65791 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.cs @@ -0,0 +1,196 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Feeding +{ + public partial class TailTermHandleList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //绑定数据 + InitTreeMenu(); + } + } + + #region 树绑定 + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "检查表"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var termIds = new List(); + var tailTerms = Funs.DB.FeedingRun_InspectTailTerm.Where(x => x.HandleUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (tailTerms.Count > 0) + { + termIds = tailTerms.ConvertAll(x => x.TermItemId); + } + var userSubInspects = Funs.DB.FeedingRun_SubInspectTermItem.Where(x => termIds.Contains(x.TermItemId) && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (userSubInspects.Count == 0) return; + var subInstallationIds = userSubInspects.ConvertAll(x => x.InstallationId); + var list = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel == 1 && subInstallationIds.Contains(x.PreRunId)); + if (list.Count() > 0) + { + foreach (var item in list) + { + TreeNode rootOneNode = new TreeNode(); + rootOneNode.NodeID = item.PreRunId; + rootOneNode.Text = item.PreRunName; + rootOneNode.ToolTip = item.PreRunName; + rootOneNode.CommandName = ""; + rootOneNode.EnableClickEvent = true; + rootOneNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootOneNode); + rootOneNode.Expanded = true; + } + } + } + + /// + /// 点击TreeView + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + + #endregion + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交处理' when 1 then '待处理' when 2 then '处理退回' when 3 then '审核退回' when 4 then '待审核' when 5 then '审核通过' else '' end) as ApproveStateName,a.AddTime,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from FeedingRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join FeedingRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where 1=1 and a.ProjectId=@projectid and a.HandleUser=@HandleUser and a.ApproveState>=1"; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@HandleUser", this.CurrUser.UserId)); + if (!string.IsNullOrWhiteSpace(this.tvControlItem.SelectedNodeID)) + { + strSql += " and c.InstallationId=@InstallationId"; + listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and a.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮 + + /// + /// 关闭弹框 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 处理 + /// + protected void btnReview_Click(object sender, EventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 处理 + /// + protected void btnMenuApprove_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + var passLs = new List() { 1, 3 }; + var model = Funs.DB.FeedingRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (!passLs.Contains(model.ApproveState.Value)) + { + Alert.ShowInTop("只可处理“待处理”和“审核退回”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TailTermHandle.aspx?TailTermId={0}", Grid1.SelectedRowID, "审核 - "))); + } + + /// + /// 搜索 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.designer.cs new file mode 100644 index 00000000..f52c9e0b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Feeding/TailTermHandleList.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Feeding +{ + + + public partial class TailTermHandleList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReview; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuApprove; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx b/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx index b4646745..bc4b880b 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx +++ b/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx @@ -67,6 +67,8 @@ + + diff --git a/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx.cs index b72210c2..ed10f8d7 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Report/PreRunSchedule.aspx.cs @@ -180,6 +180,7 @@ namespace FineUIPro.Web.TestRun.Report GridPreRun.DataBind(); JObject summary = new JObject(); summary.Add("WorkPackNum", result.Sum(x => x.WorkPackNum)); + summary.Add("WorkPackNotStartedNum", result.Sum(x => x.WorkPackNotStartedNum)); summary.Add("WorkPackNoCloseNum", result.Sum(x => x.WorkPackNoCloseNum)); summary.Add("WorkPackCloseNum", result.Sum(x => x.WorkPackCloseNum)); summary.Add("InspectNum", result.Sum(x => x.InspectNum)); @@ -222,6 +223,7 @@ namespace FineUIPro.Web.TestRun.Report ws.SetColumnWidth(8, (20 * 256)); ws.SetColumnWidth(9, (20 * 256)); ws.SetColumnWidth(10, (20 * 256)); + ws.SetColumnWidth(11, (20 * 256)); #endregion @@ -235,7 +237,7 @@ namespace FineUIPro.Web.TestRun.Report #region 头部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 10); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 11); //行1 ws.GetRow(0).GetCell(0).CellStyle = styleBold; ws.GetRow(0).GetCell(0).SetCellValue("工作包名称"); @@ -250,15 +252,17 @@ namespace FineUIPro.Web.TestRun.Report ws.GetRow(0).GetCell(5).CellStyle = styleBold; ws.GetRow(0).GetCell(5).SetCellValue("工作包数量"); ws.GetRow(0).GetCell(6).CellStyle = styleBold; - ws.GetRow(0).GetCell(6).SetCellValue("工作包未关闭数量"); + ws.GetRow(0).GetCell(6).SetCellValue("工作包未开始数量"); ws.GetRow(0).GetCell(7).CellStyle = styleBold; - ws.GetRow(0).GetCell(7).SetCellValue("工作包已关闭数量"); + ws.GetRow(0).GetCell(7).SetCellValue("工作包未关闭数量"); ws.GetRow(0).GetCell(8).CellStyle = styleBold; - ws.GetRow(0).GetCell(8).SetCellValue("检查表数量"); + ws.GetRow(0).GetCell(8).SetCellValue("工作包已关闭数量"); ws.GetRow(0).GetCell(9).CellStyle = styleBold; - ws.GetRow(0).GetCell(9).SetCellValue("检查表未关闭数量"); + ws.GetRow(0).GetCell(9).SetCellValue("检查表数量"); ws.GetRow(0).GetCell(10).CellStyle = styleBold; - ws.GetRow(0).GetCell(10).SetCellValue("检查表已关闭数量"); + ws.GetRow(0).GetCell(10).SetCellValue("检查表未关闭数量"); + ws.GetRow(0).GetCell(11).CellStyle = styleBold; + ws.GetRow(0).GetCell(11).SetCellValue("检查表已关闭数量"); #endregion @@ -266,7 +270,7 @@ namespace FineUIPro.Web.TestRun.Report var start = 1; var end = result.Count; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 10); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 11); //数据 var dataIndex = 1; @@ -278,11 +282,12 @@ namespace FineUIPro.Web.TestRun.Report ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.SystemName); ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.SubsystemName); ws.GetRow(dataIndex).GetCell(5).SetCellValue(item.WorkPackNum); - ws.GetRow(dataIndex).GetCell(6).SetCellValue(item.WorkPackNoCloseNum); - ws.GetRow(dataIndex).GetCell(7).SetCellValue(item.WorkPackCloseNum); - ws.GetRow(dataIndex).GetCell(8).SetCellValue(item.InspectNum); - ws.GetRow(dataIndex).GetCell(9).SetCellValue(item.InspectNoCloseNum); - ws.GetRow(dataIndex).GetCell(10).SetCellValue(item.InspectCloseNum); + ws.GetRow(dataIndex).GetCell(6).SetCellValue(item.WorkPackNotStartedNum); + ws.GetRow(dataIndex).GetCell(7).SetCellValue(item.WorkPackNoCloseNum); + ws.GetRow(dataIndex).GetCell(8).SetCellValue(item.WorkPackCloseNum); + ws.GetRow(dataIndex).GetCell(9).SetCellValue(item.InspectNum); + ws.GetRow(dataIndex).GetCell(10).SetCellValue(item.InspectNoCloseNum); + ws.GetRow(dataIndex).GetCell(11).SetCellValue(item.InspectCloseNum); dataIndex++; } @@ -290,16 +295,17 @@ namespace FineUIPro.Web.TestRun.Report #region 尾部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 10); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 11); var region = new CellRangeAddress(end + 1, end + 1, 0, 4); ws.AddMergedRegion(region); ws.GetRow(end + 1).GetCell(0).SetCellValue("合计"); ws.GetRow(end + 1).GetCell(5).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(6).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNoCloseNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(7).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackCloseNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(8).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(9).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNoCloseNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(10).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(6).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNotStartedNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(7).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNoCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(8).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(9).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(10).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNoCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(11).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectCloseNum).ToString() : "0"); #endregion @@ -438,6 +444,7 @@ namespace FineUIPro.Web.TestRun.Report } model.WorkPackCloseNum = 0; model.WorkPackNoCloseNum = 0; + model.WorkPackNotStartedNum = 0; var subsystemids = itemQueryList.ConvertAll(a => a.SubSystemId).Distinct(); foreach (var itemsubid in subsystemids) { @@ -465,7 +472,7 @@ namespace FineUIPro.Web.TestRun.Report } else { - model.WorkPackNoCloseNum += 1; + model.WorkPackNotStartedNum += 1; } } list.Add(model); @@ -512,11 +519,11 @@ namespace FineUIPro.Web.TestRun.Report ///
public string AllNum { get; set; } /// - /// 未关闭任务单数量 + /// 未关闭数量 /// public string NoCloseNum { get; set; } /// - /// 已关闭任务单数量 + /// 已关闭数量 /// public string CloseNum { get; set; } } @@ -579,6 +586,10 @@ namespace FineUIPro.Web.TestRun.Report /// public int WorkPackNoCloseNum { get; set; } /// + /// 工作包未开始数量 + /// + public int WorkPackNotStartedNum { get; set; } + /// /// 工作包已关闭数量 /// public int WorkPackCloseNum { get; set; } diff --git a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx index a44b708e..a09e302f 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx +++ b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx @@ -58,6 +58,11 @@ + + + + + @@ -99,6 +104,11 @@ + + + + + @@ -188,12 +198,13 @@ $.each(modifiedData, function (index, rowData) { var allNum = parseInt(rowData.values['AllNum']); + var notStartedNum = parseInt(rowData.values['NotStartedNum']); var progressNum = parseInt(rowData.values['ProgressNum']); var completeNum = parseInt(rowData.values['CompleteNum']); var workPackName = rowData.values['WorkPackName']; - if (allNum != (progressNum + completeNum)) { + if (allNum != (notStartedNum + progressNum + completeNum)) { F.alert({ - message: '工作包(' + workPackName + ')全部数量不等于进行中数量加已完成数量！', + message: '工作包(' + workPackName + ')全部数量不等于未开始数量+进行中数量+已完成数量！', ok: function () { grid1.startEdit(rowData.id, 'AllNum'); } @@ -210,16 +221,19 @@ function onGridYscAfterEdit(event, value, params) { var me = F('<%= GridYsc.ClientID %>'); var allNumTotal = 0; + var notStartedNumTotal = 0; var progressNumTotal = 0; var completeNumTotal = 0; me.getRowEls().each(function (index, tr) { debugger; allNumTotal += me.getCellValue(tr, 'AllNum'); + notStartedNumTotal += me.getCellValue(tr, 'NotStartedNum'); progressNumTotal += me.getCellValue(tr, 'ProgressNum'); completeNumTotal += me.getCellValue(tr, 'CompleteNum'); }); // 第三个参数 true，强制更新，不显示左上角的更改标识 me.updateSummaryCellValue('AllNum', allNumTotal, true); + me.updateSummaryCellValue('NotStartedNum', notStartedNum, true); me.updateSummaryCellValue('ProgressNum', progressNumTotal, true); me.updateSummaryCellValue('CompleteNum', completeNumTotal, true); } @@ -231,12 +245,13 @@ $.each(modifiedData, function (index, rowData) { var allNum = parseInt(rowData.values['AllNum']); + var notStartedNum = parseInt(rowData.values['NotStartedNum']); var progressNum = parseInt(rowData.values['ProgressNum']); var completeNum = parseInt(rowData.values['CompleteNum']); var workPackName = rowData.values['WorkPackName']; - if (allNum != (progressNum + completeNum)) { + if (allNum != (notStartedNum + progressNum + completeNum)) { F.alert({ - message: '工作包(' + workPackName + ')全部数量不等于进行中数量加已完成数量！', + message: '工作包(' + workPackName + ')全部数量不等于未开始数量+进行中数量+已完成数量！', ok: function () { grid1.startEdit(rowData.id, 'AllNum'); } @@ -257,13 +272,14 @@ var progressNumTotal = 0; var completeNumTotal = 0; me.getRowEls().each(function (index, tr) { - debugger; allNumTotal += me.getCellValue(tr, 'AllNum'); + notStartedNumTotal += me.getCellValue(tr, 'NotStartedNum'); progressNumTotal += me.getCellValue(tr, 'ProgressNum'); completeNumTotal += me.getCellValue(tr, 'CompleteNum'); }); // 第三个参数 true，强制更新，不显示左上角的更改标识 me.updateSummaryCellValue('AllNum', allNumTotal, true); + me.updateSummaryCellValue('NotStartedNum', notStartedNumTotal, true); me.updateSummaryCellValue('ProgressNum', progressNumTotal, true); me.updateSummaryCellValue('CompleteNum', completeNumTotal, true); } diff --git a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs index a00e51b6..0ddb1ea1 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.cs @@ -48,6 +48,7 @@ namespace FineUIPro.Web.TestRun.Report GridYsc.DataBind(); JObject summary = new JObject(); summary.Add("AllNum", result.Sum(x => x.AllNum)); + summary.Add("NotStartedNum", result.Sum(x => x.NotStartedNum)); summary.Add("ProgressNum", result.Sum(x => x.ProgressNum)); summary.Add("CompleteNum", result.Sum(x => x.CompleteNum)); GridYsc.SummaryData = summary; @@ -75,6 +76,7 @@ namespace FineUIPro.Web.TestRun.Report ProjectId = a.ProjectId, States = a.States, AllNum = a.AllNum, + NotStartedNum = a.NotStartedNum, ProgressNum = a.ProgressNum, CompleteNum = a.CompleteNum, CompleteRate = a.CompleteRate, @@ -121,6 +123,7 @@ namespace FineUIPro.Web.TestRun.Report model.AllNum = itemQueryList.Count(x => x.WorkPackId == itemPack.WorkPackId); model.ProgressNum = 0; model.CompleteNum = 0; + model.NotStartedNum = 0; var subsystemids = itemQueryList.ConvertAll(a => a.SubSystemId).Distinct(); foreach (var itemsubid in subsystemids) { @@ -148,7 +151,7 @@ namespace FineUIPro.Web.TestRun.Report } else { - model.ProgressNum += 1; + model.NotStartedNum += 1; } } var rate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum * 100, 2, MidpointRounding.AwayFromZero) : 0; @@ -204,6 +207,7 @@ namespace FineUIPro.Web.TestRun.Report model.ProjectId = this.CurrUser.LoginProjectId; model.States = 1; model.AllNum = !string.IsNullOrWhiteSpace(values.Value("AllNum")) ? int.Parse(values.Value("AllNum")) : 0; + model.NotStartedNum = !string.IsNullOrWhiteSpace(values.Value("NotStartedNum")) ? int.Parse(values.Value("NotStartedNum")) : 0; model.ProgressNum = !string.IsNullOrWhiteSpace(values.Value("ProgressNum")) ? int.Parse(values.Value("ProgressNum")) : 0; model.CompleteNum = !string.IsNullOrWhiteSpace(values.Value("CompleteNum")) ? int.Parse(values.Value("CompleteNum")) : 0; var rate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum * 100, 2, MidpointRounding.AwayFromZero) : 0; @@ -255,6 +259,7 @@ namespace FineUIPro.Web.TestRun.Report ws.SetColumnWidth(1, (20 * 256)); ws.SetColumnWidth(2, (20 * 256)); ws.SetColumnWidth(3, (20 * 256)); + ws.SetColumnWidth(4, (20 * 256)); #endregion @@ -268,16 +273,18 @@ namespace FineUIPro.Web.TestRun.Report #region 头部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 3); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 4); //行1 ws.GetRow(0).GetCell(0).CellStyle = styleBold; ws.GetRow(0).GetCell(0).SetCellValue("工作包名称"); ws.GetRow(0).GetCell(1).CellStyle = styleBold; ws.GetRow(0).GetCell(1).SetCellValue("全部数量"); ws.GetRow(0).GetCell(2).CellStyle = styleBold; - ws.GetRow(0).GetCell(2).SetCellValue("进行中数量"); + ws.GetRow(0).GetCell(2).SetCellValue("未开始数量"); ws.GetRow(0).GetCell(3).CellStyle = styleBold; - ws.GetRow(0).GetCell(3).SetCellValue("已完成数量"); + ws.GetRow(0).GetCell(3).SetCellValue("进行中数量"); + ws.GetRow(0).GetCell(4).CellStyle = styleBold; + ws.GetRow(0).GetCell(4).SetCellValue("已完成数量"); #endregion @@ -285,7 +292,7 @@ namespace FineUIPro.Web.TestRun.Report var start = 1; var end = result.Count; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 3); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 4); //数据 var dataIndex = 1; @@ -293,8 +300,9 @@ namespace FineUIPro.Web.TestRun.Report { ws.GetRow(dataIndex).GetCell(0).SetCellValue(item.WorkPackName); ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.AllNum.ToString()); - ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.ProgressNum.ToString()); - ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.CompleteNum.ToString()); + ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.NotStartedNum.ToString()); + ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.ProgressNum.ToString()); + ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.CompleteNum.ToString()); dataIndex++; } @@ -302,11 +310,12 @@ namespace FineUIPro.Web.TestRun.Report #region 尾部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 3); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 4); ws.GetRow(end + 1).GetCell(0).SetCellValue("合计"); ws.GetRow(end + 1).GetCell(1).SetCellValue(result.Count > 0 ? result.Sum(x => x.AllNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.NotStartedNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(4).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0"); #endregion @@ -351,6 +360,7 @@ namespace FineUIPro.Web.TestRun.Report JObject summary = new JObject(); summary.Add("AllNum", result.Sum(x => x.AllNum)); + summary.Add("NotStartedNum", result.Sum(x => x.NotStartedNum)); summary.Add("ProgressNum", result.Sum(x => x.ProgressNum)); summary.Add("CompleteNum", result.Sum(x => x.CompleteNum)); GridSc.SummaryData = summary; @@ -378,6 +388,7 @@ namespace FineUIPro.Web.TestRun.Report ProjectId = a.ProjectId, States = a.States, AllNum = a.AllNum, + NotStartedNum = a.NotStartedNum, ProgressNum = a.ProgressNum, CompleteNum = a.CompleteNum, CompleteRate = a.CompleteRate, @@ -419,13 +430,15 @@ namespace FineUIPro.Web.TestRun.Report var itemInspect = inspectlist.FirstOrDefault(x => x.WorkPackId == item.WorkPackId); model.AllNum = itemInspect.AllNum; model.ProgressNum = itemInspect.NoCloseNum; + model.NotStartedNum = 0; model.CompleteNum = itemInspect.CloseNum; } else { - model.AllNum = 0; + model.AllNum = 1; model.ProgressNum = 0; model.CompleteNum = 0; + model.NotStartedNum = 1; } model.CompleteRate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum, 2, MidpointRounding.AwayFromZero) : 0; model.AddUser = this.CurrUser.UserId; @@ -478,6 +491,7 @@ namespace FineUIPro.Web.TestRun.Report model.ProjectId = this.CurrUser.LoginProjectId; model.States = 2; model.AllNum = !string.IsNullOrWhiteSpace(values.Value("AllNum")) ? int.Parse(values.Value("AllNum")) : 0; + model.NotStartedNum = !string.IsNullOrWhiteSpace(values.Value("NotStartedNum")) ? int.Parse(values.Value("NotStartedNum")) : 0; model.ProgressNum = !string.IsNullOrWhiteSpace(values.Value("ProgressNum")) ? int.Parse(values.Value("ProgressNum")) : 0; model.CompleteNum = !string.IsNullOrWhiteSpace(values.Value("CompleteNum")) ? int.Parse(values.Value("CompleteNum")) : 0; model.CompleteRate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum, 2, MidpointRounding.AwayFromZero) : 0; @@ -525,6 +539,7 @@ namespace FineUIPro.Web.TestRun.Report ws.SetColumnWidth(1, (20 * 256)); ws.SetColumnWidth(2, (20 * 256)); ws.SetColumnWidth(3, (20 * 256)); + ws.SetColumnWidth(4, (20 * 256)); #endregion @@ -538,16 +553,18 @@ namespace FineUIPro.Web.TestRun.Report #region 头部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 3); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 4); //行1 ws.GetRow(0).GetCell(0).CellStyle = styleBold; ws.GetRow(0).GetCell(0).SetCellValue("工作包名称"); ws.GetRow(0).GetCell(1).CellStyle = styleBold; ws.GetRow(0).GetCell(1).SetCellValue("全部数量"); ws.GetRow(0).GetCell(2).CellStyle = styleBold; - ws.GetRow(0).GetCell(2).SetCellValue("进行中数量"); + ws.GetRow(0).GetCell(2).SetCellValue("未开始数量"); ws.GetRow(0).GetCell(3).CellStyle = styleBold; - ws.GetRow(0).GetCell(3).SetCellValue("已完成数量"); + ws.GetRow(0).GetCell(3).SetCellValue("进行中数量"); + ws.GetRow(0).GetCell(4).CellStyle = styleBold; + ws.GetRow(0).GetCell(4).SetCellValue("已完成数量"); #endregion @@ -555,7 +572,7 @@ namespace FineUIPro.Web.TestRun.Report var start = 1; var end = result.Count; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 3); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 4); //数据 var dataIndex = 1; @@ -563,8 +580,9 @@ namespace FineUIPro.Web.TestRun.Report { ws.GetRow(dataIndex).GetCell(0).SetCellValue(item.WorkPackName); ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.AllNum.ToString()); - ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.ProgressNum.ToString()); - ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.CompleteNum.ToString()); + ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.NotStartedNum.ToString()); + ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.ProgressNum.ToString()); + ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.CompleteNum.ToString()); dataIndex++; } @@ -572,12 +590,12 @@ namespace FineUIPro.Web.TestRun.Report #region 尾部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 3); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 4); ws.GetRow(end + 1).GetCell(0).SetCellValue("合计"); ws.GetRow(end + 1).GetCell(1).SetCellValue(result.Count > 0 ? result.Sum(x => x.AllNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0"); - + ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.NotStartedNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(4).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0"); #endregion diff --git a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs index 2a52987a..a56ee2ad 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/Report/ScheduleSetUp.aspx.designer.cs @@ -149,6 +149,15 @@ namespace FineUIPro.Web.TestRun.Report /// protected global::FineUIPro.NumberBox txtAllNum; + /// + /// txtNotStartedNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtNotStartedNum; + /// /// txtProgressNum 控件。 /// @@ -230,6 +239,15 @@ namespace FineUIPro.Web.TestRun.Report /// protected global::FineUIPro.NumberBox txtAllNum1; + /// + /// txtNotStartedNum1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtNotStartedNum1; + /// /// txtProgressNum1 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx b/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx index 4f8e51bf..a49b5b19 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx +++ b/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx @@ -65,6 +65,8 @@ + + diff --git a/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx.cs index e075f720..aa5bdf9a 100644 --- a/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Report/TestRunSchedule.aspx.cs @@ -170,6 +170,7 @@ namespace FineUIPro.Web.TestRun.Report GridTestRun.DataBind(); JObject summary = new JObject(); summary.Add("WorkPackNum", result.Sum(x => x.WorkPackNum)); + summary.Add("WorkPackNotStartedNum", result.Sum(x => x.WorkPackNotStartedNum)); summary.Add("WorkPackNoCloseNum", result.Sum(x => x.WorkPackNoCloseNum)); summary.Add("WorkPackCloseNum", result.Sum(x => x.WorkPackCloseNum)); summary.Add("InspectNum", result.Sum(x => x.InspectNum)); @@ -211,6 +212,7 @@ namespace FineUIPro.Web.TestRun.Report ws.SetColumnWidth(7, (20 * 256)); ws.SetColumnWidth(8, (20 * 256)); ws.SetColumnWidth(9, (20 * 256)); + ws.SetColumnWidth(10, (20 * 256)); #endregion @@ -224,7 +226,7 @@ namespace FineUIPro.Web.TestRun.Report #region 头部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 9); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 10); //行1 ws.GetRow(0).GetCell(0).CellStyle = styleBold; ws.GetRow(0).GetCell(0).SetCellValue("工作包名称"); @@ -237,15 +239,17 @@ namespace FineUIPro.Web.TestRun.Report ws.GetRow(0).GetCell(4).CellStyle = styleBold; ws.GetRow(0).GetCell(4).SetCellValue("工作包数量"); ws.GetRow(0).GetCell(5).CellStyle = styleBold; - ws.GetRow(0).GetCell(5).SetCellValue("工作包未关闭数量"); + ws.GetRow(0).GetCell(5).SetCellValue("工作包未开始数量"); ws.GetRow(0).GetCell(6).CellStyle = styleBold; - ws.GetRow(0).GetCell(6).SetCellValue("工作包已关闭数量"); + ws.GetRow(0).GetCell(6).SetCellValue("工作包未关闭数量"); ws.GetRow(0).GetCell(7).CellStyle = styleBold; - ws.GetRow(0).GetCell(7).SetCellValue("检查表数量"); + ws.GetRow(0).GetCell(7).SetCellValue("工作包已关闭数量"); ws.GetRow(0).GetCell(8).CellStyle = styleBold; - ws.GetRow(0).GetCell(8).SetCellValue("检查表未关闭数量"); + ws.GetRow(0).GetCell(8).SetCellValue("检查表数量"); ws.GetRow(0).GetCell(9).CellStyle = styleBold; - ws.GetRow(0).GetCell(9).SetCellValue("检查表已关闭数量"); + ws.GetRow(0).GetCell(9).SetCellValue("检查表未关闭数量"); + ws.GetRow(0).GetCell(10).CellStyle = styleBold; + ws.GetRow(0).GetCell(10).SetCellValue("检查表已关闭数量"); #endregion @@ -253,7 +257,7 @@ namespace FineUIPro.Web.TestRun.Report var start = 1; var end = result.Count; - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 9); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 10); //数据 var dataIndex = 1; @@ -264,11 +268,12 @@ namespace FineUIPro.Web.TestRun.Report ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.ProcessesName); ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.SystemName); ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.WorkPackNum); - ws.GetRow(dataIndex).GetCell(5).SetCellValue(item.WorkPackNoCloseNum); - ws.GetRow(dataIndex).GetCell(6).SetCellValue(item.WorkPackCloseNum); - ws.GetRow(dataIndex).GetCell(7).SetCellValue(item.InspectNum); - ws.GetRow(dataIndex).GetCell(8).SetCellValue(item.InspectNoCloseNum); - ws.GetRow(dataIndex).GetCell(9).SetCellValue(item.InspectCloseNum); + ws.GetRow(dataIndex).GetCell(5).SetCellValue(item.WorkPackNotStartedNum); + ws.GetRow(dataIndex).GetCell(6).SetCellValue(item.WorkPackNoCloseNum); + ws.GetRow(dataIndex).GetCell(7).SetCellValue(item.WorkPackCloseNum); + ws.GetRow(dataIndex).GetCell(8).SetCellValue(item.InspectNum); + ws.GetRow(dataIndex).GetCell(9).SetCellValue(item.InspectNoCloseNum); + ws.GetRow(dataIndex).GetCell(10).SetCellValue(item.InspectCloseNum); dataIndex++; } @@ -276,16 +281,17 @@ namespace FineUIPro.Web.TestRun.Report #region 尾部 - ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 9); + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 10); var region = new CellRangeAddress(end + 1, end + 1, 0, 3); ws.AddMergedRegion(region); ws.GetRow(end + 1).GetCell(0).SetCellValue("合计"); ws.GetRow(end + 1).GetCell(4).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(5).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNoCloseNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(6).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackCloseNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(7).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(8).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNoCloseNum).ToString() : "0"); - ws.GetRow(end + 1).GetCell(9).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(5).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNotStartedNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(6).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNoCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(7).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(8).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(9).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNoCloseNum).ToString() : "0"); + ws.GetRow(end + 1).GetCell(10).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectCloseNum).ToString() : "0"); #endregion @@ -358,49 +364,6 @@ namespace FineUIPro.Web.TestRun.Report return style; } - /// - /// 试车统计实体(老) - /// - public class ScheduleBridDto - { - /// - /// 工作包主键 - /// - public string WorkPackId { get; set; } - /// - /// 工作包名称 - /// - public string WorkName { get; set; } - /// - /// 装置名称 - /// - public string InstallationName { get; set; } - /// - /// 工序名称 - /// - public string ProcessesName { get; set; } - /// - /// 系统名称 - /// - public string SystemName { get; set; } - /// - /// 子系统名称 - /// - public string SubsystemName { get; set; } - /// - /// 工作包数量 - /// - public string AllNum { get; set; } - /// - /// 未关闭任务单数量 - /// - public string NoCloseNum { get; set; } - /// - /// 已关闭任务单数量 - /// - public string CloseNum { get; set; } - } - /// /// 获取试车统计 /// @@ -432,14 +395,17 @@ namespace FineUIPro.Web.TestRun.Report item.InspectNoCloseNum = itemInspect.NoCloseNum; item.WorkPackCloseNum = itemInspect.CloseNum; item.WorkPackNoCloseNum = itemInspect.NoCloseNum; + item.WorkPackNum = itemInspect.CloseNum + itemInspect.NoCloseNum; } else { item.InspectNum = 0; item.InspectCloseNum = 0; item.InspectNoCloseNum = 0; + item.WorkPackNotStartedNum = 1; item.WorkPackNoCloseNum = 0; item.WorkPackCloseNum = 0; + item.WorkPackNum = 1; } if (driveDt.Rows.Count > 0) { @@ -487,6 +453,10 @@ namespace FineUIPro.Web.TestRun.Report /// public int WorkPackNoCloseNum { get; set; } /// + /// 工作包未开始数量 + /// + public int WorkPackNotStartedNum { get; set; } + /// /// 工作包已关闭数量 /// public int WorkPackCloseNum { get; set; } diff --git a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectTemplate.aspx.cs b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectTemplate.aspx.cs index 28a1446c..1b506e88 100644 --- a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectTemplate.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectTemplate.aspx.cs @@ -70,8 +70,16 @@ namespace FineUIPro.Web.TestRun.TestRunManage /// public void BindGrid() { - var list = Funs.DB.TestRun_WorkInspectTemplate.Where(x => x.WorkPackId == this.tvControlItem.SelectedNodeID).OrderBy(x => x.Sort); - Grid1.DataSource = list; + if (!string.IsNullOrWhiteSpace(txtsWorkInspectName.Text)) + { + var list = Funs.DB.TestRun_WorkInspectTemplate.Where(x => x.WorkPackId == this.tvControlItem.SelectedNodeID && x.WorkInspectName.Contains(txtsWorkInspectName.Text)).OrderBy(x => x.Sort); + Grid1.DataSource = list; + } + else + { + var list = Funs.DB.TestRun_WorkInspectTemplate.Where(x => x.WorkPackId == this.tvControlItem.SelectedNodeID).OrderBy(x => x.Sort); + Grid1.DataSource = list; + } Grid1.DataBind(); } diff --git a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx index 4e861f88..dc5ee885 100644 --- a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx @@ -36,7 +36,7 @@ - + @@ -48,7 +48,6 @@ - diff --git a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx.cs index b58970a7..d55a8283 100644 --- a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutConfirm.aspx.cs @@ -155,8 +155,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage GridRow row = Grid1.Rows[i]; System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)row.FindControl("rblIsPass"); var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); - var inspectedUser = this.Grid1.Rows[i].DataKeys[1].ToString(); - var model = Funs.DB.TestRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId && x.InspectedUser == inspectedUser); + var model = Funs.DB.TestRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId); if (model != null) { if (!string.IsNullOrWhiteSpace(rblIsPass.SelectedValue)) @@ -186,7 +185,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage Funs.DB.SubmitChanges(); } } - var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString(); + var subInspectId = this.Grid1.Rows[0].DataKeys[1].ToString(); var subModel = Funs.DB.TestRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId); if (subModel != null) { @@ -524,7 +523,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage { System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)Grid1.Rows[e.RowIndex].FindControl("rblIsPass"); int isPass = 1; - if (Grid1.DataKeys[e.RowIndex][4] != null) isPass = int.Parse(Grid1.DataKeys[e.RowIndex][4].ToString()); + if (Grid1.DataKeys[e.RowIndex][2] != null) isPass = int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()); rblIsPass.SelectedValue = isPass.ToString(); if (rblIsPass.SelectedValue != "1") { diff --git a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutList.aspx.cs index 5ce754b6..b972ee35 100644 --- a/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectWanderAboutList.aspx.cs @@ -35,7 +35,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); - var inspectTerms = Funs.DB.TestRun_SubInspectTerm.Where(x => (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.ContractorIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.SupervisionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.OwnerIsAllPass == 1)).ToList(); + var inspectTerms = Funs.DB.TestRun_SubInspectTerm.Where(x => (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.InspectionIsAllPass == 1)).ToList(); if (inspectTerms.Count == 0) return; var systemIds = inspectTerms.ConvertAll(x => x.SystemId); var workPackIds = inspectTerms.ConvertAll(x => x.WorkPackId); @@ -117,13 +117,13 @@ namespace FineUIPro.Web.TestRun.TestRunManage public void BindGrid() { //分包商 - string subcontractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,1 as ConfirmType,'分包商' as ConfirmName,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass is null) as WaitConfirmNum,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=1) as PassConfirmNum,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.InspectionIsAllPass=1 and a.ProjectId='{this.CurrUser.LoginProjectId}' and a.Subcontractor='{this.CurrUser.UserId}' "; + string subcontractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,1 as ConfirmType,'分包商' as ConfirmName,(select count (1) from TestRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass is null) as WaitConfirmNum,(select count (1) from TestRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=1) as PassConfirmNum,(select count (1) from TestRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.InspectionIsAllPass=1 and a.ProjectId='{this.CurrUser.LoginProjectId}' and a.Subcontractor='{this.CurrUser.UserId}' "; //承包商 - string contractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,2 as ConfirmType,'承包商' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Contractor = '{this.CurrUser.UserId}' "; + string contractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,2 as ConfirmType,'承包商' as ConfirmName,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass is null) as WaitConfirmNum,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 1) as PassConfirmNum,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Contractor = '{this.CurrUser.UserId}' "; //监理 - string supervisionStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,3 as ConfirmType,'监理' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Supervision = '{this.CurrUser.UserId}' "; + string supervisionStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,3 as ConfirmType,'监理' as ConfirmName,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass is null) as WaitConfirmNum,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 1) as PassConfirmNum,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Supervision = '{this.CurrUser.UserId}' "; //业主 - string ownerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,4 as ConfirmType,'业主' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Owner = '{this.CurrUser.UserId}' "; + string ownerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,4 as ConfirmType,'业主' as ConfirmName,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass is null) as WaitConfirmNum,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 1) as PassConfirmNum,(select count(1) from TestRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName,a.SystemId from TestRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Owner = '{this.CurrUser.UserId}' "; if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0) { diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 6605fbff..aae34665 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx index 1d4d2f7a..8bea4504 100644 --- a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx @@ -14,7 +14,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx.cs index 724cb5e8..2d1d502d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx.cs @@ -9,9 +9,195 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance { public partial class TestRunMonthSummaryReport : PageBase { + /// + /// 加载页面 + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + if (this.CurrUser != null && this.CurrUser.PageSize.HasValue) + { + Grid1.PageSize = this.CurrUser.PageSize.Value; + } + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + ////权限按钮方法 + this.GetButtonPower(); + } + } + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT performance.TestRunMonthSummaryReportId,performance.Year,performance.UserId,performance.CompileDate,Users.UserName " + + @" From dbo.ZHGL_TestRunMonthSummaryReport AS performance" + + @" LEFT JOIN Sys_User AS Users ON Users.UserId=performance.UserId" + + @" WHERE 1=1"; + List listStr = new List(); + if (this.CurrUser.UserId != BLL.Const.sysglyId && this.CurrUser.UserId != BLL.Const.hfnbdId) + { + strSql += " AND performance.UserId = @UserId"; + listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId)); + } + if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim())) + { + strSql += " AND UserName LIKE @UserName"; + listStr.Add(new SqlParameter("@UserName", "%" + this.txtUserName.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 删除数据 + /// + /// 批量删除数据 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var performance = TestRunMonthSummaryReportService.GetTestRunMonthSummaryReportById(rowID); + if (performance != null) + { + BLL.TestRunMonthSummaryReportService.DeleteTestRunMonthSummaryReportById(rowID); + } + } + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + else + { + ShowNotify("请至少选中一行！", MessageBoxIcon.Warning); + } + } + #endregion + + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TestRunMonthSummaryReportEdit.aspx", "编辑 - "))); + } + + #region 编辑 + /// + /// 编辑 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string Id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TestRunMonthSummaryReportEdit.aspx?TestRunMonthSummaryReportId={0}", Id, "编辑 - "))); + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuEdit_Click(null, null); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.TestRunMonthSummaryReportMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + protected void Window1_Close(object sender, EventArgs e) + { + BindGrid(); } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx new file mode 100644 index 00000000..298e9209 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx @@ -0,0 +1,65 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestRunMonthSummaryReportEdit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.TestRunPerformance.TestRunMonthSummaryReportEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.cs new file mode 100644 index 00000000..b6c36245 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.cs @@ -0,0 +1,246 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.ZHGL.TestRunPerformance +{ + public partial class TestRunMonthSummaryReportEdit : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string Id = Request.Params["TestRunMonthSummaryReportId"]; + Model.SGGLDB db = Funs.DB; + var userIds = (from x in db.Person_TestRunMonthSummary select x.UserId).Distinct().ToList(); + var users = from x in db.Sys_User where userIds.Contains(x.UserId) select x; + this.drpUser.DataTextField = "UserName"; + this.drpUser.DataValueField = "UserId"; + this.drpUser.DataSource = users; + this.drpUser.DataBind(); + Funs.FineUIPleaseSelect(this.drpUser); + this.drpUser.SelectedValue = this.CurrUser.UserId; + Model.ZHGL_TestRunMonthSummaryReport report = BLL.TestRunMonthSummaryReportService.GetTestRunMonthSummaryReportById(Id); + if (report != null) + { + if (!string.IsNullOrEmpty(report.UserId)) + { + this.drpUser.SelectedValue = report.UserId; + } + if (report.Year != null) + { + this.txtYear.Text = report.Year.ToString(); + } + if (this.drpUser.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.txtYear.Text.Trim())) + { + BindGrid(); + } + } + } + } + #endregion + + private void BindGrid() + { + Model.SGGLDB db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtYear.Text + "-01" + "-01"); + DateTime endDate = startDate.AddYears(1); + var projects = from x in db.Base_Project select x; + var getTestRunMonthSummarys = (from x in db.Person_TestRunMonthSummary + join y in db.Sys_User on x.UserId equals y.UserId + where x.UserId == this.drpUser.SelectedValue && x.RaiseDate >= startDate && x.RaiseDate < endDate + orderby x.ProjectId + select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList(); + if (getTestRunMonthSummarys.Count() > 0) + { + DataTable table = new DataTable(); + DateTime startMonth; + List months = new List(); + startMonth = startDate; + do + { + months.Add(startMonth); + startMonth = startMonth.AddMonths(1); + } while (startMonth < endDate); + + table.Columns.Add(new DataColumn("Id", typeof(String))); + table.Columns.Add(new DataColumn("Code", typeof(String))); + table.Columns.Add(new DataColumn("ProjectName", typeof(String))); + table.Columns.Add(new DataColumn("ProcessName", typeof(String))); + table.Columns.Add(new DataColumn("RaiseDate", typeof(String))); + table.Columns.Add(new DataColumn("ProblemDescription", typeof(String))); + table.Columns.Add(new DataColumn("HandleMethod", typeof(String))); + table.Columns.Add(new DataColumn("ExperienceOrSuggestion", typeof(String))); + DataRow row; + int a = 1; + for (int i = 0; i < months.Count; i++) + { + row = table.NewRow(); + row["Id"] = i; + row["Code"] = GetNum(i + 1); + row["ProjectName"] = months[i].Year + "年" + months[i].Month + "月份开车技术总结"; + DateTime monthEndDate = months[i].AddMonths(1); + var monthList = getTestRunMonthSummarys.Where(x => x.RaiseDate >= months[i] && x.RaiseDate < monthEndDate).OrderBy(x => x.RaiseDate); + table.Rows.Add(row); + a = 1; + string projectName = string.Empty; + foreach (var item in monthList) + { + row = table.NewRow(); + row["Id"] = SQLHelper.GetNewID(); + var project = projects.FirstOrDefault(x => x.ProjectId == item.ProjectId); + if (project != null) + { + if (string.IsNullOrEmpty(projectName) || projectName != project.ProjectName) + { + row["ProjectName"] = project.ProjectName; + projectName = row["ProjectName"].ToString(); + } + } + else + { + if (string.IsNullOrEmpty(projectName) || projectName != "本部") + { + row["ProjectName"] = "本部"; + projectName = row["ProjectName"].ToString(); + } + } + row["ProcessName"] = item.ProcessName; + row["RaiseDate"] = item.RaiseDate; + row["ProblemDescription"] = item.ProblemDescription; + row["HandleMethod"] = item.HandleMethod; + row["ExperienceOrSuggestion"] = item.ExperienceOrSuggestion; + table.Rows.Add(row); + a++; + } + } + //rows = rows.Substring(0, rows.Length - 1); + this.Grid1.DataSource = table; + this.Grid1.DataBind(); + } + } + + private string GetNum(int i) + { + string num = string.Empty; + if (i == 1) + { + num = "一"; + } + else if (i == 2) + { + num = "二"; + } + else if (i == 3) + { + num = "三"; + } + else if (i == 4) + { + num = "四"; + } + else if (i == 5) + { + num = "五"; + } + else if (i == 6) + { + num = "六"; + } + else if (i == 7) + { + num = "七"; + } + else if (i == 8) + { + num = "八"; + } + else if (i == 9) + { + num = "九"; + } + else if (i == 10) + { + num = "十"; + } + else if (i == 11) + { + num = "十一"; + } + else if (i == 12) + { + num = "十二"; + } + return num; + } + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.drpUser.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择开车人员！", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrEmpty(this.txtYear.Text.Trim())) + { + Alert.ShowInTop("请选择年份！", MessageBoxIcon.Warning); + return; + } + Save(); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + private void Save() + { + string TestRunMonthSummaryReportId = Request.Params["TestRunMonthSummaryReportId"]; + Model.ZHGL_TestRunMonthSummaryReport newItem = new Model.ZHGL_TestRunMonthSummaryReport(); + newItem.Year = Funs.GetNewInt(this.txtYear.Text.Trim()); + newItem.UserId = this.drpUser.SelectedValue; + newItem.CompileMan = this.CurrUser.UserId; + newItem.CompileDate = DateTime.Now; + if (string.IsNullOrEmpty(TestRunMonthSummaryReportId)) + { + newItem.TestRunMonthSummaryReportId = SQLHelper.GetNewID(); + BLL.TestRunMonthSummaryReportService.AddTestRunMonthSummaryReport(newItem); + BLL.LogService.AddSys_Log(this.CurrUser, newItem.Year.ToString(), newItem.TestRunMonthSummaryReportId, BLL.Const.TestRunMonthSummaryReportMenuId, "增加开车月技术总结！"); + } + else + { + newItem.TestRunMonthSummaryReportId = TestRunMonthSummaryReportId; + BLL.TestRunMonthSummaryReportService.UpdateTestRunMonthSummaryReport(newItem); + BLL.LogService.AddSys_Log(this.CurrUser, newItem.Year.ToString(), newItem.TestRunMonthSummaryReportId, BLL.Const.TestRunMonthSummaryReportMenuId, "修改开车月技术总结！"); + } + } + #endregion + + protected void drpUser_SelectedIndexChanged(object sender, EventArgs e) + { + if (this.drpUser.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.txtYear.Text.Trim())) + { + BindGrid(); + } + else + { + this.Grid1.DataSource = null; + this.Grid1.DataBind(); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.designer.cs new file mode 100644 index 00000000..4463b00d --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.designer.cs @@ -0,0 +1,96 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.TestRunPerformance { + + + public partial class TestRunMonthSummaryReportEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUser; + + /// + /// txtYear 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtYear; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdId; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReportEdit.aspx.cs index f2b80e43..d6c1e32d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReportEdit.aspx.cs @@ -66,16 +66,6 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance IQueryable getTrips = from x in db.Person_BusinessTrip where x.UserId == this.drpUser.SelectedValue && x.LeaveDate >= startDate && x.ArriveDate < endDate select x; - IQueryable getParentDetails = from x in db.View_WBS_CostControlParentDetail select x; - IQueryable getWbsSets = from x in db.Wbs_WbsSet select x; - IQueryable getWbsSetInits = from x in db.WBS_WbsSetInit select x; - IQueryable getUnitProjects = from x in db.Wbs_UnitProject select x; - IQueryable getUnitProjectInits = from x in db.Wbs_UnitProjectInit select x; - IQueryable getCnProfessions = from x in db.WBS_CnProfession select x; - IQueryable getCnProfessionInits = from x in db.WBS_CnProfessionInit select x; - IQueryable getInstallations = from x in db.Project_Installation select x; - IQueryable getCostControlDetailStatisticss = from x in db.View_WBS_CostControlDetailStatistics select x; - List CostControlDetailStatisticsList = new List(); if (getTestRunPerformances.Count() > 0) { DataTable table = new DataTable(); @@ -545,13 +535,13 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance { newItem.TestRunPerformanceMonthReportId = SQLHelper.GetNewID(); BLL.TestRunPerformanceMonthReportService.AddTestRunPerformanceMonthReport(newItem); - BLL.LogService.AddSys_Log(this.CurrUser, newItem.Year.ToString(), newItem.TestRunPerformanceMonthReportId, BLL.Const.ControlItemInitSetMenuId, "增加试车绩效报告！"); + BLL.LogService.AddSys_Log(this.CurrUser, newItem.Year.ToString(), newItem.TestRunPerformanceMonthReportId, BLL.Const.TestRunPerformanceMonthReportMenuId, "增加试车绩效报告！"); } else { newItem.TestRunPerformanceMonthReportId = TestRunPerformanceMonthReportId; BLL.TestRunPerformanceMonthReportService.UpdateTestRunPerformanceMonthReport(newItem); - BLL.LogService.AddSys_Log(this.CurrUser, newItem.Year.ToString(), newItem.TestRunPerformanceMonthReportId, BLL.Const.ControlItemInitSetMenuId, "修改试车绩效报告！"); + BLL.LogService.AddSys_Log(this.CurrUser, newItem.Year.ToString(), newItem.TestRunPerformanceMonthReportId, BLL.Const.TestRunPerformanceMonthReportMenuId, "修改试车绩效报告！"); } } #endregion diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index ecabe79c..5f525364 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -82,7 +82,15 @@ - + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 533bee11..69859890 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -85,5 +85,6 @@ + \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 60a6da57..b6c06c88 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -914,6 +914,21 @@ namespace Model partial void InsertExchange_Content(Exchange_Content instance); partial void UpdateExchange_Content(Exchange_Content instance); partial void DeleteExchange_Content(Exchange_Content instance); + partial void InsertFeedingRun_InspectTailTerm(FeedingRun_InspectTailTerm instance); + partial void UpdateFeedingRun_InspectTailTerm(FeedingRun_InspectTailTerm instance); + partial void DeleteFeedingRun_InspectTailTerm(FeedingRun_InspectTailTerm instance); + partial void InsertFeedingRun_InspectTermApproveRecords(FeedingRun_InspectTermApproveRecords instance); + partial void UpdateFeedingRun_InspectTermApproveRecords(FeedingRun_InspectTermApproveRecords instance); + partial void DeleteFeedingRun_InspectTermApproveRecords(FeedingRun_InspectTermApproveRecords instance); + partial void InsertFeedingRun_SubInspectTerm(FeedingRun_SubInspectTerm instance); + partial void UpdateFeedingRun_SubInspectTerm(FeedingRun_SubInspectTerm instance); + partial void DeleteFeedingRun_SubInspectTerm(FeedingRun_SubInspectTerm instance); + partial void InsertFeedingRun_SubInspectTermItem(FeedingRun_SubInspectTermItem instance); + partial void UpdateFeedingRun_SubInspectTermItem(FeedingRun_SubInspectTermItem instance); + partial void DeleteFeedingRun_SubInspectTermItem(FeedingRun_SubInspectTermItem instance); + partial void InsertFeedingRun_WorkInspectTemplate(FeedingRun_WorkInspectTemplate instance); + partial void UpdateFeedingRun_WorkInspectTemplate(FeedingRun_WorkInspectTemplate instance); + partial void DeleteFeedingRun_WorkInspectTemplate(FeedingRun_WorkInspectTemplate instance); partial void InsertFinalFileManage_FinalFileList(FinalFileManage_FinalFileList instance); partial void UpdateFinalFileManage_FinalFileList(FinalFileManage_FinalFileList instance); partial void DeleteFinalFileManage_FinalFileList(FinalFileManage_FinalFileList instance); @@ -4989,6 +5004,46 @@ namespace Model } } + public System.Data.Linq.Table FeedingRun_InspectTailTerm + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table FeedingRun_InspectTermApproveRecords + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table FeedingRun_SubInspectTerm + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table FeedingRun_SubInspectTermItem + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table FeedingRun_WorkInspectTemplate + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table FinalFileManage_FinalFileList { get @@ -145145,6 +145200,2140 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FeedingRun_InspectTailTerm")] + public partial class FeedingRun_InspectTailTerm : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TailTermId; + + private string _ProjectId; + + private string _ProjectName; + + private string _TailTermCode; + + private string _ConstructionUnit; + + private string _SubInspectId; + + private string _TermItemId; + + private string _QuestionDesc; + + private string _RectifyOpinion; + + private System.Nullable _RectifyTime; + + private string _InspectUser; + + private string _HandleUser; + + private string _ApproveUser; + + private System.Nullable _AdjustCompleteTime; + + private System.Nullable _ApproveState; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTailTermIdChanging(string value); + partial void OnTailTermIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnProjectNameChanging(string value); + partial void OnProjectNameChanged(); + partial void OnTailTermCodeChanging(string value); + partial void OnTailTermCodeChanged(); + partial void OnConstructionUnitChanging(string value); + partial void OnConstructionUnitChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnQuestionDescChanging(string value); + partial void OnQuestionDescChanged(); + partial void OnRectifyOpinionChanging(string value); + partial void OnRectifyOpinionChanged(); + partial void OnRectifyTimeChanging(System.Nullable value); + partial void OnRectifyTimeChanged(); + partial void OnInspectUserChanging(string value); + partial void OnInspectUserChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnApproveUserChanging(string value); + partial void OnApproveUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnApproveStateChanging(System.Nullable value); + partial void OnApproveStateChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public FeedingRun_InspectTailTerm() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TailTermId + { + get + { + return this._TailTermId; + } + set + { + if ((this._TailTermId != value)) + { + this.OnTailTermIdChanging(value); + this.SendPropertyChanging(); + this._TailTermId = value; + this.SendPropertyChanged("TailTermId"); + this.OnTailTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")] + public string ProjectName + { + get + { + return this._ProjectName; + } + set + { + if ((this._ProjectName != value)) + { + this.OnProjectNameChanging(value); + this.SendPropertyChanging(); + this._ProjectName = value; + this.SendPropertyChanged("ProjectName"); + this.OnProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermCode", DbType="VarChar(50)")] + public string TailTermCode + { + get + { + return this._TailTermCode; + } + set + { + if ((this._TailTermCode != value)) + { + this.OnTailTermCodeChanging(value); + this.SendPropertyChanging(); + this._TailTermCode = value; + this.SendPropertyChanged("TailTermCode"); + this.OnTailTermCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionUnit", DbType="VarChar(50)")] + public string ConstructionUnit + { + get + { + return this._ConstructionUnit; + } + set + { + if ((this._ConstructionUnit != value)) + { + this.OnConstructionUnitChanging(value); + this.SendPropertyChanging(); + this._ConstructionUnit = value; + this.SendPropertyChanged("ConstructionUnit"); + this.OnConstructionUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionDesc", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string QuestionDesc + { + get + { + return this._QuestionDesc; + } + set + { + if ((this._QuestionDesc != value)) + { + this.OnQuestionDescChanging(value); + this.SendPropertyChanging(); + this._QuestionDesc = value; + this.SendPropertyChanged("QuestionDesc"); + this.OnQuestionDescChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string RectifyOpinion + { + get + { + return this._RectifyOpinion; + } + set + { + if ((this._RectifyOpinion != value)) + { + this.OnRectifyOpinionChanging(value); + this.SendPropertyChanging(); + this._RectifyOpinion = value; + this.SendPropertyChanged("RectifyOpinion"); + this.OnRectifyOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyTime", DbType="DateTime")] + public System.Nullable RectifyTime + { + get + { + return this._RectifyTime; + } + set + { + if ((this._RectifyTime != value)) + { + this.OnRectifyTimeChanging(value); + this.SendPropertyChanging(); + this._RectifyTime = value; + this.SendPropertyChanged("RectifyTime"); + this.OnRectifyTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectUser", DbType="VarChar(50)")] + public string InspectUser + { + get + { + return this._InspectUser; + } + set + { + if ((this._InspectUser != value)) + { + this.OnInspectUserChanging(value); + this.SendPropertyChanging(); + this._InspectUser = value; + this.SendPropertyChanged("InspectUser"); + this.OnInspectUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] + public string ApproveUser + { + get + { + return this._ApproveUser; + } + set + { + if ((this._ApproveUser != value)) + { + this.OnApproveUserChanging(value); + this.SendPropertyChanging(); + this._ApproveUser = value; + this.SendPropertyChanged("ApproveUser"); + this.OnApproveUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] + public System.Nullable ApproveState + { + get + { + return this._ApproveState; + } + set + { + if ((this._ApproveState != value)) + { + this.OnApproveStateChanging(value); + this.SendPropertyChanging(); + this._ApproveState = value; + this.SendPropertyChanged("ApproveState"); + this.OnApproveStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FeedingRun_InspectTermApproveRecords")] + public partial class FeedingRun_InspectTermApproveRecords : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _InspectTermId; + + private string _ProjectId; + + private string _TermItemId; + + private string _TailTermId; + + private string _ApproveOpinion; + + private System.Nullable _ApproveTime; + + private string _ApproveUser; + + private System.Nullable _ApproveType; + + private System.Nullable _ApproveState; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnInspectTermIdChanging(string value); + partial void OnInspectTermIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnTailTermIdChanging(string value); + partial void OnTailTermIdChanged(); + partial void OnApproveOpinionChanging(string value); + partial void OnApproveOpinionChanged(); + partial void OnApproveTimeChanging(System.Nullable value); + partial void OnApproveTimeChanged(); + partial void OnApproveUserChanging(string value); + partial void OnApproveUserChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); + partial void OnApproveStateChanging(System.Nullable value); + partial void OnApproveStateChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public FeedingRun_InspectTermApproveRecords() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTermId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string InspectTermId + { + get + { + return this._InspectTermId; + } + set + { + if ((this._InspectTermId != value)) + { + this.OnInspectTermIdChanging(value); + this.SendPropertyChanging(); + this._InspectTermId = value; + this.SendPropertyChanged("InspectTermId"); + this.OnInspectTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermId", DbType="VarChar(50)")] + public string TailTermId + { + get + { + return this._TailTermId; + } + set + { + if ((this._TailTermId != value)) + { + this.OnTailTermIdChanging(value); + this.SendPropertyChanging(); + this._TailTermId = value; + this.SendPropertyChanged("TailTermId"); + this.OnTailTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string ApproveOpinion + { + get + { + return this._ApproveOpinion; + } + set + { + if ((this._ApproveOpinion != value)) + { + this.OnApproveOpinionChanging(value); + this.SendPropertyChanging(); + this._ApproveOpinion = value; + this.SendPropertyChanged("ApproveOpinion"); + this.OnApproveOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveTime", DbType="DateTime")] + public System.Nullable ApproveTime + { + get + { + return this._ApproveTime; + } + set + { + if ((this._ApproveTime != value)) + { + this.OnApproveTimeChanging(value); + this.SendPropertyChanging(); + this._ApproveTime = value; + this.SendPropertyChanged("ApproveTime"); + this.OnApproveTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] + public string ApproveUser + { + get + { + return this._ApproveUser; + } + set + { + if ((this._ApproveUser != value)) + { + this.OnApproveUserChanging(value); + this.SendPropertyChanging(); + this._ApproveUser = value; + this.SendPropertyChanged("ApproveUser"); + this.OnApproveUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] + public System.Nullable ApproveState + { + get + { + return this._ApproveState; + } + set + { + if ((this._ApproveState != value)) + { + this.OnApproveStateChanging(value); + this.SendPropertyChanging(); + this._ApproveState = value; + this.SendPropertyChanged("ApproveState"); + this.OnApproveStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FeedingRun_SubInspectTerm")] + public partial class FeedingRun_SubInspectTerm : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _SubInspectId; + + private string _ProjectId; + + private string _InstallationId; + + private string _DriverCharge; + + private string _DrivingManager; + + private string _ProjectManager; + + private System.Nullable _DriverChargeIsAllPass; + + private System.Nullable _DrivingManagerIsAllPass; + + private System.Nullable _ProjectManagerIsAllPass; + + private System.Nullable _DriverChargeAllPassData; + + private System.Nullable _DrivingManagerAllPassData; + + private System.Nullable _ProjectManagerAllPassData; + + private System.Nullable _InspectionIsAllPass; + + private System.Nullable _WanderIsComplete; + + private System.Nullable _WanderCompleteData; + + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + + private System.Nullable _InspectIsClose; + + private System.Nullable _InspectCloseData; + + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnDriverChargeChanging(string value); + partial void OnDriverChargeChanged(); + partial void OnDrivingManagerChanging(string value); + partial void OnDrivingManagerChanged(); + partial void OnProjectManagerChanging(string value); + partial void OnProjectManagerChanged(); + partial void OnDriverChargeIsAllPassChanging(System.Nullable value); + partial void OnDriverChargeIsAllPassChanged(); + partial void OnDrivingManagerIsAllPassChanging(System.Nullable value); + partial void OnDrivingManagerIsAllPassChanged(); + partial void OnProjectManagerIsAllPassChanging(System.Nullable value); + partial void OnProjectManagerIsAllPassChanged(); + partial void OnDriverChargeAllPassDataChanging(System.Nullable value); + partial void OnDriverChargeAllPassDataChanged(); + partial void OnDrivingManagerAllPassDataChanging(System.Nullable value); + partial void OnDrivingManagerAllPassDataChanged(); + partial void OnProjectManagerAllPassDataChanging(System.Nullable value); + partial void OnProjectManagerAllPassDataChanged(); + partial void OnInspectionIsAllPassChanging(System.Nullable value); + partial void OnInspectionIsAllPassChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); + partial void OnWanderCompleteDataChanging(System.Nullable value); + partial void OnWanderCompleteDataChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); + partial void OnInspectIsCloseChanging(System.Nullable value); + partial void OnInspectIsCloseChanged(); + partial void OnInspectCloseDataChanging(System.Nullable value); + partial void OnInspectCloseDataChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public FeedingRun_SubInspectTerm() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverCharge", DbType="VarChar(50)")] + public string DriverCharge + { + get + { + return this._DriverCharge; + } + set + { + if ((this._DriverCharge != value)) + { + this.OnDriverChargeChanging(value); + this.SendPropertyChanging(); + this._DriverCharge = value; + this.SendPropertyChanged("DriverCharge"); + this.OnDriverChargeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrivingManager", DbType="VarChar(50)")] + public string DrivingManager + { + get + { + return this._DrivingManager; + } + set + { + if ((this._DrivingManager != value)) + { + this.OnDrivingManagerChanging(value); + this.SendPropertyChanging(); + this._DrivingManager = value; + this.SendPropertyChanged("DrivingManager"); + this.OnDrivingManagerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectManager", DbType="VarChar(50)")] + public string ProjectManager + { + get + { + return this._ProjectManager; + } + set + { + if ((this._ProjectManager != value)) + { + this.OnProjectManagerChanging(value); + this.SendPropertyChanging(); + this._ProjectManager = value; + this.SendPropertyChanged("ProjectManager"); + this.OnProjectManagerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverChargeIsAllPass", DbType="Int")] + public System.Nullable DriverChargeIsAllPass + { + get + { + return this._DriverChargeIsAllPass; + } + set + { + if ((this._DriverChargeIsAllPass != value)) + { + this.OnDriverChargeIsAllPassChanging(value); + this.SendPropertyChanging(); + this._DriverChargeIsAllPass = value; + this.SendPropertyChanged("DriverChargeIsAllPass"); + this.OnDriverChargeIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrivingManagerIsAllPass", DbType="Int")] + public System.Nullable DrivingManagerIsAllPass + { + get + { + return this._DrivingManagerIsAllPass; + } + set + { + if ((this._DrivingManagerIsAllPass != value)) + { + this.OnDrivingManagerIsAllPassChanging(value); + this.SendPropertyChanging(); + this._DrivingManagerIsAllPass = value; + this.SendPropertyChanged("DrivingManagerIsAllPass"); + this.OnDrivingManagerIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectManagerIsAllPass", DbType="Int")] + public System.Nullable ProjectManagerIsAllPass + { + get + { + return this._ProjectManagerIsAllPass; + } + set + { + if ((this._ProjectManagerIsAllPass != value)) + { + this.OnProjectManagerIsAllPassChanging(value); + this.SendPropertyChanging(); + this._ProjectManagerIsAllPass = value; + this.SendPropertyChanged("ProjectManagerIsAllPass"); + this.OnProjectManagerIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverChargeAllPassData", DbType="DateTime")] + public System.Nullable DriverChargeAllPassData + { + get + { + return this._DriverChargeAllPassData; + } + set + { + if ((this._DriverChargeAllPassData != value)) + { + this.OnDriverChargeAllPassDataChanging(value); + this.SendPropertyChanging(); + this._DriverChargeAllPassData = value; + this.SendPropertyChanged("DriverChargeAllPassData"); + this.OnDriverChargeAllPassDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrivingManagerAllPassData", DbType="DateTime")] + public System.Nullable DrivingManagerAllPassData + { + get + { + return this._DrivingManagerAllPassData; + } + set + { + if ((this._DrivingManagerAllPassData != value)) + { + this.OnDrivingManagerAllPassDataChanging(value); + this.SendPropertyChanging(); + this._DrivingManagerAllPassData = value; + this.SendPropertyChanged("DrivingManagerAllPassData"); + this.OnDrivingManagerAllPassDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectManagerAllPassData", DbType="DateTime")] + public System.Nullable ProjectManagerAllPassData + { + get + { + return this._ProjectManagerAllPassData; + } + set + { + if ((this._ProjectManagerAllPassData != value)) + { + this.OnProjectManagerAllPassDataChanging(value); + this.SendPropertyChanging(); + this._ProjectManagerAllPassData = value; + this.SendPropertyChanged("ProjectManagerAllPassData"); + this.OnProjectManagerAllPassDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] + public System.Nullable InspectionIsAllPass + { + get + { + return this._InspectionIsAllPass; + } + set + { + if ((this._InspectionIsAllPass != value)) + { + this.OnInspectionIsAllPassChanging(value); + this.SendPropertyChanging(); + this._InspectionIsAllPass = value; + this.SendPropertyChanged("InspectionIsAllPass"); + this.OnInspectionIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete + { + get + { + return this._WanderIsComplete; + } + set + { + if ((this._WanderIsComplete != value)) + { + this.OnWanderIsCompleteChanging(value); + this.SendPropertyChanging(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] + public System.Nullable WanderCompleteData + { + get + { + return this._WanderCompleteData; + } + set + { + if ((this._WanderCompleteData != value)) + { + this.OnWanderCompleteDataChanging(value); + this.SendPropertyChanging(); + this._WanderCompleteData = value; + this.SendPropertyChanged("WanderCompleteData"); + this.OnWanderCompleteDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] + public System.Nullable InspectIsClose + { + get + { + return this._InspectIsClose; + } + set + { + if ((this._InspectIsClose != value)) + { + this.OnInspectIsCloseChanging(value); + this.SendPropertyChanging(); + this._InspectIsClose = value; + this.SendPropertyChanged("InspectIsClose"); + this.OnInspectIsCloseChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] + public System.Nullable InspectCloseData + { + get + { + return this._InspectCloseData; + } + set + { + if ((this._InspectCloseData != value)) + { + this.OnInspectCloseDataChanging(value); + this.SendPropertyChanging(); + this._InspectCloseData = value; + this.SendPropertyChanged("InspectCloseData"); + this.OnInspectCloseDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FeedingRun_SubInspectTermItem")] + public partial class FeedingRun_SubInspectTermItem : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TermItemId; + + private string _ProjectId; + + private string _InstallationId; + + private string _SubInspectId; + + private string _GroupName; + + private string _WorkInspectId; + + private string _WorkInspectName; + + private string _InspectedUser; + + private System.Nullable _InspectionResults; + + private string _InspectionIllustrate; + + private string _DriverCharge; + + private string _DrivingManager; + + private string _ProjectManager; + + private System.Nullable _DriverChargeIsPass; + + private System.Nullable _DrivingManagerIsPass; + + private System.Nullable _ProjectManagerIsPass; + + private string _DriverChargeRemark; + + private string _DrivingManagerRemark; + + private string _ProjectManagerRemark; + + private string _Remark; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); + partial void OnGroupNameChanging(string value); + partial void OnGroupNameChanged(); + partial void OnWorkInspectIdChanging(string value); + partial void OnWorkInspectIdChanged(); + partial void OnWorkInspectNameChanging(string value); + partial void OnWorkInspectNameChanged(); + partial void OnInspectedUserChanging(string value); + partial void OnInspectedUserChanged(); + partial void OnInspectionResultsChanging(System.Nullable value); + partial void OnInspectionResultsChanged(); + partial void OnInspectionIllustrateChanging(string value); + partial void OnInspectionIllustrateChanged(); + partial void OnDriverChargeChanging(string value); + partial void OnDriverChargeChanged(); + partial void OnDrivingManagerChanging(string value); + partial void OnDrivingManagerChanged(); + partial void OnProjectManagerChanging(string value); + partial void OnProjectManagerChanged(); + partial void OnDriverChargeIsPassChanging(System.Nullable value); + partial void OnDriverChargeIsPassChanged(); + partial void OnDrivingManagerIsPassChanging(System.Nullable value); + partial void OnDrivingManagerIsPassChanged(); + partial void OnProjectManagerIsPassChanging(System.Nullable value); + partial void OnProjectManagerIsPassChanged(); + partial void OnDriverChargeRemarkChanging(string value); + partial void OnDriverChargeRemarkChanged(); + partial void OnDrivingManagerRemarkChanging(string value); + partial void OnDrivingManagerRemarkChanged(); + partial void OnProjectManagerRemarkChanging(string value); + partial void OnProjectManagerRemarkChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public FeedingRun_SubInspectTermItem() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GroupName", DbType="VarChar(50)")] + public string GroupName + { + get + { + return this._GroupName; + } + set + { + if ((this._GroupName != value)) + { + this.OnGroupNameChanging(value); + this.SendPropertyChanging(); + this._GroupName = value; + this.SendPropertyChanged("GroupName"); + this.OnGroupNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkInspectId", DbType="VarChar(50) NOT NULL", CanBeNull=false)] + public string WorkInspectId + { + get + { + return this._WorkInspectId; + } + set + { + if ((this._WorkInspectId != value)) + { + this.OnWorkInspectIdChanging(value); + this.SendPropertyChanging(); + this._WorkInspectId = value; + this.SendPropertyChanged("WorkInspectId"); + this.OnWorkInspectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkInspectName", DbType="VarChar(500)")] + public string WorkInspectName + { + get + { + return this._WorkInspectName; + } + set + { + if ((this._WorkInspectName != value)) + { + this.OnWorkInspectNameChanging(value); + this.SendPropertyChanging(); + this._WorkInspectName = value; + this.SendPropertyChanged("WorkInspectName"); + this.OnWorkInspectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectedUser", DbType="VarChar(50)")] + public string InspectedUser + { + get + { + return this._InspectedUser; + } + set + { + if ((this._InspectedUser != value)) + { + this.OnInspectedUserChanging(value); + this.SendPropertyChanging(); + this._InspectedUser = value; + this.SendPropertyChanged("InspectedUser"); + this.OnInspectedUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionResults", DbType="Int")] + public System.Nullable InspectionResults + { + get + { + return this._InspectionResults; + } + set + { + if ((this._InspectionResults != value)) + { + this.OnInspectionResultsChanging(value); + this.SendPropertyChanging(); + this._InspectionResults = value; + this.SendPropertyChanged("InspectionResults"); + this.OnInspectionResultsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIllustrate", DbType="VarChar(200)")] + public string InspectionIllustrate + { + get + { + return this._InspectionIllustrate; + } + set + { + if ((this._InspectionIllustrate != value)) + { + this.OnInspectionIllustrateChanging(value); + this.SendPropertyChanging(); + this._InspectionIllustrate = value; + this.SendPropertyChanged("InspectionIllustrate"); + this.OnInspectionIllustrateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverCharge", DbType="VarChar(50)")] + public string DriverCharge + { + get + { + return this._DriverCharge; + } + set + { + if ((this._DriverCharge != value)) + { + this.OnDriverChargeChanging(value); + this.SendPropertyChanging(); + this._DriverCharge = value; + this.SendPropertyChanged("DriverCharge"); + this.OnDriverChargeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrivingManager", DbType="VarChar(50)")] + public string DrivingManager + { + get + { + return this._DrivingManager; + } + set + { + if ((this._DrivingManager != value)) + { + this.OnDrivingManagerChanging(value); + this.SendPropertyChanging(); + this._DrivingManager = value; + this.SendPropertyChanged("DrivingManager"); + this.OnDrivingManagerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectManager", DbType="VarChar(50)")] + public string ProjectManager + { + get + { + return this._ProjectManager; + } + set + { + if ((this._ProjectManager != value)) + { + this.OnProjectManagerChanging(value); + this.SendPropertyChanging(); + this._ProjectManager = value; + this.SendPropertyChanged("ProjectManager"); + this.OnProjectManagerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverChargeIsPass", DbType="Int")] + public System.Nullable DriverChargeIsPass + { + get + { + return this._DriverChargeIsPass; + } + set + { + if ((this._DriverChargeIsPass != value)) + { + this.OnDriverChargeIsPassChanging(value); + this.SendPropertyChanging(); + this._DriverChargeIsPass = value; + this.SendPropertyChanged("DriverChargeIsPass"); + this.OnDriverChargeIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrivingManagerIsPass", DbType="Int")] + public System.Nullable DrivingManagerIsPass + { + get + { + return this._DrivingManagerIsPass; + } + set + { + if ((this._DrivingManagerIsPass != value)) + { + this.OnDrivingManagerIsPassChanging(value); + this.SendPropertyChanging(); + this._DrivingManagerIsPass = value; + this.SendPropertyChanged("DrivingManagerIsPass"); + this.OnDrivingManagerIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectManagerIsPass", DbType="Int")] + public System.Nullable ProjectManagerIsPass + { + get + { + return this._ProjectManagerIsPass; + } + set + { + if ((this._ProjectManagerIsPass != value)) + { + this.OnProjectManagerIsPassChanging(value); + this.SendPropertyChanging(); + this._ProjectManagerIsPass = value; + this.SendPropertyChanged("ProjectManagerIsPass"); + this.OnProjectManagerIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverChargeRemark", DbType="VarChar(1000)")] + public string DriverChargeRemark + { + get + { + return this._DriverChargeRemark; + } + set + { + if ((this._DriverChargeRemark != value)) + { + this.OnDriverChargeRemarkChanging(value); + this.SendPropertyChanging(); + this._DriverChargeRemark = value; + this.SendPropertyChanged("DriverChargeRemark"); + this.OnDriverChargeRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrivingManagerRemark", DbType="VarChar(1000)")] + public string DrivingManagerRemark + { + get + { + return this._DrivingManagerRemark; + } + set + { + if ((this._DrivingManagerRemark != value)) + { + this.OnDrivingManagerRemarkChanging(value); + this.SendPropertyChanging(); + this._DrivingManagerRemark = value; + this.SendPropertyChanged("DrivingManagerRemark"); + this.OnDrivingManagerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectManagerRemark", DbType="VarChar(1000)")] + public string ProjectManagerRemark + { + get + { + return this._ProjectManagerRemark; + } + set + { + if ((this._ProjectManagerRemark != value)) + { + this.OnProjectManagerRemarkChanging(value); + this.SendPropertyChanging(); + this._ProjectManagerRemark = value; + this.SendPropertyChanged("ProjectManagerRemark"); + this.OnProjectManagerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FeedingRun_WorkInspectTemplate")] + public partial class FeedingRun_WorkInspectTemplate : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _WorkInspectId; + + private string _WorkInspectName; + + private string _Remark; + + private string _GroupName; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnWorkInspectIdChanging(string value); + partial void OnWorkInspectIdChanged(); + partial void OnWorkInspectNameChanging(string value); + partial void OnWorkInspectNameChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnGroupNameChanging(string value); + partial void OnGroupNameChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public FeedingRun_WorkInspectTemplate() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkInspectId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string WorkInspectId + { + get + { + return this._WorkInspectId; + } + set + { + if ((this._WorkInspectId != value)) + { + this.OnWorkInspectIdChanging(value); + this.SendPropertyChanging(); + this._WorkInspectId = value; + this.SendPropertyChanged("WorkInspectId"); + this.OnWorkInspectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkInspectName", DbType="VarChar(500)")] + public string WorkInspectName + { + get + { + return this._WorkInspectName; + } + set + { + if ((this._WorkInspectName != value)) + { + this.OnWorkInspectNameChanging(value); + this.SendPropertyChanging(); + this._WorkInspectName = value; + this.SendPropertyChanged("WorkInspectName"); + this.OnWorkInspectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(150)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GroupName", DbType="VarChar(50)")] + public string GroupName + { + get + { + return this._GroupName; + } + set + { + if ((this._GroupName != value)) + { + this.OnGroupNameChanging(value); + this.SendPropertyChanging(); + this._GroupName = value; + this.SendPropertyChanged("GroupName"); + this.OnGroupNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FinalFileManage_FinalFileList")] public partial class FinalFileManage_FinalFileList : INotifyPropertyChanging, INotifyPropertyChanged { @@ -308952,6 +311141,8 @@ namespace Model private System.Nullable _CompleteNum; + private System.Nullable _NotStartedNum; + private System.Nullable _CompleteRate; private string _AddUser; @@ -308980,6 +311171,8 @@ namespace Model partial void OnProgressNumChanged(); partial void OnCompleteNumChanging(System.Nullable value); partial void OnCompleteNumChanged(); + partial void OnNotStartedNumChanging(System.Nullable value); + partial void OnNotStartedNumChanged(); partial void OnCompleteRateChanging(System.Nullable value); partial void OnCompleteRateChanged(); partial void OnAddUserChanging(string value); @@ -309155,6 +311348,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NotStartedNum", DbType="Int")] + public System.Nullable NotStartedNum + { + get + { + return this._NotStartedNum; + } + set + { + if ((this._NotStartedNum != value)) + { + this.OnNotStartedNumChanging(value); + this.SendPropertyChanging(); + this._NotStartedNum = value; + this.SendPropertyChanged("NotStartedNum"); + this.OnNotStartedNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteRate", DbType="Decimal(18,2)")] public System.Nullable CompleteRate { diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 5fe155da..bd497c6b 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true