From 4c9957d0863381b074ad917e9f634697f55d0e0f Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 18 Dec 2025 16:53:53 +0800 Subject: [PATCH] =?UTF-8?q?20251218=20=E6=96=BD=E5=B7=A5=E5=9B=BE=E6=A0=B8?= =?UTF-8?q?=E6=9F=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2025-12-18_bwj.sql | 316 ++++++++++ HJGL_DS/BLL/BLL.csproj | 1 + HJGL_DS/BLL/Common/Const.cs | 6 + .../BLL/JGZL/ConDrawingVerificationService.cs | 93 +++ HJGL_DS/FineUIPro.Web/ErrLog.txt | 36 ++ .../File/Fastreport/JGZL/施工图核查记录.frx | 46 +- HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 16 + .../JGZL/ConDrawingVerification.aspx | 136 +++++ .../JGZL/ConDrawingVerification.aspx.cs | 391 ++++++++++++ .../ConDrawingVerification.aspx.designer.cs | 206 +++++++ .../JGZL/ConDrawingVerificationEidt.aspx | 75 +++ .../JGZL/ConDrawingVerificationEidt.aspx.cs | 133 ++++ ...onDrawingVerificationEidt.aspx.designer.cs | 179 ++++++ HJGL_DS/FineUIPro.Web/Web.config | 2 +- HJGL_DS/Model/Model.cs | 571 ++++++++++++++++++ 15 files changed, 2190 insertions(+), 17 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-12-18_bwj.sql create mode 100644 HJGL_DS/BLL/JGZL/ConDrawingVerificationService.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs diff --git a/DataBase/版本日志/HJGLDB_DS_2025-12-18_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-12-18_bwj.sql new file mode 100644 index 0000000..54ed736 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-12-18_bwj.sql @@ -0,0 +1,316 @@ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('E6221F7D-9A68-44FB-974D-6857EC9CC5E8','ʩͼ˲¼','JGZL/ConDrawingVerification.aspx',50,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('80F4137C-D4F5-48E6-B649-A7696A8E84A0','E6221F7D-9A68-44FB-974D-6857EC9CC5E8','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('D38E66DC-8464-4B6D-8927-0C446732C386','E6221F7D-9A68-44FB-974D-6857EC9CC5E8','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('A76B70C1-D6B4-4472-BCF6-93EBBFB23C94','E6221F7D-9A68-44FB-974D-6857EC9CC5E8','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('DD03E8F8-6FF6-4700-A932-DB6F0A943180','E6221F7D-9A68-44FB-974D-6857EC9CC5E8','',4) +go + + +CREATE TABLE [dbo].[JGZL_ConDrawingVerification]( + [ConDrawingVerificationId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [DesignUnit] [nvarchar](50) NULL, + [Professional] [nvarchar](50) NULL, + [Host] [nvarchar](50) NULL, + [VerificationDate] [datetime] NULL, + [ConDrawingCode] [nvarchar](50) NULL, + [Personnel] [nvarchar](2000) NULL, + [Contents] [nvarchar](2000) NULL, + [Problems] [nvarchar](2000) NULL, + [Recorder] [nvarchar](50) NULL, + [RecordDate] [datetime] NULL, + [Reviewer] [nvarchar](50) NULL, + [ReviewDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_JGZL_ConDrawingVerification] PRIMARY KEY CLUSTERED +( + [ConDrawingVerificationId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[JGZL_ConDrawingVerification] WITH CHECK ADD CONSTRAINT [FK_JGZL_ConDrawingVerification_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[JGZL_ConDrawingVerification] CHECK CONSTRAINT [FK_JGZL_ConDrawingVerification_Base_Project] +GO + +ALTER TABLE [dbo].[JGZL_ConDrawingVerification] WITH CHECK ADD CONSTRAINT [FK_JGZL_ConDrawingVerification_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[JGZL_ConDrawingVerification] CHECK CONSTRAINT [FK_JGZL_ConDrawingVerification_Sys_User] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'ConDrawingVerificationId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƶλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'DesignUnit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Professional' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Host' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˲ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'VerificationDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩͼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'ConDrawingCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'μӺ˲Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Personnel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ݼ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Contents' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Problems' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Recorder' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¼ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'RecordDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'Reviewer' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'ReviewDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩͼ˲¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ConDrawingVerification' +GO + + +ALTER PROCEDURE [dbo].[HJGL_sp_rpt_NDTReport] +( + @ProjectId NVARCHAR(50) = null, + @trustDate datetime = null +) +AS +/***************ձ**********************/ +SELECT NDTType.NDT_ID, +Base_Project.ProjectCode AS ProjectCode,--ʩ +Base_Project.ProjectName AS ProjectName,--Ŀ +NDTType.NDT_Code,--ⷽʽ +ISNULL(need_check_count.need_check_count,0) as need_check_count,--⺸ϼƣ +ISNULl(trust_count_current.trust_count_current,0) as trust_count_current,--ίк +ISNULL(trust_count_total.trust_count_total,0) as trust_count_total,--ۼίк +ISNULL(check_count_current.check_count_current,0) as check_count_current,--ռ⺸ +ISNULL(check_count.check_count,0) as check_count,--ۼƼ⺸ +ISNULL(total_check_Pass_count.total_check_Pass_count,0) as total_check_Pass_count,--ۼƺϸ񺸿 +ISNULL(check_count_film.check_count_film,0) AS check_count_film,--ۼƼƬ +--ISNULL(check_count_Pass_film.check_count_Pass_film,0) as check_count_Pass_film,--ۼƺϸƬ +(ISNULL(check_count_film.check_count_film,0)-ISNULL(repair_total_film.repair_total_film,0))as check_count_Pass_film, + +CONVERT(nvarchar(10),CAST(CAST((CASE ISNULL(need_check_count.need_check_count,0) WHEN 0 THEN 0 + ELSE 1.0 * ISNULL(check_count.check_count,0)/(1.0 * need_check_count.need_check_count) END) AS DECIMAL(19,3))*100 as DECIMAL(19,1)) )+'%' + AS complated_check_rate, --ɼ ۼƼ⺸/⺸ + +CONVERT(nvarchar(10),CAST(CAST((CASE ISNULL(check_count.check_count,0) WHEN 0 THEN 0 + ELSE 1.0 * ISNULL(one_check_Pass_count.one_check_Pass_count,0)/(1.0 * check_count.check_count) END) AS DECIMAL(19,3))*100 as DECIMAL(19,1)) )+'%' + AS check_onePass_rate,--һκϸʣ ۼƺϸ񺸿/ۼƼ⺸ + +--CONVERT(nvarchar(10),CAST(CAST((CASE ISNULL(check_count_film.check_count_film,0) WHEN 0 THEN 0 +-- ELSE 1.0 * ISNULL(check_count_Pass_film.check_count_Pass_film,0)/(1.0 * check_count_film.check_count_film) END) AS DECIMAL(19,3))*100 as DECIMAL(19,1)) )+'%' +-- AS check_onePass_film_rate,--һκϸʣƬ ۼƺϸƬ/ۼƼƬ + --CONVERT(nvarchar(10),CAST(CAST((CASE ISNULL(check_count_film.check_count_film,0) WHEN 0 THEN 0 + -- ELSE 1.0 * ISNULL(one_check_Pass_film.one_check_Pass_film,0)/(1.0 * check_count_film.check_count_film) END) AS DECIMAL(19,3))*100 as DECIMAL(19,1)) )+'%' + -- AS check_onePass_film_rate,--һκϸʣƬ һκϸƬ/ۼƼƬ + + CONVERT(nvarchar(10),CAST(CAST((CASE ISNULL(check_count_film.check_count_film,0) WHEN 0 THEN 0 + ELSE 1.0 * (ISNULL(check_count_film.check_count_film,0)-ISNULL(repair_total_film.repair_total_film,0))/(1.0 * check_count_film.check_count_film) END) AS DECIMAL(19,3))*100 as DECIMAL(19,1)) )+'%' + AS check_onePass_film_rate,--һκϸʣƬ ۼƺϸƬ/ۼƼƬ + +(isnull(check_count.check_count,0) - isnull(total_check_Pass_count.total_check_Pass_count,0)) AS check_noPass_count,--ۼƼⲻϸ ۼƼ⺸-ۼƺϸ񺸿 +--(isnull(check_NoPass_count.check_NoPass_count,0)) as check_noPass_count,--ۼƼⲻϸ + +(ISNULL(check_count_film.check_count_film,0) - (ISNULL(check_count_film.check_count_film,0)-ISNULL(repair_total_film.repair_total_film,0))) as check_noPass_film_count,--ۼƼⲻϸƬ ۼƼƬ-ۼƺϸƬ +--ISNULL(check_count_NoPass_film.check_count_NoPass_film,0) as check_noPass_film_count,--ۼƼⲻϸƬ + +ISNULL(repair_current_film.repair_current_film,0) AS repair_current_film,--췵Ƭɣ + +ISNULL(repair_total_film.repair_total_film,0) AS repair_total_film,--췵Ƭۼɣ + +--(ISNULl(check_count_film.check_count_film,0) - isnull(check_count_Pass_film.check_count_Pass_film,0))-ISNULL(repair_total_film.repair_total_film,0) as pending_repair_film, --췵Ƭ ۼƼⲻϸƬ- 췵Ƭۼɣ +--(ISNULL(check_count_NoPass_film.check_count_NoPass_film,0) - ISNULL(repair_total_film.repair_total_film,0)) as pending_repair_film, +isnull(repair_film.repair_film,0) as pending_repair_film,--Ƭ + +isnull(repair_current_count.repair_current_count,0) as repair_current_count,--췵 + +isnull(repair_total_count.repair_total_count,0) as repair_total_count, --췵ۼ +--(isnull(check_count.check_count,0) - isnull(total_check_Pass_count.total_check_Pass_count,0))-isnull(repair_total_count.repair_total_count,0) as pending_repair_count --췵 (ۼƼⲻϸڣ-췵ۼ) +isnull(repair_count.repair_count,0) as pending_repair_count +FROM HJGL_BS_NDTType AS NDTType +LEFT JOIN Base_Project ON Base_Project.ProjectId=@ProjectId +--⺸ +LEFT JOIN (SELECT COUNT(*) AS need_check_count,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + LEFT JOIN HJGL_PW_JointInfo ON HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS need_check_count ON need_check_count.CH_NDTMethod = NDTType.NDT_ID + +--ίк +LEFT JOIN (SELECT COUNT(*) AS trust_count_current,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + LEFT JOIN HJGL_PW_JointInfo ON HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId AND CONVERT(varchar(10), HJGL_CH_Trust.CH_TrustDate,120)=@trustDate + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS trust_count_current ON trust_count_current.CH_NDTMethod = NDTType.NDT_ID + +--ۼίк +LEFT JOIN (SELECT COUNT(*) AS trust_count_total,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + LEFT JOIN HJGL_PW_JointInfo ON HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS trust_count_total ON trust_count_total.CH_NDTMethod = NDTType.NDT_ID + +--ռ⺸ +LEFT JOIN (SELECT COUNT(*) AS check_count_current,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + LEFT JOIN HJGL_PW_JointInfo ON HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_TrustItem.States!='1' + AND HJGL_CH_Trust.ProjectId=@ProjectId AND CONVERT(varchar(10), HJGL_CH_Trust.CH_TrustDate,120)=@trustDate + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS check_count_current ON check_count_current.CH_NDTMethod = NDTType.NDT_ID + +--ۼƼ⺸ +LEFT JOIN (SELECT COUNT(*) AS check_count,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + LEFT JOIN HJGL_PW_JointInfo ON HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_TrustItem.States!='1' and HJGL_PW_JointInfo.PointType='' + AND HJGL_CH_Trust.ProjectId=@ProjectId + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS check_count ON check_count.CH_NDTMethod = NDTType.NDT_ID + +--ۼƺϸ񺸿 +LEFT JOIN (SELECT COUNT(*) AS total_check_Pass_count,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId AND HJGL_CH_TrustItem.States='2' and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS total_check_Pass_count ON total_check_Pass_count.CH_NDTMethod = NDTType.NDT_ID + + +----ۼƼƬ +LEFT JOIN (SELECT COUNT(*) AS check_count_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRating + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_BO_QualityRating.CH_TrustItemID + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId and HJGL_CH_TrustItem.States!='1' and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS check_count_film ON check_count_film.CH_NDTMethod = NDTType.NDT_ID + +--ۼһκϸ񺸿 +LEFT JOIN (SELECT COUNT(*) AS one_check_Pass_count,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId AND HJGL_CH_TrustItem.States='2' and HJGL_PW_JointInfo.PointType='' + and HJGL_CH_TrustItem.JOT_ID not in (select JOT_ID from HJGL_CH_Repair) + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS one_check_Pass_count ON one_check_Pass_count.CH_NDTMethod = NDTType.NDT_ID + +--ۼһκϸƬ +LEFT JOIN (SELECT COUNT(*) AS one_check_Pass_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRating + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_BO_QualityRating.CH_TrustItemID + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId AND HJGL_CH_TrustItem.States='2' and HJGL_PW_JointInfo.PointType='' + and HJGL_CH_TrustItem.JOT_ID not in (select JOT_ID from HJGL_CH_Repair) + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS one_check_Pass_film ON one_check_Pass_film.CH_NDTMethod = NDTType.NDT_ID + +--ۼƼⲻϸ +--LEFT JOIN (SELECT COUNT(*) AS check_NoPass_count,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_CH_TrustItem +-- LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID +-- left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID +-- WHERE HJGL_CH_Trust.ProjectId=@ProjectId AND HJGL_CH_TrustItem.JOT_ID in (select JOT_ID from HJGL_CH_Repair) +-- and HJGL_PW_JointInfo.PointType='' +-- GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS check_NoPass_count ON check_NoPass_count.CH_NDTMethod = NDTType.NDT_ID + +--ۼƺϸƬ +--LEFT JOIN (SELECT COUNT(*) AS check_count_Pass_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRating +-- LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_BO_QualityRating.CH_TrustItemID +-- LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID +-- left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID +-- WHERE HJGL_BO_QualityRating.IsPass='ϸ' and HJGL_CH_Trust.ProjectId=@ProjectId and HJGL_PW_JointInfo.PointType='' +-- GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS check_count_Pass_film ON check_count_Pass_film.CH_NDTMethod = NDTType.NDT_ID + +--ۼƲϸƬ +LEFT JOIN (SELECT COUNT(*) AS check_count_NoPass_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRating + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_BO_QualityRating.CH_TrustItemID + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_BO_QualityRating.IsPass='ϸ' and HJGL_CH_Trust.ProjectId=@ProjectId and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS check_count_NoPass_film ON check_count_NoPass_film.CH_NDTMethod = NDTType.NDT_ID + +--췵Ƭɣ +LEFT JOIN (SELECT COUNT(*) AS repair_current_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRatingRepair + LEFT JOIN HJGL_CH_RepairItem ON HJGL_CH_RepairItem.CH_RepairItemId = HJGL_BO_QualityRatingRepair.CH_RepairItemId + LEFT JOIN HJGL_CH_Repair ON HJGL_CH_Repair.CH_RepairID = HJGL_CH_RepairItem.CH_RepairID + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_CH_Repair.TrustItemID + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId AND CONVERT(varchar(10),HJGL_CH_Repair.RepairTrustDate,120)=@trustDate + and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS repair_current_film ON repair_current_film.CH_NDTMethod = NDTType.NDT_ID + +--췵Ƭۼɣ +LEFT JOIN (SELECT COUNT(*) AS repair_total_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRatingRepair + LEFT JOIN HJGL_CH_RepairItem ON HJGL_CH_RepairItem.CH_RepairItemId = HJGL_BO_QualityRatingRepair.CH_RepairItemId + LEFT JOIN HJGL_CH_Repair ON HJGL_CH_Repair.CH_RepairID = HJGL_CH_RepairItem.CH_RepairID + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_CH_Repair.TrustItemID + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS repair_total_film ON repair_total_film.CH_NDTMethod = NDTType.NDT_ID +--ޣƬ +LEFT JOIN (SELECT COUNT(*) AS repair_film,HJGL_CH_Trust.CH_NDTMethod FROM HJGL_BO_QualityRatingRepair + LEFT JOIN HJGL_CH_RepairItem ON HJGL_CH_RepairItem.CH_RepairItemId = HJGL_BO_QualityRatingRepair.CH_RepairItemId + LEFT JOIN HJGL_CH_Repair ON HJGL_CH_Repair.CH_RepairID = HJGL_CH_RepairItem.CH_RepairID + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_CH_Repair.TrustItemID + LEFT JOIN HJGL_CH_Trust ON HJGL_CH_Trust.CH_TrustID = HJGL_CH_TrustItem.CH_TrustID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Trust.ProjectId=@ProjectId and HJGL_CH_RepairItem.States='4'and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Trust.CH_NDTMethod) AS repair_film ON repair_film.CH_NDTMethod = NDTType.NDT_ID +--췵 +left join (select count(*) as repair_current_count,HJGL_CH_Repair.NDT_ID from HJGL_CH_RepairItem + LEFT JOIN HJGL_CH_Repair ON HJGL_CH_Repair.CH_RepairID = HJGL_CH_RepairItem.CH_RepairID + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_CH_Repair.TrustItemID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_RepairItem.States='4' AND HJGL_CH_Repair.ProjectId=@ProjectId AND CONVERT(varchar(10),HJGL_CH_Repair.RepairTrustDate,120)=@trustDate + and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Repair.NDT_ID) as repair_current_count on repair_current_count.NDT_ID =NDTType.NDT_ID + +--췵 ۼ +left join (select count(*) as repair_total_count,HJGL_CH_Repair.NDT_ID from HJGL_CH_RepairItem + LEFT JOIN HJGL_CH_Repair ON HJGL_CH_Repair.CH_RepairID = HJGL_CH_RepairItem.CH_RepairID + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_CH_Repair.TrustItemID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Repair.ProjectId=@ProjectId and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Repair.NDT_ID) as repair_total_count on repair_total_count.NDT_ID =NDTType.NDT_ID + +--췵 +left join (select count(*) as repair_count,HJGL_CH_Repair.NDT_ID from HJGL_CH_RepairItem + LEFT JOIN HJGL_CH_Repair ON HJGL_CH_Repair.CH_RepairID = HJGL_CH_RepairItem.CH_RepairID + LEFT JOIN HJGL_CH_TrustItem ON HJGL_CH_TrustItem.CH_TrustItemID = HJGL_CH_Repair.TrustItemID + left join HJGL_PW_JointInfo on HJGL_PW_JointInfo.JOT_ID = HJGL_CH_TrustItem.JOT_ID + WHERE HJGL_CH_Repair.ProjectId=@ProjectId and HJGL_CH_RepairItem.States='4' and HJGL_PW_JointInfo.PointType='' + GROUP BY HJGL_CH_Repair.NDT_ID) as repair_count on repair_count.NDT_ID =NDTType.NDT_ID + +GO + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index a2d7843..5b6985d 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -247,6 +247,7 @@ + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 723c035..d2cfd87 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Drawing.Printing; using System.Linq; using System.Text; @@ -1774,6 +1775,11 @@ namespace BLL /// 工程联络单 /// public const string JGZL_ContactMenuId = "05725865-4CC9-43A0-A525-F2730019F61C"; + + /// + /// 施工图核查记录 + /// + public const string JGZL_ConDrawingVerificationMenuId = "E6221F7D-9A68-44FB-974D-6857EC9CC5E8"; #endregion #region 报表对应ID diff --git a/HJGL_DS/BLL/JGZL/ConDrawingVerificationService.cs b/HJGL_DS/BLL/JGZL/ConDrawingVerificationService.cs new file mode 100644 index 0000000..a3ccbac --- /dev/null +++ b/HJGL_DS/BLL/JGZL/ConDrawingVerificationService.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 施工图核查记录 + /// + public class ConDrawingVerificationService + { + /// + /// 根据主键获取施工图核查记录 + /// + /// + /// + public static Model.JGZL_ConDrawingVerification GetConDrawingVerificationById(string conDrawingVerificationId) + { + return Funs.DB.JGZL_ConDrawingVerification.FirstOrDefault(e => e.ConDrawingVerificationId == conDrawingVerificationId); + } + + /// + /// 添加 + /// + /// + public static void AddConDrawingVerification(Model.JGZL_ConDrawingVerification con) + { + Model.SGGLDB db = Funs.DB; + Model.JGZL_ConDrawingVerification newCon = new Model.JGZL_ConDrawingVerification(); + newCon.ConDrawingVerificationId = con.ConDrawingVerificationId; + newCon.ProjectId = con.ProjectId; + newCon.DesignUnit = con.DesignUnit; + newCon.Professional = con.Professional; + newCon.Host = con.Host; + newCon.VerificationDate = con.VerificationDate; + newCon.ConDrawingCode= con.ConDrawingCode; + newCon.Personnel = con.Personnel; + newCon.Contents = con.Contents; + newCon.Problems = con.Problems; + newCon.Recorder = con.Recorder; + newCon.RecordDate = con.RecordDate; + newCon.Reviewer = con.Reviewer; + newCon.ReviewDate = con.ReviewDate; + newCon.CompileMan = con.CompileMan; + newCon.CompileDate = con.CompileDate; + db.JGZL_ConDrawingVerification.InsertOnSubmit(newCon); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateConDrawingVerification(Model.JGZL_ConDrawingVerification con) + { + Model.SGGLDB db = Funs.DB; + Model.JGZL_ConDrawingVerification newCon = db.JGZL_ConDrawingVerification.FirstOrDefault(e => e.ConDrawingVerificationId == con.ConDrawingVerificationId); + if (newCon != null) + { + newCon.DesignUnit = con.DesignUnit; + newCon.Professional = con.Professional; + newCon.Host = con.Host; + newCon.VerificationDate = con.VerificationDate; + newCon.ConDrawingCode = con.ConDrawingCode; + newCon.Personnel = con.Personnel; + newCon.Contents = con.Contents; + newCon.Problems = con.Problems; + newCon.Recorder = con.Recorder; + newCon.RecordDate = con.RecordDate; + newCon.Reviewer = con.Reviewer; + newCon.ReviewDate = con.ReviewDate; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除施工图核查记录 + /// + /// + public static void DeleteConDrawingVerificationById(string conDrawingVerificationId) + { + Model.SGGLDB db = Funs.DB; + Model.JGZL_ConDrawingVerification con = db.JGZL_ConDrawingVerification.FirstOrDefault(e => e.ConDrawingVerificationId == conDrawingVerificationId); + if (con != null) + { + db.JGZL_ConDrawingVerification.DeleteOnSubmit(con); + db.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt index ca5ee40..603326b 100644 --- a/HJGL_DS/FineUIPro.Web/ErrLog.txt +++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt @@ -72,3 +72,39 @@ IP地址:::1 出错时间:12/15/2025 10:15:48 + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.JGZL.ConDrawingVerification.Page_Load(Object sender, EventArgs e) 位置 E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\JGZL\ConDrawingVerification.aspx.cs:行号 30 + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:12/17/2025 23:03:12 +出错文件:http://localhost:60961/JGZL/ConDrawingVerification.aspx +IP地址:::1 + +出错时间:12/17/2025 23:03:12 + +出错时间:12/17/2025 23:03:12 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.JGZL.ConDrawingVerification.Page_Load(Object sender, EventArgs e) 位置 E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\JGZL\ConDrawingVerification.aspx.cs:行号 30 + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:12/17/2025 23:07:59 +出错文件:http://localhost:60961/JGZL/ConDrawingVerification.aspx +IP地址:::1 + +出错时间:12/17/2025 23:07:59 + +出错时间:12/17/2025 23:07:59 + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx index 0c6a6ce..4628c44 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/施工图核查记录.frx @@ -1,6 +1,20 @@  - - + + + + + + + + + + + + + + + + @@ -23,7 +37,7 @@ - + @@ -36,31 +50,31 @@ - + - + - + - + - + - - + + @@ -75,7 +89,7 @@ - + @@ -91,7 +105,7 @@ - + @@ -105,12 +119,12 @@ - - + + - - + + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 1bfdae6..4d2521d 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1245,6 +1245,8 @@ + + @@ -6556,6 +6558,20 @@ CommencementReportEdit.aspx + + ConDrawingVerification.aspx + ASPXCodeBehind + + + ConDrawingVerification.aspx + + + ConDrawingVerificationEidt.aspx + ASPXCodeBehind + + + ConDrawingVerificationEidt.aspx + Contact.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx new file mode 100644 index 0000000..3830d98 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx @@ -0,0 +1,136 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConDrawingVerification.aspx.cs" Inherits="FineUIPro.Web.JGZL.ConDrawingVerification" %> + + + + + + + 施工图核查记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs new file mode 100644 index 0000000..395045b --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.cs @@ -0,0 +1,391 @@ +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; +using System.IO; + +namespace FineUIPro.Web.JGZL +{ + public partial class ConDrawingVerification :PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + + this.InitTreeMenu();//加载树 + } + } + #endregion + + #region 加载树项目 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "项目"; + rootNode.ToolTip = "项目"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + List projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + projects = projects.Where(e => e.ProjectId == this.drpProjectId.SelectedValue).ToList(); + } + foreach (var item in projects) + { + TreeNode rootProjectNode = new TreeNode();//定义根节点 + rootProjectNode.Text = item.ProjectCode; + rootProjectNode.NodeID = item.ProjectId; + rootProjectNode.EnableClickEvent = true; + rootProjectNode.Expanded = true; + rootProjectNode.ToolTip = item.ProjectName; + rootProjectNode.CommandName = "项目名称"; + rootNode.Nodes.Add(rootProjectNode); + } + } + #endregion + + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + if (this.tvControlItem.SelectedNodeID != "0") + { + this.BindGrid(); + } + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + { + //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); + string strSql = @"SELECT * from JGZL_ConDrawingVerification where 1=1"; + List listStr = new List(); + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + strSql += " AND ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); + } + //else + //{ + // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; + // listStr.Add(new SqlParameter("@ProjectId", projectIds)); + //} + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.获取当前分页数据 + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页排序 + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + + #region 查询 + /// + ///查询 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + string projectId = this.tvControlItem.SelectedNodeID; + + if (projectId != null) + { + if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + { + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + + var report = BLL.ConDrawingVerificationService.GetConDrawingVerificationById(this.Grid1.SelectedRowID); + if (report != null) + { + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("DesignUnit", report.DesignUnit); + keyValuePairs.Add("Professional", report.Professional); + keyValuePairs.Add("Host", report.Host); + keyValuePairs.Add("VerificationDate", report.VerificationDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.VerificationDate) : ""); + keyValuePairs.Add("ConDrawingCode", report.ConDrawingCode); + keyValuePairs.Add("Personnel", report.Personnel); + keyValuePairs.Add("Contents", report.Contents); + keyValuePairs.Add("Problems", report.Problems); + keyValuePairs.Add("Recorder", report.Recorder); + keyValuePairs.Add("RecordDate", report.RecordDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.RecordDate) : ""); + keyValuePairs.Add("Reviewer", report.Reviewer); + keyValuePairs.Add("ReviewDate", report.ReviewDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.ReviewDate) : ""); + + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + } + initTemplatePath = "File\\Fastreport\\JGZL\\施工图核查记录.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } + } + else + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 维护 + /// + /// 增加 + /// + /// + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConDrawingVerificationEidt.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + + /// + /// 双击编辑 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConDrawingVerificationMenuId, BLL.Const.BtnModify)) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConDrawingVerificationEidt.aspx?conDrawingVerificationId={0}", this.Grid1.SelectedRowID, "编辑 - "))); + } + else + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 右键编辑 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConDrawingVerificationMenuId, BLL.Const.BtnModify)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConDrawingVerificationEidt.aspx?conDrawingVerificationId={0}", Grid1.SelectedRowID, "维护 - "))); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConDrawingVerificationMenuId, Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + + bool isShow = true; + if (Grid1.SelectedRowIndexArray.Length > 1) + { + isShow = false; + } + bool isDelete = false; + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (judgementDelete(rowID, isShow)) + { + isDelete = true; + BLL.ConDrawingVerificationService.DeleteConDrawingVerificationById(rowID); + BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除施工图核查记录"); + } + } + if (isDelete) + { + ShowNotify("删除成功！", MessageBoxIcon.Success); + } + this.BindGrid(); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + #region 判断是否可删除 + /// + /// 判断是否可以删除 + /// + /// + private bool judgementDelete(string id, bool isShow) + { + string content = string.Empty; + + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content, MessageBoxIcon.Error); + } + return false; + } + } + #endregion + #endregion + + #region 关闭弹出窗口及刷新页面 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.InitTreeMenu();//加载树 + this.BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.designer.cs new file mode 100644 index 0000000..eaac192 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx.designer.cs @@ -0,0 +1,206 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class ConDrawingVerification + { + + /// + /// 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; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx new file mode 100644 index 0000000..fbff4e6 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx @@ -0,0 +1,75 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConDrawingVerificationEidt.aspx.cs" Inherits="FineUIPro.Web.JGZL.ConDrawingVerificationEidt" %> + + + + + + + 编辑施工图核查记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs new file mode 100644 index 0000000..e75d5e0 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs @@ -0,0 +1,133 @@ +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.JGZL +{ + public partial class ConDrawingVerificationEidt : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string ConDrawingVerificationId + { + get + { + return (string)ViewState["ConDrawingVerificationId"]; + } + set + { + ViewState["ConDrawingVerificationId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = Request.Params["projectId"]; + this.ConDrawingVerificationId = Request.Params["conDrawingVerificationId"]; + if (!string.IsNullOrEmpty(this.ConDrawingVerificationId)) + { + var report = BLL.ConDrawingVerificationService.GetConDrawingVerificationById(this.ConDrawingVerificationId); + if (report != null) + { + this.txtDesignUnit.Text = report.DesignUnit; + this.txtProfessional.Text = report.Professional; + this.txtHost.Text = report.Host; + this.txtVerificationDate.Text = report.VerificationDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.VerificationDate) : ""; + this.txtConDrawingCode.Text = report.ConDrawingCode; + this.txtPersonnel.Text = report.Personnel; + this.txtContents.Text= report.Contents; + this.txtProblems.Text = report.Problems; + this.txtRecorder.Text = report.Recorder; + this.txtRecordDate.Text = report.RecordDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.RecordDate) : ""; + this.txtReviewer.Text = report.Reviewer; + this.txtReviewDate.Text = report.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReviewDate) : ""; + } + } + else + { + this.txtVerificationDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtConDrawingCode.Text = BLL.Base_ProjectService.GetProjectCode(this.ProjectId); + } + } + } + #endregion + + #region 提交按钮 + /// + /// 提交按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConDrawingVerificationMenuId, Const.BtnSave)) + { + Model.JGZL_ConDrawingVerification newReport = new Model.JGZL_ConDrawingVerification(); + newReport.DesignUnit = this.txtDesignUnit.Text.Trim(); + newReport.Professional=this.txtProfessional.Text.Trim(); + newReport.Host = this.txtHost.Text.Trim(); + newReport.VerificationDate = Funs.GetNewDateTime(this.txtVerificationDate.Text); + newReport.ConDrawingCode = txtConDrawingCode.Text.Trim(); + newReport.Personnel = this.txtPersonnel.Text; + newReport.Contents = this.txtContents.Text; + newReport.Problems = this.txtProblems.Text; + newReport.Recorder = this.txtRecorder.Text.Trim(); + newReport.RecordDate = Funs.GetNewDateTime(this.txtRecordDate.Text.Trim()); + newReport.Reviewer=this.txtReviewer.Text.Trim(); + newReport.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text.Trim()); + if (!string.IsNullOrEmpty(this.ConDrawingVerificationId)) + { + newReport.ConDrawingVerificationId = this.ConDrawingVerificationId; + BLL.ConDrawingVerificationService.UpdateConDrawingVerification(newReport); + } + else + { + newReport.ProjectId = this.ProjectId; + newReport.CompileMan = this.CurrUser.UserId; + newReport.CompileDate = DateTime.Now; + newReport.ConDrawingVerificationId = SQLHelper.GetNewID(typeof(Model.JGZL_ConDrawingVerification)); + this.ConDrawingVerificationId = newReport.ConDrawingVerificationId; + BLL.ConDrawingVerificationService.AddConDrawingVerification(newReport); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs new file mode 100644 index 0000000..883d5a3 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs @@ -0,0 +1,179 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class ConDrawingVerificationEidt + { + + /// + /// 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; + + /// + /// txtDesignUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDesignUnit; + + /// + /// txtProfessional 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProfessional; + + /// + /// txtHost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHost; + + /// + /// txtVerificationDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtVerificationDate; + + /// + /// txtConDrawingCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConDrawingCode; + + /// + /// txtPersonnel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtPersonnel; + + /// + /// txtContents 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtContents; + + /// + /// txtProblems 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblems; + + /// + /// txtRecorder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRecorder; + + /// + /// txtRecordDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRecordDate; + + /// + /// txtReviewer 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReviewer; + + /// + /// txtReviewDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtReviewDate; + } +} diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index e233efb..5c46a5b 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index ff34b7b..3144696 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -377,6 +377,9 @@ namespace Model partial void InsertJGZL_CommencementReport(JGZL_CommencementReport instance); partial void UpdateJGZL_CommencementReport(JGZL_CommencementReport instance); partial void DeleteJGZL_CommencementReport(JGZL_CommencementReport instance); + partial void InsertJGZL_ConDrawingVerification(JGZL_ConDrawingVerification instance); + partial void UpdateJGZL_ConDrawingVerification(JGZL_ConDrawingVerification instance); + partial void DeleteJGZL_ConDrawingVerification(JGZL_ConDrawingVerification instance); partial void InsertJGZL_Contact(JGZL_Contact instance); partial void UpdateJGZL_Contact(JGZL_Contact instance); partial void DeleteJGZL_Contact(JGZL_Contact instance); @@ -1755,6 +1758,14 @@ namespace Model } } + public System.Data.Linq.Table JGZL_ConDrawingVerification + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JGZL_Contact { get @@ -4356,6 +4367,8 @@ namespace Model private EntitySet _JGZL_CommencementReport; + private EntitySet _JGZL_ConDrawingVerification; + private EntitySet _JGZL_Contact; private EntitySet _JGZL_HandoverCertificate; @@ -4486,6 +4499,7 @@ namespace Model this._HJGL_WeldingProcedure_WeldHotProcessCard = new EntitySet(new Action(this.attach_HJGL_WeldingProcedure_WeldHotProcessCard), new Action(this.detach_HJGL_WeldingProcedure_WeldHotProcessCard)); this._JGZL_AcceptanceCertificate = new EntitySet(new Action(this.attach_JGZL_AcceptanceCertificate), new Action(this.detach_JGZL_AcceptanceCertificate)); this._JGZL_CommencementReport = new EntitySet(new Action(this.attach_JGZL_CommencementReport), new Action(this.detach_JGZL_CommencementReport)); + this._JGZL_ConDrawingVerification = new EntitySet(new Action(this.attach_JGZL_ConDrawingVerification), new Action(this.detach_JGZL_ConDrawingVerification)); this._JGZL_Contact = new EntitySet(new Action(this.attach_JGZL_Contact), new Action(this.detach_JGZL_Contact)); this._JGZL_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); this._Project_Installation = new EntitySet(new Action(this.attach_Project_Installation), new Action(this.detach_Project_Installation)); @@ -5581,6 +5595,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ConDrawingVerification_Base_Project", Storage="_JGZL_ConDrawingVerification", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JGZL_ConDrawingVerification + { + get + { + return this._JGZL_ConDrawingVerification; + } + set + { + this._JGZL_ConDrawingVerification.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_Contact_Base_Project", Storage="_JGZL_Contact", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JGZL_Contact { @@ -6289,6 +6316,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JGZL_ConDrawingVerification(JGZL_ConDrawingVerification entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JGZL_ConDrawingVerification(JGZL_ConDrawingVerification entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JGZL_Contact(JGZL_Contact entity) { this.SendPropertyChanging(); @@ -80093,6 +80132,510 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_ConDrawingVerification")] + public partial class JGZL_ConDrawingVerification : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ConDrawingVerificationId; + + private string _ProjectId; + + private string _DesignUnit; + + private string _Professional; + + private string _Host; + + private System.Nullable _VerificationDate; + + private string _ConDrawingCode; + + private string _Personnel; + + private string _Contents; + + private string _Problems; + + private string _Recorder; + + private System.Nullable _RecordDate; + + private string _Reviewer; + + private System.Nullable _ReviewDate; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private EntityRef _Base_Project; + + private EntityRef _Sys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnConDrawingVerificationIdChanging(string value); + partial void OnConDrawingVerificationIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnDesignUnitChanging(string value); + partial void OnDesignUnitChanged(); + partial void OnProfessionalChanging(string value); + partial void OnProfessionalChanged(); + partial void OnHostChanging(string value); + partial void OnHostChanged(); + partial void OnVerificationDateChanging(System.Nullable value); + partial void OnVerificationDateChanged(); + partial void OnConDrawingCodeChanging(string value); + partial void OnConDrawingCodeChanged(); + partial void OnPersonnelChanging(string value); + partial void OnPersonnelChanged(); + partial void OnContentsChanging(string value); + partial void OnContentsChanged(); + partial void OnProblemsChanging(string value); + partial void OnProblemsChanged(); + partial void OnRecorderChanging(string value); + partial void OnRecorderChanged(); + partial void OnRecordDateChanging(System.Nullable value); + partial void OnRecordDateChanged(); + partial void OnReviewerChanging(string value); + partial void OnReviewerChanged(); + partial void OnReviewDateChanging(System.Nullable value); + partial void OnReviewDateChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public JGZL_ConDrawingVerification() + { + this._Base_Project = default(EntityRef); + this._Sys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConDrawingVerificationId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ConDrawingVerificationId + { + get + { + return this._ConDrawingVerificationId; + } + set + { + if ((this._ConDrawingVerificationId != value)) + { + this.OnConDrawingVerificationIdChanging(value); + this.SendPropertyChanging(); + this._ConDrawingVerificationId = value; + this.SendPropertyChanged("ConDrawingVerificationId"); + this.OnConDrawingVerificationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignUnit", DbType="NVarChar(50)")] + public string DesignUnit + { + get + { + return this._DesignUnit; + } + set + { + if ((this._DesignUnit != value)) + { + this.OnDesignUnitChanging(value); + this.SendPropertyChanging(); + this._DesignUnit = value; + this.SendPropertyChanged("DesignUnit"); + this.OnDesignUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Professional", DbType="NVarChar(50)")] + public string Professional + { + get + { + return this._Professional; + } + set + { + if ((this._Professional != value)) + { + this.OnProfessionalChanging(value); + this.SendPropertyChanging(); + this._Professional = value; + this.SendPropertyChanged("Professional"); + this.OnProfessionalChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Host", DbType="NVarChar(50)")] + public string Host + { + get + { + return this._Host; + } + set + { + if ((this._Host != value)) + { + this.OnHostChanging(value); + this.SendPropertyChanging(); + this._Host = value; + this.SendPropertyChanged("Host"); + this.OnHostChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VerificationDate", DbType="DateTime")] + public System.Nullable VerificationDate + { + get + { + return this._VerificationDate; + } + set + { + if ((this._VerificationDate != value)) + { + this.OnVerificationDateChanging(value); + this.SendPropertyChanging(); + this._VerificationDate = value; + this.SendPropertyChanged("VerificationDate"); + this.OnVerificationDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConDrawingCode", DbType="NVarChar(50)")] + public string ConDrawingCode + { + get + { + return this._ConDrawingCode; + } + set + { + if ((this._ConDrawingCode != value)) + { + this.OnConDrawingCodeChanging(value); + this.SendPropertyChanging(); + this._ConDrawingCode = value; + this.SendPropertyChanged("ConDrawingCode"); + this.OnConDrawingCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personnel", DbType="NVarChar(2000)")] + public string Personnel + { + get + { + return this._Personnel; + } + set + { + if ((this._Personnel != value)) + { + this.OnPersonnelChanging(value); + this.SendPropertyChanging(); + this._Personnel = value; + this.SendPropertyChanged("Personnel"); + this.OnPersonnelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Contents", DbType="NVarChar(2000)")] + public string Contents + { + get + { + return this._Contents; + } + set + { + if ((this._Contents != value)) + { + this.OnContentsChanging(value); + this.SendPropertyChanging(); + this._Contents = value; + this.SendPropertyChanged("Contents"); + this.OnContentsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problems", DbType="NVarChar(2000)")] + public string Problems + { + get + { + return this._Problems; + } + set + { + if ((this._Problems != value)) + { + this.OnProblemsChanging(value); + this.SendPropertyChanging(); + this._Problems = value; + this.SendPropertyChanged("Problems"); + this.OnProblemsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Recorder", DbType="NVarChar(50)")] + public string Recorder + { + get + { + return this._Recorder; + } + set + { + if ((this._Recorder != value)) + { + this.OnRecorderChanging(value); + this.SendPropertyChanging(); + this._Recorder = value; + this.SendPropertyChanged("Recorder"); + this.OnRecorderChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordDate", DbType="DateTime")] + public System.Nullable RecordDate + { + get + { + return this._RecordDate; + } + set + { + if ((this._RecordDate != value)) + { + this.OnRecordDateChanging(value); + this.SendPropertyChanging(); + this._RecordDate = value; + this.SendPropertyChanged("RecordDate"); + this.OnRecordDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reviewer", DbType="NVarChar(50)")] + public string Reviewer + { + get + { + return this._Reviewer; + } + set + { + if ((this._Reviewer != value)) + { + this.OnReviewerChanging(value); + this.SendPropertyChanging(); + this._Reviewer = value; + this.SendPropertyChanged("Reviewer"); + this.OnReviewerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")] + public System.Nullable ReviewDate + { + get + { + return this._ReviewDate; + } + set + { + if ((this._ReviewDate != value)) + { + this.OnReviewDateChanging(value); + this.SendPropertyChanging(); + this._ReviewDate = value; + this.SendPropertyChanged("ReviewDate"); + this.OnReviewDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ConDrawingVerification_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.JGZL_ConDrawingVerification.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JGZL_ConDrawingVerification.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ConDrawingVerification_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.JGZL_ConDrawingVerification.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.JGZL_ConDrawingVerification.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_Contact")] public partial class JGZL_Contact : INotifyPropertyChanging, INotifyPropertyChanged { @@ -102434,6 +102977,8 @@ namespace Model private EntitySet _JGZL_CommencementReport; + private EntitySet _JGZL_ConDrawingVerification; + private EntitySet _JGZL_Contact; private EntitySet _JGZL_HandoverCertificate; @@ -102521,6 +103066,7 @@ namespace Model this._HJGL_WeldingProcedure_WeldHotProcessCard = new EntitySet(new Action(this.attach_HJGL_WeldingProcedure_WeldHotProcessCard), new Action(this.detach_HJGL_WeldingProcedure_WeldHotProcessCard)); this._JGZL_AcceptanceCertificate = new EntitySet(new Action(this.attach_JGZL_AcceptanceCertificate), new Action(this.detach_JGZL_AcceptanceCertificate)); this._JGZL_CommencementReport = new EntitySet(new Action(this.attach_JGZL_CommencementReport), new Action(this.detach_JGZL_CommencementReport)); + this._JGZL_ConDrawingVerification = new EntitySet(new Action(this.attach_JGZL_ConDrawingVerification), new Action(this.detach_JGZL_ConDrawingVerification)); this._JGZL_Contact = new EntitySet(new Action(this.attach_JGZL_Contact), new Action(this.detach_JGZL_Contact)); this._JGZL_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); this._Project_User = new EntitySet(new Action(this.attach_Project_User), new Action(this.detach_Project_User)); @@ -103187,6 +103733,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ConDrawingVerification_Sys_User", Storage="_JGZL_ConDrawingVerification", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet JGZL_ConDrawingVerification + { + get + { + return this._JGZL_ConDrawingVerification; + } + set + { + this._JGZL_ConDrawingVerification.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_Contact_Sys_User", Storage="_JGZL_Contact", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet JGZL_Contact { @@ -103604,6 +104163,18 @@ namespace Model entity.Sys_User = null; } + private void attach_JGZL_ConDrawingVerification(JGZL_ConDrawingVerification entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_JGZL_ConDrawingVerification(JGZL_ConDrawingVerification entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_JGZL_Contact(JGZL_Contact entity) { this.SendPropertyChanging();