diff --git a/DataBase/版本日志/HJGLDB_DS_2026-01-23_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-01-23_gf.sql
new file mode 100644
index 0000000..c39069d
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-01-23_gf.sql
@@ -0,0 +1,225 @@
+
+ALTER VIEW [dbo].[View_UnitPerformance]
+AS
+SELECT
+ NEWID() AS Id,
+ --total.ProjectId,
+ --project.ProjectCode,--ʩ
+ '' as ProjectCode,
+ total.WED_Unit,
+ un.UnitCode,-- λ
+ un.UnitName,--λ
+ -------------start
+ CAST(ISNULL(total.totalSize,0) AS DECIMAL(19,2)) AS totalSize, --ܴ羶
+ ISNULL(total.totalJoint,0) AS totalJoint, --ܺ
+ ISNULL(JointNum1.JointNum1,0) AS JointNum1, --һƬ
+
+ ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS JointPassNum1, --һƬϸ
+ ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS RepairJoint1, --һη
+ ISNULL(RepairJoint2.RepairJoint2,0) AS RepairJoint2, --η
+ ISNULL(RepairJoint3.RepairJoint3,0) AS RepairJoint3, --η
+
+ CAST((CASE ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0) WHEN 0 THEN 0
+ ELSE (CASE(ISNULL(JointNum1.JointNum1,0)) WHEN 0 THEN 0
+ ELSE 1.0 * ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0)/(1.0 * JointNum1.JointNum1)*100
+ END)END) AS DECIMAL(19,3)) AS JointPassRate , ---һƬںϸ
+
+ ISNULL(JointNum1.totalfilm,0) AS totalfilm, --һƬ
+ (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) AS totalPassfilm, --һƬϸ
+ ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0) AS repairFilm1, --һηƬ
+
+ ISNULL(RepairJoint2.repairFilm2,0) AS repairFilm2, --ηƬ
+ ISNULL(RepairJoint3.repairFilm3,0) AS repairFilm3, --ηƬ
+
+ CAST((CASE (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) WHEN 0 THEN 0
+ ELSE (CASE(ISNULL(JointNum1.totalfilm,0)) WHEN 0 THEN 0
+ ELSE 1.0 * (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0))/(1.0 * JointNum1.totalfilm)*100
+ END) END) AS DECIMAL(19,3)) AS JointFilmPassRate ---һƬϸ
+
+FROM
+ --ֵܴ --ܺ
+ (SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
+ ,joint.WED_Unit
+ FROM View_JointWelder joint
+ LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID
+ WHERE joint.DReportID IS NOT NULL and report.JOT_WeldDate >= '2026-01-01'
+ GROUP BY joint.WED_Unit) AS total
+
+
+--һƬ , һƬ,һƬϸ
+ LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS JointNum1, SUM(joint.RT_FilmNum) AS totalfilm,
+ joint.WED_Unit
+ FROM dbo.View_JointWelder joint
+ WHERE joint.PointType='' AND joint.RT_FilmNum IS NOT NULL and joint.RT_FilmNum>0 and (select COUNT(*) from dbo.HJGL_BO_QualityRating a
+left join HJGL_CH_TrustItem b on a.CH_TrustItemID=b.CH_TrustItemID
+left join HJGL_CH_Trust c on b.CH_TrustID=c.CH_TrustID where a.JOT_ID=joint.JOT_ID and FilmNum is not null and c.CH_NDTMethod='20d2cbca-8b3d-434b-b1c1-181796986fa5')>0
+ AND joint.dreportid IS NOT NULL
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)>= '2026-01-01'
+ GROUP BY joint.WED_Unit) AS JointNum1
+ ON JointNum1.WED_Unit = total.WED_Unit
+
+ --һƬϸ
+ LEFT JOIN (SELECT COUNT(distinct joint.JOT_ID) AS JointNoPassNum1,
+ joint.WED_Unit
+ FROM dbo.HJGL_CH_RepairItemRecord rr
+ left join dbo.View_JointWelder joint on rr.JOT_ID=joint.JOT_ID
+ WHERE joint.PointType='' and rr.NDT_ID='20d2cbca-8b3d-434b-b1c1-181796986fa5'
+ --AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
+ AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= '2026-01-01'
+ GROUP BY joint.WED_Unit) AS JointNoPassNum1
+ ON JointNoPassNum1.WED_Unit = total.WED_Unit
+ --һƬϸƬ
+ LEFT JOIN (SELECT count(rr.RepairItemRecordId) as JointNoPassFilmNum2,
+ joint.WED_Unit
+ FROM dbo.HJGL_CH_RepairItemRecord rr
+ left join dbo.View_JointWelder joint on rr.JOT_ID=joint.JOT_ID
+ WHERE joint.PointType='' and rr.NDT_ID='20d2cbca-8b3d-434b-b1c1-181796986fa5'
+ --AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
+ AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= '2026-01-01'
+ GROUP BY joint.WED_Unit) AS JointNoPassNum2
+ ON JointNoPassNum2.WED_Unit = total.WED_Unit
+ --ηƬ,ηƬ
+ LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint2, SUM(ISNULL(joint.RT2_RepairFilmNum,0)) AS RepairFilm2,
+ joint.WED_Unit
+ FROM dbo.View_JointWelder joint
+ WHERE joint.PointType='' AND joint.RT2_RepairFilm IS NOT NULL
+ AND joint.dreportid IS NOT NULL
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')>= '2026-01-01'
+ GROUP BY joint.WED_Unit) AS RepairJoint2
+ ON RepairJoint2.WED_Unit = total.WED_Unit
+
+
+
+ --ηƬ,ηƬ
+ LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint3, SUM(ISNULL(joint.RT3_RepairFilmNum,0)) AS RepairFilm3,
+ joint.WED_Unit
+ FROM dbo.View_JointWelder joint
+ WHERE joint.PointType='' AND joint.RT3_RepairFilm IS NOT NULL
+ AND joint.dreportid IS NOT NULL
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')>= '2026-01-01'
+ GROUP BY joint.WED_Unit) AS RepairJoint3
+ ON RepairJoint3.WED_Unit = total.WED_Unit
+
+--LEFT JOIN Base_Project project ON total.ProjectId=project.ProjectId
+LEFT JOIN dbo.Base_Unit un ON un.UnitId=total.WED_Unit
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_WelderPerformance]
+AS
+select v.* from
+(SELECT
+ NEWID() AS Id,
+ --total.ProjectId,
+ --project.ProjectCode,--ʩ
+ '' as ProjectCode,
+ total.Welder,
+ wld.wed_code,--
+ wld.wed_name,--
+ unit.UnitName as DepartName, --
+ wld.WED_Sex, --Ա
+ -------------start
+ CAST(ISNULL(total.totalSize,0) AS DECIMAL(19,2)) AS totalSize, --ܴ羶
+ ISNULL(total.totalJoint,0) AS totalJoint, --ܺ
+ ISNULL(JointNum1.JointNum1,0) AS JointNum1, --һƬ
+
+ ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS JointPassNum1, --һƬϸ
+ ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS RepairJoint1, --һη
+ ISNULL(RepairJoint2.RepairJoint2,0) AS RepairJoint2, --η
+ ISNULL(RepairJoint3.RepairJoint3,0) AS RepairJoint3, --η
+
+ CAST((CASE ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0) WHEN 0 THEN 0
+ ELSE (CASE(ISNULL(JointNum1.JointNum1,0)) WHEN 0 THEN 0
+ ELSE 1.0 * ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0)/(1.0 * JointNum1.JointNum1)
+ END)END) AS DECIMAL(19,3)) AS JointPassRate , ---һƬںϸ
+
+ ISNULL(JointNum1.totalfilm,0) AS totalfilm, --һƬ
+ (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) AS totalPassfilm, --һƬϸ
+ ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0) AS repairFilm1, --һηƬ
+
+ ISNULL(RepairJoint2.repairFilm2,0) AS repairFilm2, --ηƬ
+ ISNULL(RepairJoint3.repairFilm3,0) AS repairFilm3, --ηƬ
+
+ CAST((CASE (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) WHEN 0 THEN 0
+ ELSE (CASE(ISNULL(JointNum1.totalfilm,0)) WHEN 0 THEN 0
+ ELSE 1.0 * (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0))/(1.0 * JointNum1.totalfilm)
+ END) END) AS DECIMAL(19,3)) AS JointFilmPassRate ---һƬϸ
+
+FROM
+ --ֵܴ --ܺ
+ (SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
+ ,joint.Welder
+ FROM View_JointWelder joint
+ LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID
+ WHERE joint.DReportID IS NOT NULL and report.JOT_WeldDate >= '2026-01-01'
+ GROUP BY joint.Welder) AS total
+
+
+--һƬ , һƬ,һƬϸ
+ LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS JointNum1, SUM(joint.RT_FilmNum) AS totalfilm,
+ joint.Welder
+ FROM dbo.View_JointWelder joint
+ WHERE joint.PointType='' AND joint.RT_FilmNum IS NOT NULL and joint.RT_FilmNum>0 and (select COUNT(*) from dbo.HJGL_BO_QualityRating a
+left join HJGL_CH_TrustItem b on a.CH_TrustItemID=b.CH_TrustItemID
+left join HJGL_CH_Trust c on b.CH_TrustID=c.CH_TrustID where a.JOT_ID=joint.JOT_ID and FilmNum is not null and c.CH_NDTMethod='20d2cbca-8b3d-434b-b1c1-181796986fa5')>0
+ AND joint.dreportid IS NOT NULL
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)>= '2026-01-01'
+ GROUP BY joint.Welder) AS JointNum1
+ ON JointNum1.Welder = total.Welder
+
+ --һƬϸ
+ LEFT JOIN (SELECT COUNT(distinct joint.JOT_ID) AS JointNoPassNum1,
+ joint.Welder
+ FROM dbo.HJGL_CH_RepairItemRecord rr
+ left join dbo.View_JointWelder joint on rr.JOT_ID=joint.JOT_ID
+ WHERE joint.PointType='' and rr.NDT_ID='20d2cbca-8b3d-434b-b1c1-181796986fa5'
+ --AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
+ AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= '2026-01-01'
+ GROUP BY joint.Welder) AS JointNoPassNum1
+ ON JointNoPassNum1.Welder = total.Welder
+ --һƬϸƬ
+ LEFT JOIN (SELECT count(rr.RepairItemRecordId) as JointNoPassFilmNum2,
+ joint.Welder
+ FROM dbo.HJGL_CH_RepairItemRecord rr
+ left join dbo.View_JointWelder joint on rr.JOT_ID=joint.JOT_ID
+ WHERE joint.PointType='' and rr.NDT_ID='20d2cbca-8b3d-434b-b1c1-181796986fa5'
+ --AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
+ AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= '2026-01-01'
+ GROUP BY joint.Welder) AS JointNoPassNum2
+ ON JointNoPassNum2.Welder = total.Welder
+ --ηƬ,ηƬ
+ LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint2, SUM(ISNULL(joint.RT2_RepairFilmNum,0)) AS RepairFilm2,
+ joint.Welder
+ FROM dbo.View_JointWelder joint
+ WHERE joint.PointType='' AND joint.RT2_RepairFilm IS NOT NULL
+ AND joint.dreportid IS NOT NULL
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')>= '2026-01-01'
+ GROUP BY joint.Welder) AS RepairJoint2
+ ON RepairJoint2.Welder = total.Welder
+
+
+
+ --ηƬ,ηƬ
+ LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint3, SUM(ISNULL(joint.RT3_RepairFilmNum,0)) AS RepairFilm3,
+ joint.Welder
+ FROM dbo.View_JointWelder joint
+ WHERE joint.PointType='' AND joint.RT3_RepairFilm IS NOT NULL
+ AND joint.dreportid IS NOT NULL
+ AND (SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')>= '2026-01-01'
+ GROUP BY joint.Welder) AS RepairJoint3
+ ON RepairJoint3.Welder = total.Welder
+LEFT JOIN dbo.HJGL_BS_Welder wld ON wld.WED_ID=total.Welder
+LEFT JOIN dbo.Base_Unit unit on unit.UnitId=wld.WED_Unit) v
+where v.JointFilmPassRate>0 and v.JointFilmPassRate<0.965
+
+
+
+GO
+
+
diff --git a/DataBase/版本日志/HJGLDB_DS_2026-01-25_xiaj.sql b/DataBase/版本日志/HJGLDB_DS_2026-01-25_xiaj.sql
new file mode 100644
index 0000000..746e39b
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-01-25_xiaj.sql
@@ -0,0 +1,175 @@
+
+--
+
+/**********˵************************************************************/
+
+--15ȷϱ
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5')
+BEGIN
+ INSERT INTO Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+ VALUES ('B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5','ȷϱ','JGZL/ValveTestConfirmationForm.aspx',150,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+END
+GO
+IF NOT EXISTS (SELECT * FROM ButtonToMenu WHERE MenuId = 'B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5')
+BEGIN
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('05DF35EB-A56F-4F76-9DFB-D706702A9B8C','B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5','',1)
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('8A589323-6D3F-4FD4-BF98-C3E84F5DE424','B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5','',2)
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('599E0E5B-FADC-49A2-A2F1-E8FCF8A48688','B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5','ɾ',3)
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('BD859A9D-D1ED-4D3E-9698-FA73E270146B','B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5','',4)
+END
+GO
+
+--16ż¼
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'A787D641-92EB-4C97-809D-7947C750338E')
+BEGIN
+ INSERT INTO Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+ VALUES ('A787D641-92EB-4C97-809D-7947C750338E','ż¼','JGZL/ValveInspectionTestRecord.aspx',160,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+END
+GO
+IF NOT EXISTS (SELECT * FROM ButtonToMenu WHERE MenuId = 'A787D641-92EB-4C97-809D-7947C750338E')
+BEGIN
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('EF76C5BA-3F3B-4C35-822C-9C198C8ACC22','A787D641-92EB-4C97-809D-7947C750338E','',1)
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('F80C8F1F-4DE7-414D-B067-7697C5C0075B','A787D641-92EB-4C97-809D-7947C750338E','',2)
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('83C7DBC1-58EF-4353-AA90-CF95657187E1','A787D641-92EB-4C97-809D-7947C750338E','ɾ',3)
+ INSERT INTO ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES ('8DDF2F61-40B7-48E2-B1A8-0EE58A5BE08A','A787D641-92EB-4C97-809D-7947C750338E','',4)
+END
+GO
+
+
+
+
+/**********ݱ************************************************************/
+
+
+--15ȷϱ
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'JGZL_ValveTestConfirmationForm') AND type = N'U')
+BEGIN
+
+CREATE TABLE [dbo].[JGZL_ValveTestConfirmationForm](
+ [RecordId] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [Code] [nvarchar](50) NOT NULL,
+ [Name] [nvarchar](50) NULL,
+ [ModelNumber] [nvarchar](50) NULL,
+ [Specifications] [nvarchar](50) NULL,
+ [NominalPressure] [nvarchar](50) NULL,
+ [Num] [int] NULL,
+ [PressureTest] [nvarchar](50) NULL,
+ [SealTest] [nvarchar](50) NULL,
+ [UpperSealTest] [nvarchar](50) NULL,
+ [TestResults] [nvarchar](2000) NULL,
+ [Remark] [nvarchar](500) NULL,
+ [CompileMan] [nvarchar](50) NULL,
+ [CompileDate] [datetime] NULL,
+ [Reviewer] [nvarchar](50) NULL,
+ [RevieweDate] [datetime] NULL,
+ CONSTRAINT [PK_JGZL_ValveTestConfirmationForm] PRIMARY KEY CLUSTERED
+(
+ [RecordId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[JGZL_ValveTestConfirmationForm] WITH CHECK ADD CONSTRAINT [FK_JGZL_ValveTestConfirmationForm_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+ALTER TABLE [dbo].[JGZL_ValveTestConfirmationForm] CHECK CONSTRAINT [FK_JGZL_ValveTestConfirmationForm_Base_Project]
+ALTER TABLE [dbo].[JGZL_ValveTestConfirmationForm] WITH CHECK ADD CONSTRAINT [FK_JGZL_ValveTestConfirmationForm_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+ALTER TABLE [dbo].[JGZL_ValveTestConfirmationForm] CHECK CONSTRAINT [FK_JGZL_ValveTestConfirmationForm_Sys_User]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'RecordId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'Name'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'Code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'ModelNumber'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'Specifications'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'NominalPressure'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'Num'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'PressureTest'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'SealTest'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'UpperSealTest'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'TestResults'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'Remark'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'CompileMan'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'CompileDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'Reviewer'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm', @level2type=N'COLUMN',@level2name=N'RevieweDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȷϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveTestConfirmationForm'
+
+END
+
+GO
+
+--16ż¼
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'JGZL_ValveInspectionTestRecord') AND type = N'U')
+BEGIN
+
+CREATE TABLE [dbo].[JGZL_ValveInspectionTestRecord](
+ [RecordId] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [Code] [nvarchar](50) NOT NULL,
+ [Name] [nvarchar](50) NULL,
+ [SpecificationModel] [nvarchar](50) NULL,
+ [NominalPressure] [nvarchar](50) NULL,
+ [PressuretTestMedium] [nvarchar](50) NULL,
+ [PressuretTestPressure] [nvarchar](50) NULL,
+ [PressureTestTime] [nvarchar](50) NULL,
+ [SealTestMedium] [nvarchar](50) NULL,
+ [SealTestPressure] [nvarchar](50) NULL,
+ [SealTestTime] [nvarchar](50) NULL,
+ [UpperSealTestMedium] [nvarchar](50) NULL,
+ [UpperSealTestPressure] [nvarchar](50) NULL,
+ [UpperSealTestTime] [nvarchar](50) NULL,
+ [InspectionResults] [nvarchar](2000) NULL,
+ [Remark] [nvarchar](500) NULL,
+ [CompileMan] [nvarchar](50) NULL,
+ [CompileDate] [datetime] NULL,
+ [Reviewer] [nvarchar](50) NULL,
+ [RevieweDate] [datetime] NULL,
+ CONSTRAINT [PK_JGZL_ValveInspectionTestRecord] PRIMARY KEY CLUSTERED
+(
+ [RecordId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[JGZL_ValveInspectionTestRecord] WITH CHECK ADD CONSTRAINT [FK_JGZL_ValveInspectionTestRecord_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+ALTER TABLE [dbo].[JGZL_ValveInspectionTestRecord] CHECK CONSTRAINT [FK_JGZL_ValveInspectionTestRecord_Base_Project]
+ALTER TABLE [dbo].[JGZL_ValveInspectionTestRecord] WITH CHECK ADD CONSTRAINT [FK_JGZL_ValveInspectionTestRecord_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+ALTER TABLE [dbo].[JGZL_ValveInspectionTestRecord] CHECK CONSTRAINT [FK_JGZL_ValveInspectionTestRecord_Sys_User]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'RecordId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'Name'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'Code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'SpecificationModel'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'NominalPressure'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'PressuretTestMedium'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'PressuretTestPressure'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'PressureTestTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'SealTestMedium'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'SealTestPressure'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'SealTestTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'UpperSealTestMedium'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'UpperSealTestPressure'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܷʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'UpperSealTestTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'InspectionResults'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'Remark'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'CompileMan'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'CompileDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'Reviewer'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord', @level2type=N'COLUMN',@level2name=N'RevieweDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ż¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ValveInspectionTestRecord'
+
+END
+
+GO
+
+
+
+
+
diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj
index a85c77c..8d5523c 100644
--- a/HJGL_DS/BLL/BLL.csproj
+++ b/HJGL_DS/BLL/BLL.csproj
@@ -250,6 +250,8 @@
+
+
diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs
index c74e7b2..9fe4067 100644
--- a/HJGL_DS/BLL/Common/Const.cs
+++ b/HJGL_DS/BLL/Common/Const.cs
@@ -1842,6 +1842,16 @@ namespace BLL
///
public const string JGZL_MaterialQualityCertificateDocMenuId = "1334FD4F-221E-422A-9038-3ED86A50E8EC";
+ ///
+ /// 阀门试验确认表
+ ///
+ public const string JGZL_ValveTestConfirmationFormMenuId = "B4BEFE75-8B40-48E3-ABE9-05FF8D72D0F5";
+
+ ///
+ /// 阀门检验试验记录
+ ///
+ public const string JGZL_ValveInspectionTestRecordMenuId = "A787D641-92EB-4C97-809D-7947C750338E";
+
#endregion
diff --git a/HJGL_DS/BLL/JGZL/ValveInspectionTestRecordService.cs b/HJGL_DS/BLL/JGZL/ValveInspectionTestRecordService.cs
new file mode 100644
index 0000000..2362b2f
--- /dev/null
+++ b/HJGL_DS/BLL/JGZL/ValveInspectionTestRecordService.cs
@@ -0,0 +1,98 @@
+using Model;
+using System.Linq;
+
+namespace BLL
+{
+ ///
+ /// 阀门检验试验记录
+ ///
+ public class ValveInspectionTestRecordService
+ {
+ ///
+ /// 根据主键获取阀门检验试验记录
+ ///
+ ///
+ ///
+ public static Model.JGZL_ValveInspectionTestRecord GetValveInspectionTestRecordById(string Id)
+ {
+ return Funs.DB.JGZL_ValveInspectionTestRecord.FirstOrDefault(e => e.RecordId == Id);
+ }
+
+ ///
+ /// 添加阀门检验试验记录
+ ///
+ ///
+ public static void AddValveInspectionTestRecord(Model.JGZL_ValveInspectionTestRecord model)
+ {
+ SGGLDB db = Funs.DB;
+ Model.JGZL_ValveInspectionTestRecord newModel = new JGZL_ValveInspectionTestRecord();
+ newModel.RecordId = model.RecordId;
+ newModel.ProjectId = model.ProjectId;
+ newModel.Code = model.Code;
+ newModel.Name = model.Name;
+ newModel.SpecificationModel = model.SpecificationModel;
+ newModel.NominalPressure = model.NominalPressure;
+ newModel.PressuretTestMedium = model.PressuretTestMedium;
+ newModel.PressuretTestPressure = model.PressuretTestPressure;
+ newModel.PressureTestTime = model.PressureTestTime;
+ newModel.SealTestMedium = model.SealTestMedium;
+ newModel.SealTestPressure = model.SealTestPressure;
+ newModel.SealTestTime = model.SealTestTime;
+ newModel.UpperSealTestMedium = model.UpperSealTestMedium;
+ newModel.UpperSealTestPressure = model.UpperSealTestPressure;
+ newModel.UpperSealTestTime = model.UpperSealTestTime;
+ newModel.InspectionResults = model.InspectionResults;
+ newModel.Remark = model.Remark;
+ newModel.CompileMan = model.CompileMan;
+ newModel.CompileDate = model.CompileDate;
+ newModel.Reviewer = model.Reviewer;
+ newModel.RevieweDate = model.RevieweDate;
+ db.JGZL_ValveInspectionTestRecord.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改阀门检验试验记录
+ ///
+ ///
+ public static void UpdateValveInspectionTestRecord(Model.JGZL_ValveInspectionTestRecord model)
+ {
+ SGGLDB db = Funs.DB;
+ Model.JGZL_ValveInspectionTestRecord newModel = db.JGZL_ValveInspectionTestRecord.FirstOrDefault(e => e.RecordId == model.RecordId);
+ if (newModel != null)
+ {
+ newModel.Code = model.Code;
+ newModel.Name = model.Name;
+ newModel.SpecificationModel = model.SpecificationModel;
+ newModel.NominalPressure = model.NominalPressure;
+ newModel.PressuretTestMedium = model.PressuretTestMedium;
+ newModel.PressuretTestPressure = model.PressuretTestPressure;
+ newModel.PressureTestTime = model.PressureTestTime;
+ newModel.SealTestMedium = model.SealTestMedium;
+ newModel.SealTestPressure = model.SealTestPressure;
+ newModel.SealTestTime = model.SealTestTime;
+ newModel.UpperSealTestMedium = model.UpperSealTestMedium;
+ newModel.UpperSealTestPressure = model.UpperSealTestPressure;
+ newModel.UpperSealTestTime = model.UpperSealTestTime;
+ newModel.InspectionResults = model.InspectionResults;
+ newModel.Remark = model.Remark;
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据主键删除阀门检验试验记录
+ ///
+ ///
+ public static void DeleteValveInspectionTestRecordById(string Id)
+ {
+ SGGLDB db = Funs.DB;
+ Model.JGZL_ValveInspectionTestRecord model = db.JGZL_ValveInspectionTestRecord.FirstOrDefault(e => e.RecordId == Id);
+ if (model != null)
+ {
+ db.JGZL_ValveInspectionTestRecord.DeleteOnSubmit(model);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/HJGL_DS/BLL/JGZL/ValveTestConfirmationFormService.cs b/HJGL_DS/BLL/JGZL/ValveTestConfirmationFormService.cs
new file mode 100644
index 0000000..f198850
--- /dev/null
+++ b/HJGL_DS/BLL/JGZL/ValveTestConfirmationFormService.cs
@@ -0,0 +1,90 @@
+using Model;
+using System.Linq;
+
+namespace BLL
+{
+ ///
+ /// 阀门试验确认表
+ ///
+ public class ValveTestConfirmationFormService
+ {
+ ///
+ /// 根据主键获取阀门试验确认表
+ ///
+ ///
+ ///
+ public static Model.JGZL_ValveTestConfirmationForm GetValveTestConfirmationFormById(string Id)
+ {
+ return Funs.DB.JGZL_ValveTestConfirmationForm.FirstOrDefault(e => e.RecordId == Id);
+ }
+
+ ///
+ /// 添加阀门试验确认表
+ ///
+ ///
+ public static void AddValveTestConfirmationForm(Model.JGZL_ValveTestConfirmationForm model)
+ {
+ SGGLDB db = Funs.DB;
+ Model.JGZL_ValveTestConfirmationForm newModel = new JGZL_ValveTestConfirmationForm();
+ newModel.RecordId = model.RecordId;
+ newModel.ProjectId = model.ProjectId;
+ newModel.Code = model.Code;
+ newModel.Name = model.Name;
+ newModel.ModelNumber = model.ModelNumber;
+ newModel.Specifications = model.Specifications;
+ newModel.NominalPressure = model.NominalPressure;
+ newModel.Num = model.Num;
+ newModel.PressureTest = model.PressureTest;
+ newModel.SealTest = model.SealTest;
+ newModel.UpperSealTest = model.UpperSealTest;
+ newModel.TestResults = model.TestResults;
+ newModel.Remark = model.Remark;
+ newModel.CompileMan = model.CompileMan;
+ newModel.CompileDate = model.CompileDate;
+ newModel.Reviewer = model.Reviewer;
+ newModel.RevieweDate = model.RevieweDate;
+ db.JGZL_ValveTestConfirmationForm.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改阀门试验确认表
+ ///
+ ///
+ public static void UpdateValveTestConfirmationForm(Model.JGZL_ValveTestConfirmationForm model)
+ {
+ SGGLDB db = Funs.DB;
+ Model.JGZL_ValveTestConfirmationForm newModel = db.JGZL_ValveTestConfirmationForm.FirstOrDefault(e => e.RecordId == model.RecordId);
+ if (newModel != null)
+ {
+ newModel.Code = model.Code;
+ newModel.Name = model.Name;
+ newModel.ModelNumber = model.ModelNumber;
+ newModel.Specifications = model.Specifications;
+ newModel.NominalPressure = model.NominalPressure;
+ newModel.Num = model.Num;
+ newModel.PressureTest = model.PressureTest;
+ newModel.SealTest = model.SealTest;
+ newModel.UpperSealTest = model.UpperSealTest;
+ newModel.TestResults = model.TestResults;
+ newModel.Remark = model.Remark;
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据主键删除阀门试验确认表
+ ///
+ ///
+ public static void DeleteValveTestConfirmationFormById(string Id)
+ {
+ SGGLDB db = Funs.DB;
+ Model.JGZL_ValveTestConfirmationForm model = db.JGZL_ValveTestConfirmationForm.FirstOrDefault(e => e.RecordId == Id);
+ if (model != null)
+ {
+ db.JGZL_ValveTestConfirmationForm.DeleteOnSubmit(model);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index cecab01..29f7fa3 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1248,6 +1248,10 @@
+
+
+
+
@@ -6614,6 +6618,34 @@
CommencementReportEdit.aspx
+
+ ValveInspectionTestRecord.aspx
+ ASPXCodeBehind
+
+
+ ValveInspectionTestRecord.aspx
+
+
+ ValveInspectionTestRecordEdit.aspx
+ ASPXCodeBehind
+
+
+ ValveInspectionTestRecordEdit.aspx
+
+
+ ValveTestConfirmationForm.aspx
+ ASPXCodeBehind
+
+
+ ValveTestConfirmationForm.aspx
+
+
+ ValveTestConfirmationFormEdit.aspx
+ ASPXCodeBehind
+
+
+ ValveTestConfirmationFormEdit.aspx
+
IndustrialPipelineInstallationSummary.aspx
ASPXCodeBehind
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 72b6a27..23f19b2 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,4 +1,4 @@
-
+
true
@@ -14,8 +14,9 @@
- Login.aspx
- SpecificPage
+
+
+ CurrentPage
True
False
False
@@ -29,12 +30,12 @@
True
- True
+ False
True
True
0
/
- http://localhost:60961/
+ http://localhost:59415/
False
False
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx
new file mode 100644
index 0000000..d88f52e
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx
@@ -0,0 +1,163 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ValveInspectionTestRecord.aspx.cs" Inherits="FineUIPro.Web.JGZL.ValveInspectionTestRecord" %>
+
+
+
+
+
+
+ 阀门检验试验记录
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx.cs
new file mode 100644
index 0000000..0c3c42d
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx.cs
@@ -0,0 +1,401 @@
+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 ValveInspectionTestRecord : 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.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+ this.InitTreeMenu();//加载树
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+ this.BindGrid();
+ }
+ }
+ #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_ValveInspectionTestRecord 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();
+ this.BindGrid();
+ }
+
+ ///
+ /// 查询
+ ///
+ ///
+ ///
+ 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)
+ {
+ string initTemplatePath = "";
+ string rootPath = Server.MapPath("~/");
+ BLL.Common.FastReportService.ResetData();
+
+ string strSql = @"SELECT * from JGZL_ValveInspectionTestRecord where ProjectId = @ProjectId order by DrawingNumber desc";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", projectId));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("Num");
+ dt.Columns.Add("ConcealedWorks");
+ dt.Columns.Add("DrawingNumber");
+ dt.Columns.Add("ConcealedContentAndDiagram");
+ dt.Columns.Add("InspectionResults");
+ dt.Columns.Add("Remark");
+
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ int i = 0;
+ foreach (var row in rows)
+ {
+ var newRow = dt.NewRow();
+ newRow["Num"] = (i + 1).ToString();
+ newRow["ConcealedWorks"] = row["ConcealedWorks"].ToString();
+ newRow["DrawingNumber"] = row["DrawingNumber"].ToString();
+ newRow["ConcealedContentAndDiagram"] = row["ConcealedContentAndDiagram"].ToString();
+ newRow["Remark"] = row["Remark"].ToString();
+ dt.Rows.Add(newRow);
+ i++;
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
+ Dictionary keyValuePairs = new Dictionary();
+ keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
+ 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;
+ }
+ }
+ #endregion
+
+ #region 维护
+ ///
+ /// 增加
+ ///
+ ///
+ ///
+ protected void btnAdd_Click(object sender, EventArgs e)
+ {
+ if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ValveInspectionTestRecordEdit.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_ValveInspectionTestRecordMenuId, BLL.Const.BtnModify))
+ {
+ if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+ {
+ if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ValveInspectionTestRecordEdit.aspx?recordId={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_ValveInspectionTestRecordMenuId, BLL.Const.BtnModify))
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ValveInspectionTestRecordEdit.aspx?recordId={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_ValveInspectionTestRecordMenuId, 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.ValveInspectionTestRecordService.DeleteValveInspectionTestRecordById(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/ValveInspectionTestRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx.designer.cs
new file mode 100644
index 0000000..41cec45
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecord.aspx.designer.cs
@@ -0,0 +1,206 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+ public partial class ValveInspectionTestRecord
+ {
+
+ ///
+ /// 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/ValveInspectionTestRecordEdit.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx
new file mode 100644
index 0000000..0e1358b
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx
@@ -0,0 +1,74 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ValveInspectionTestRecordEdit.aspx.cs" Inherits="FineUIPro.Web.JGZL.ValveInspectionTestRecordEdit" %>
+
+
+
+
+
+
+ 编辑阀门检验试验记录
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx.cs
new file mode 100644
index 0000000..82b2c28
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx.cs
@@ -0,0 +1,132 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.JGZL
+{
+ public partial class ValveInspectionTestRecordEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 主键
+ ///
+ private string RecordId
+ {
+ get
+ {
+ return (string)ViewState["RecordId"];
+ }
+ set
+ {
+ ViewState["RecordId"] = 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.RecordId = Request.Params["recordId"];
+ if (!string.IsNullOrEmpty(this.RecordId))
+ {
+ var report = BLL.ValveInspectionTestRecordService.GetValveInspectionTestRecordById(this.RecordId);
+ if (report != null)
+ {
+ this.txtCode.Text = report.Code;
+ this.txtName.Text = report.Name;
+ this.txtSpecificationModel.Text = report.SpecificationModel;
+ this.txtNominalPressure.Text = report.NominalPressure;
+ this.txtPressuretTestMedium.Text = report.PressuretTestMedium;
+ this.txtPressuretTestPressure.Text = report.PressuretTestPressure;
+ this.txtPressureTestTime.Text = report.PressureTestTime;
+ this.txtSealTestMedium.Text = report.SealTestMedium;
+ this.txtSealTestPressure.Text = report.SealTestPressure;
+ this.txtSealTestTime.Text = report.SealTestTime;
+ this.txtUpperSealTestMedium.Text = report.UpperSealTestMedium;
+ this.txtUpperSealTestPressure.Text = report.UpperSealTestPressure;
+ this.txtUpperSealTestTime.Text = report.UpperSealTestTime;
+ this.txtInspectionResults.Text = report.InspectionResults;
+ this.txtRemark.Text = report.Remark;
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 提交按钮
+ ///
+ /// 提交按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ValveInspectionTestRecordMenuId, Const.BtnSave))
+ {
+ Model.JGZL_ValveInspectionTestRecord newReport = new Model.JGZL_ValveInspectionTestRecord();
+ newReport.Code = this.txtCode.Text.Trim();
+ newReport.Name = this.txtName.Text.Trim();
+ newReport.SpecificationModel = this.txtSpecificationModel.Text.Trim();
+ newReport.NominalPressure = this.txtNominalPressure.Text.Trim();
+ newReport.PressuretTestMedium = this.txtPressuretTestMedium.Text.Trim();
+ newReport.PressuretTestPressure = this.txtPressuretTestPressure.Text.Trim();
+ newReport.PressureTestTime = this.txtPressureTestTime.Text.Trim();
+ newReport.SealTestMedium = this.txtSealTestMedium.Text.Trim();
+ newReport.SealTestPressure = this.txtSealTestPressure.Text.Trim();
+ newReport.SealTestTime = this.txtSealTestTime.Text.Trim();
+ newReport.UpperSealTestMedium = this.txtUpperSealTestMedium.Text.Trim();
+ newReport.UpperSealTestPressure = this.txtUpperSealTestPressure.Text.Trim();
+ newReport.UpperSealTestTime = this.txtUpperSealTestTime.Text.Trim();
+ newReport.InspectionResults = this.txtInspectionResults.Text.Trim();
+ newReport.Remark = this.txtRemark.Text.Trim();
+
+ if (!string.IsNullOrEmpty(this.RecordId))
+ {
+ newReport.RecordId = this.RecordId;
+ BLL.ValveInspectionTestRecordService.UpdateValveInspectionTestRecord(newReport);
+ }
+ else
+ {
+ newReport.ProjectId = this.ProjectId;
+ newReport.CompileMan = this.CurrUser.UserId;
+ newReport.CompileDate = DateTime.Now;
+ newReport.Reviewer = this.CurrUser.UserId;
+ newReport.RevieweDate = DateTime.Now;
+ newReport.RecordId = SQLHelper.GetNewID(typeof(Model.JGZL_ValveInspectionTestRecord));
+ this.RecordId = newReport.RecordId;
+ BLL.ValveInspectionTestRecordService.AddValveInspectionTestRecord(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/ValveInspectionTestRecordEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx.designer.cs
new file mode 100644
index 0000000..53c5e08
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveInspectionTestRecordEdit.aspx.designer.cs
@@ -0,0 +1,206 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+ public partial class ValveInspectionTestRecordEdit
+ {
+
+ ///
+ /// 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;
+
+ ///
+ /// txtCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtCode;
+
+ ///
+ /// txtName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtName;
+
+ ///
+ /// txtSpecificationModel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSpecificationModel;
+
+ ///
+ /// txtNominalPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtNominalPressure;
+
+ ///
+ /// txtPressuretTestMedium 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtPressuretTestMedium;
+
+ ///
+ /// txtPressuretTestPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtPressuretTestPressure;
+
+ ///
+ /// txtPressureTestTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtPressureTestTime;
+
+ ///
+ /// txtSealTestMedium 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSealTestMedium;
+
+ ///
+ /// txtSealTestPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSealTestPressure;
+
+ ///
+ /// txtSealTestTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSealTestTime;
+
+ ///
+ /// txtUpperSealTestMedium 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtUpperSealTestMedium;
+
+ ///
+ /// txtUpperSealTestPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtUpperSealTestPressure;
+
+ ///
+ /// txtUpperSealTestTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtUpperSealTestTime;
+
+ ///
+ /// txtInspectionResults 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtInspectionResults;
+
+ ///
+ /// txtRemark 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtRemark;
+ }
+}
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx
new file mode 100644
index 0000000..8eca65d
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx
@@ -0,0 +1,139 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ValveTestConfirmationForm.aspx.cs" Inherits="FineUIPro.Web.JGZL.ValveTestConfirmationForm" %>
+
+
+
+
+
+
+ 阀门试验确认表
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx.cs
new file mode 100644
index 0000000..d368728
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx.cs
@@ -0,0 +1,401 @@
+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 ValveTestConfirmationForm : 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.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+ this.InitTreeMenu();//加载树
+ this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+ this.BindGrid();
+ }
+ }
+ #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_ValveTestConfirmationForm 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();
+ this.BindGrid();
+ }
+
+ ///
+ /// 查询
+ ///
+ ///
+ ///
+ 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)
+ {
+ string initTemplatePath = "";
+ string rootPath = Server.MapPath("~/");
+ BLL.Common.FastReportService.ResetData();
+
+ string strSql = @"SELECT * from JGZL_ValveTestConfirmationForm where ProjectId = @ProjectId order by DrawingNumber desc";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", projectId));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("Num");
+ dt.Columns.Add("ConcealedWorks");
+ dt.Columns.Add("DrawingNumber");
+ dt.Columns.Add("ConcealedContentAndDiagram");
+ dt.Columns.Add("InspectionResults");
+ dt.Columns.Add("Remark");
+
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ int i = 0;
+ foreach (var row in rows)
+ {
+ var newRow = dt.NewRow();
+ newRow["Num"] = (i + 1).ToString();
+ newRow["ConcealedWorks"] = row["ConcealedWorks"].ToString();
+ newRow["DrawingNumber"] = row["DrawingNumber"].ToString();
+ newRow["ConcealedContentAndDiagram"] = row["ConcealedContentAndDiagram"].ToString();
+ newRow["Remark"] = row["Remark"].ToString();
+ dt.Rows.Add(newRow);
+ i++;
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
+ Dictionary keyValuePairs = new Dictionary();
+ keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
+ 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;
+ }
+ }
+ #endregion
+
+ #region 维护
+ ///
+ /// 增加
+ ///
+ ///
+ ///
+ protected void btnAdd_Click(object sender, EventArgs e)
+ {
+ if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ValveTestConfirmationFormEdit.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_ValveTestConfirmationFormMenuId, BLL.Const.BtnModify))
+ {
+ if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+ {
+ if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ValveTestConfirmationFormEdit.aspx?recordId={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_ValveTestConfirmationFormMenuId, BLL.Const.BtnModify))
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ValveTestConfirmationFormEdit.aspx?recordId={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_ValveTestConfirmationFormMenuId, 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.ValveTestConfirmationFormService.DeleteValveTestConfirmationFormById(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/ValveTestConfirmationForm.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx.designer.cs
new file mode 100644
index 0000000..41e3631
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationForm.aspx.designer.cs
@@ -0,0 +1,206 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+ public partial class ValveTestConfirmationForm
+ {
+
+ ///
+ /// 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/ValveTestConfirmationFormEdit.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx
new file mode 100644
index 0000000..7e469db
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx
@@ -0,0 +1,76 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ValveTestConfirmationFormEdit.aspx.cs" Inherits="FineUIPro.Web.JGZL.ValveTestConfirmationFormEdit" %>
+
+
+
+
+
+
+ 编辑阀门试验确认表
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.cs
new file mode 100644
index 0000000..f35d3f9
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.cs
@@ -0,0 +1,124 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.JGZL
+{
+ public partial class ValveTestConfirmationFormEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 主键
+ ///
+ private string RecordId
+ {
+ get
+ {
+ return (string)ViewState["RecordId"];
+ }
+ set
+ {
+ ViewState["RecordId"] = 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.RecordId = Request.Params["recordId"];
+ if (!string.IsNullOrEmpty(this.RecordId))
+ {
+ var report = BLL.ValveTestConfirmationFormService.GetValveTestConfirmationFormById(this.RecordId);
+ if (report != null)
+ {
+ this.txtCode.Text = report.Code;
+ this.txtName.Text = report.Name;
+ this.txtModelNumber.Text = report.ModelNumber;
+ this.txtSpecifications.Text = report.Specifications;
+ this.txtNominalPressure.Text = report.NominalPressure;
+ this.txtNum.Text = report.Num.ToString();
+ this.txtPressureTest.Text = report.PressureTest;
+ this.txtSealTest.Text = report.SealTest;
+ this.txtUpperSealTest.Text = report.UpperSealTest;
+ this.txtTestResults.Text = report.TestResults;
+ this.txtRemark.Text = report.Remark;
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 提交按钮
+ ///
+ /// 提交按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ValveTestConfirmationFormMenuId, Const.BtnSave))
+ {
+ Model.JGZL_ValveTestConfirmationForm newReport = new Model.JGZL_ValveTestConfirmationForm();
+ newReport.Code = this.txtCode.Text.Trim();
+ newReport.Name = this.txtName.Text.Trim();
+ newReport.ModelNumber = this.txtModelNumber.Text.Trim();
+ newReport.Specifications = this.txtSpecifications.Text.Trim();
+ newReport.NominalPressure = this.txtNominalPressure.Text.Trim();
+ newReport.Num = Funs.GetNewIntOrZero(this.txtNum.Text.Trim());
+ newReport.PressureTest = this.txtPressureTest.Text.Trim();
+ newReport.SealTest = this.txtSealTest.Text.Trim();
+ newReport.UpperSealTest = this.txtUpperSealTest.Text.Trim();
+ newReport.TestResults = this.txtTestResults.Text.Trim();
+ newReport.Remark = this.txtRemark.Text.Trim();
+
+ if (!string.IsNullOrEmpty(this.RecordId))
+ {
+ newReport.RecordId = this.RecordId;
+ BLL.ValveTestConfirmationFormService.UpdateValveTestConfirmationForm(newReport);
+ }
+ else
+ {
+ newReport.ProjectId = this.ProjectId;
+ newReport.CompileMan = this.CurrUser.UserId;
+ newReport.CompileDate = DateTime.Now;
+ newReport.Reviewer = this.CurrUser.UserId;
+ newReport.RevieweDate = DateTime.Now;
+ newReport.RecordId = SQLHelper.GetNewID(typeof(Model.JGZL_ValveTestConfirmationForm));
+ this.RecordId = newReport.RecordId;
+ BLL.ValveTestConfirmationFormService.AddValveTestConfirmationForm(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/ValveTestConfirmationFormEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.designer.cs
new file mode 100644
index 0000000..1a341b6
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ValveTestConfirmationFormEdit.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+ public partial class ValveTestConfirmationFormEdit
+ {
+
+ ///
+ /// 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;
+
+ ///
+ /// txtCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtCode;
+
+ ///
+ /// txtName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtName;
+
+ ///
+ /// txtModelNumber 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtModelNumber;
+
+ ///
+ /// txtSpecifications 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSpecifications;
+
+ ///
+ /// txtNominalPressure 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtNominalPressure;
+
+ ///
+ /// txtNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtNum;
+
+ ///
+ /// txtPressureTest 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtPressureTest;
+
+ ///
+ /// txtSealTest 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSealTest;
+
+ ///
+ /// txtUpperSealTest 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtUpperSealTest;
+
+ ///
+ /// txtTestResults 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtTestResults;
+
+ ///
+ /// txtRemark 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtRemark;
+ }
+}
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 6bfb6c8..e834a2a 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 70f1410..f78f54c 100644
--- a/HJGL_DS/Model/Model.cs
+++ b/HJGL_DS/Model/Model.cs
@@ -428,6 +428,12 @@ namespace Model
partial void InsertJGZL_TeamWeldingInspectionItem(JGZL_TeamWeldingInspectionItem instance);
partial void UpdateJGZL_TeamWeldingInspectionItem(JGZL_TeamWeldingInspectionItem instance);
partial void DeleteJGZL_TeamWeldingInspectionItem(JGZL_TeamWeldingInspectionItem instance);
+ partial void InsertJGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord instance);
+ partial void UpdateJGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord instance);
+ partial void DeleteJGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord instance);
+ partial void InsertJGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm instance);
+ partial void UpdateJGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm instance);
+ partial void DeleteJGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm instance);
partial void InsertOAM_UesrQualified(OAM_UesrQualified instance);
partial void UpdateOAM_UesrQualified(OAM_UesrQualified instance);
partial void DeleteOAM_UesrQualified(OAM_UesrQualified instance);
@@ -1936,6 +1942,22 @@ namespace Model
}
}
+ public System.Data.Linq.Table JGZL_ValveInspectionTestRecord
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table JGZL_ValveTestConfirmationForm
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table OAM_UesrQualified
{
get
@@ -4559,6 +4581,10 @@ namespace Model
private EntitySet _JGZL_TeamWeldingInspection;
+ private EntitySet _JGZL_ValveInspectionTestRecord;
+
+ private EntitySet _JGZL_ValveTestConfirmationForm;
+
private EntitySet _Project_Installation;
private EntitySet _Project_RoleButtonPower;
@@ -4700,6 +4726,8 @@ namespace Model
this._JGZL_QualityControlPointInspection = new EntitySet(new Action(this.attach_JGZL_QualityControlPointInspection), new Action(this.detach_JGZL_QualityControlPointInspection));
this._JGZL_SpecialEquipmentMaintenance = new EntitySet(new Action(this.attach_JGZL_SpecialEquipmentMaintenance), new Action(this.detach_JGZL_SpecialEquipmentMaintenance));
this._JGZL_TeamWeldingInspection = new EntitySet(new Action(this.attach_JGZL_TeamWeldingInspection), new Action(this.detach_JGZL_TeamWeldingInspection));
+ this._JGZL_ValveInspectionTestRecord = new EntitySet(new Action(this.attach_JGZL_ValveInspectionTestRecord), new Action(this.detach_JGZL_ValveInspectionTestRecord));
+ this._JGZL_ValveTestConfirmationForm = new EntitySet(new Action(this.attach_JGZL_ValveTestConfirmationForm), new Action(this.detach_JGZL_ValveTestConfirmationForm));
this._Project_Installation = new EntitySet(new Action(this.attach_Project_Installation), new Action(this.detach_Project_Installation));
this._Project_RoleButtonPower = new EntitySet(new Action(this.attach_Project_RoleButtonPower), new Action(this.detach_Project_RoleButtonPower));
this._Project_RolePower = new EntitySet(new Action(this.attach_Project_RolePower), new Action(this.detach_Project_RolePower));
@@ -5988,6 +6016,32 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveInspectionTestRecord_Base_Project", Storage="_JGZL_ValveInspectionTestRecord", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet JGZL_ValveInspectionTestRecord
+ {
+ get
+ {
+ return this._JGZL_ValveInspectionTestRecord;
+ }
+ set
+ {
+ this._JGZL_ValveInspectionTestRecord.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveTestConfirmationForm_Base_Project", Storage="_JGZL_ValveTestConfirmationForm", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet JGZL_ValveTestConfirmationForm
+ {
+ get
+ {
+ return this._JGZL_ValveTestConfirmationForm;
+ }
+ set
+ {
+ this._JGZL_ValveTestConfirmationForm.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_Installation_Base_Project", Storage="_Project_Installation", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet Project_Installation
{
@@ -6850,6 +6904,30 @@ namespace Model
entity.Base_Project = null;
}
+ private void attach_JGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = this;
+ }
+
+ private void detach_JGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = null;
+ }
+
+ private void attach_JGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = this;
+ }
+
+ private void detach_JGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = null;
+ }
+
private void attach_Project_Installation(Project_Installation entity)
{
this.SendPropertyChanging();
@@ -88830,6 +88908,1158 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_ValveInspectionTestRecord")]
+ public partial class JGZL_ValveInspectionTestRecord : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _RecordId;
+
+ private string _ProjectId;
+
+ private string _Code;
+
+ private string _Name;
+
+ private string _SpecificationModel;
+
+ private string _NominalPressure;
+
+ private string _PressuretTestMedium;
+
+ private string _PressuretTestPressure;
+
+ private string _PressureTestTime;
+
+ private string _SealTestMedium;
+
+ private string _SealTestPressure;
+
+ private string _SealTestTime;
+
+ private string _UpperSealTestMedium;
+
+ private string _UpperSealTestPressure;
+
+ private string _UpperSealTestTime;
+
+ private string _InspectionResults;
+
+ private string _Remark;
+
+ private string _CompileMan;
+
+ private System.Nullable _CompileDate;
+
+ private string _Reviewer;
+
+ private System.Nullable _RevieweDate;
+
+ 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 OnRecordIdChanging(string value);
+ partial void OnRecordIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnCodeChanging(string value);
+ partial void OnCodeChanged();
+ partial void OnNameChanging(string value);
+ partial void OnNameChanged();
+ partial void OnSpecificationModelChanging(string value);
+ partial void OnSpecificationModelChanged();
+ partial void OnNominalPressureChanging(string value);
+ partial void OnNominalPressureChanged();
+ partial void OnPressuretTestMediumChanging(string value);
+ partial void OnPressuretTestMediumChanged();
+ partial void OnPressuretTestPressureChanging(string value);
+ partial void OnPressuretTestPressureChanged();
+ partial void OnPressureTestTimeChanging(string value);
+ partial void OnPressureTestTimeChanged();
+ partial void OnSealTestMediumChanging(string value);
+ partial void OnSealTestMediumChanged();
+ partial void OnSealTestPressureChanging(string value);
+ partial void OnSealTestPressureChanged();
+ partial void OnSealTestTimeChanging(string value);
+ partial void OnSealTestTimeChanged();
+ partial void OnUpperSealTestMediumChanging(string value);
+ partial void OnUpperSealTestMediumChanged();
+ partial void OnUpperSealTestPressureChanging(string value);
+ partial void OnUpperSealTestPressureChanged();
+ partial void OnUpperSealTestTimeChanging(string value);
+ partial void OnUpperSealTestTimeChanged();
+ partial void OnInspectionResultsChanging(string value);
+ partial void OnInspectionResultsChanged();
+ partial void OnRemarkChanging(string value);
+ partial void OnRemarkChanged();
+ partial void OnCompileManChanging(string value);
+ partial void OnCompileManChanged();
+ partial void OnCompileDateChanging(System.Nullable value);
+ partial void OnCompileDateChanged();
+ partial void OnReviewerChanging(string value);
+ partial void OnReviewerChanged();
+ partial void OnRevieweDateChanging(System.Nullable value);
+ partial void OnRevieweDateChanged();
+ #endregion
+
+ public JGZL_ValveInspectionTestRecord()
+ {
+ this._Base_Project = default(EntityRef);
+ this._Sys_User = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string RecordId
+ {
+ get
+ {
+ return this._RecordId;
+ }
+ set
+ {
+ if ((this._RecordId != value))
+ {
+ this.OnRecordIdChanging(value);
+ this.SendPropertyChanging();
+ this._RecordId = value;
+ this.SendPropertyChanged("RecordId");
+ this.OnRecordIdChanged();
+ }
+ }
+ }
+
+ [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="_Code", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ public string Code
+ {
+ get
+ {
+ return this._Code;
+ }
+ set
+ {
+ if ((this._Code != value))
+ {
+ this.OnCodeChanging(value);
+ this.SendPropertyChanging();
+ this._Code = value;
+ this.SendPropertyChanged("Code");
+ this.OnCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
+ public string Name
+ {
+ get
+ {
+ return this._Name;
+ }
+ set
+ {
+ if ((this._Name != value))
+ {
+ this.OnNameChanging(value);
+ this.SendPropertyChanging();
+ this._Name = value;
+ this.SendPropertyChanged("Name");
+ this.OnNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationModel", DbType="NVarChar(50)")]
+ public string SpecificationModel
+ {
+ get
+ {
+ return this._SpecificationModel;
+ }
+ set
+ {
+ if ((this._SpecificationModel != value))
+ {
+ this.OnSpecificationModelChanging(value);
+ this.SendPropertyChanging();
+ this._SpecificationModel = value;
+ this.SendPropertyChanged("SpecificationModel");
+ this.OnSpecificationModelChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NominalPressure", DbType="NVarChar(50)")]
+ public string NominalPressure
+ {
+ get
+ {
+ return this._NominalPressure;
+ }
+ set
+ {
+ if ((this._NominalPressure != value))
+ {
+ this.OnNominalPressureChanging(value);
+ this.SendPropertyChanging();
+ this._NominalPressure = value;
+ this.SendPropertyChanged("NominalPressure");
+ this.OnNominalPressureChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressuretTestMedium", DbType="NVarChar(50)")]
+ public string PressuretTestMedium
+ {
+ get
+ {
+ return this._PressuretTestMedium;
+ }
+ set
+ {
+ if ((this._PressuretTestMedium != value))
+ {
+ this.OnPressuretTestMediumChanging(value);
+ this.SendPropertyChanging();
+ this._PressuretTestMedium = value;
+ this.SendPropertyChanged("PressuretTestMedium");
+ this.OnPressuretTestMediumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressuretTestPressure", DbType="NVarChar(50)")]
+ public string PressuretTestPressure
+ {
+ get
+ {
+ return this._PressuretTestPressure;
+ }
+ set
+ {
+ if ((this._PressuretTestPressure != value))
+ {
+ this.OnPressuretTestPressureChanging(value);
+ this.SendPropertyChanging();
+ this._PressuretTestPressure = value;
+ this.SendPropertyChanged("PressuretTestPressure");
+ this.OnPressuretTestPressureChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureTestTime", DbType="NVarChar(50)")]
+ public string PressureTestTime
+ {
+ get
+ {
+ return this._PressureTestTime;
+ }
+ set
+ {
+ if ((this._PressureTestTime != value))
+ {
+ this.OnPressureTestTimeChanging(value);
+ this.SendPropertyChanging();
+ this._PressureTestTime = value;
+ this.SendPropertyChanged("PressureTestTime");
+ this.OnPressureTestTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SealTestMedium", DbType="NVarChar(50)")]
+ public string SealTestMedium
+ {
+ get
+ {
+ return this._SealTestMedium;
+ }
+ set
+ {
+ if ((this._SealTestMedium != value))
+ {
+ this.OnSealTestMediumChanging(value);
+ this.SendPropertyChanging();
+ this._SealTestMedium = value;
+ this.SendPropertyChanged("SealTestMedium");
+ this.OnSealTestMediumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SealTestPressure", DbType="NVarChar(50)")]
+ public string SealTestPressure
+ {
+ get
+ {
+ return this._SealTestPressure;
+ }
+ set
+ {
+ if ((this._SealTestPressure != value))
+ {
+ this.OnSealTestPressureChanging(value);
+ this.SendPropertyChanging();
+ this._SealTestPressure = value;
+ this.SendPropertyChanged("SealTestPressure");
+ this.OnSealTestPressureChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SealTestTime", DbType="NVarChar(50)")]
+ public string SealTestTime
+ {
+ get
+ {
+ return this._SealTestTime;
+ }
+ set
+ {
+ if ((this._SealTestTime != value))
+ {
+ this.OnSealTestTimeChanging(value);
+ this.SendPropertyChanging();
+ this._SealTestTime = value;
+ this.SendPropertyChanged("SealTestTime");
+ this.OnSealTestTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpperSealTestMedium", DbType="NVarChar(50)")]
+ public string UpperSealTestMedium
+ {
+ get
+ {
+ return this._UpperSealTestMedium;
+ }
+ set
+ {
+ if ((this._UpperSealTestMedium != value))
+ {
+ this.OnUpperSealTestMediumChanging(value);
+ this.SendPropertyChanging();
+ this._UpperSealTestMedium = value;
+ this.SendPropertyChanged("UpperSealTestMedium");
+ this.OnUpperSealTestMediumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpperSealTestPressure", DbType="NVarChar(50)")]
+ public string UpperSealTestPressure
+ {
+ get
+ {
+ return this._UpperSealTestPressure;
+ }
+ set
+ {
+ if ((this._UpperSealTestPressure != value))
+ {
+ this.OnUpperSealTestPressureChanging(value);
+ this.SendPropertyChanging();
+ this._UpperSealTestPressure = value;
+ this.SendPropertyChanged("UpperSealTestPressure");
+ this.OnUpperSealTestPressureChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpperSealTestTime", DbType="NVarChar(50)")]
+ public string UpperSealTestTime
+ {
+ get
+ {
+ return this._UpperSealTestTime;
+ }
+ set
+ {
+ if ((this._UpperSealTestTime != value))
+ {
+ this.OnUpperSealTestTimeChanging(value);
+ this.SendPropertyChanging();
+ this._UpperSealTestTime = value;
+ this.SendPropertyChanged("UpperSealTestTime");
+ this.OnUpperSealTestTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionResults", DbType="NVarChar(2000)")]
+ public string 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="_Remark", DbType="NVarChar(500)")]
+ 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="_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.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="_RevieweDate", DbType="DateTime")]
+ public System.Nullable RevieweDate
+ {
+ get
+ {
+ return this._RevieweDate;
+ }
+ set
+ {
+ if ((this._RevieweDate != value))
+ {
+ this.OnRevieweDateChanging(value);
+ this.SendPropertyChanging();
+ this._RevieweDate = value;
+ this.SendPropertyChanged("RevieweDate");
+ this.OnRevieweDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveInspectionTestRecord_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_ValveInspectionTestRecord.Remove(this);
+ }
+ this._Base_Project.Entity = value;
+ if ((value != null))
+ {
+ value.JGZL_ValveInspectionTestRecord.Add(this);
+ this._ProjectId = value.ProjectId;
+ }
+ else
+ {
+ this._ProjectId = default(string);
+ }
+ this.SendPropertyChanged("Base_Project");
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveInspectionTestRecord_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_ValveInspectionTestRecord.Remove(this);
+ }
+ this._Sys_User.Entity = value;
+ if ((value != null))
+ {
+ value.JGZL_ValveInspectionTestRecord.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_ValveTestConfirmationForm")]
+ public partial class JGZL_ValveTestConfirmationForm : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _RecordId;
+
+ private string _ProjectId;
+
+ private string _Code;
+
+ private string _Name;
+
+ private string _ModelNumber;
+
+ private string _Specifications;
+
+ private string _NominalPressure;
+
+ private System.Nullable _Num;
+
+ private string _PressureTest;
+
+ private string _SealTest;
+
+ private string _UpperSealTest;
+
+ private string _TestResults;
+
+ private string _Remark;
+
+ private string _CompileMan;
+
+ private System.Nullable _CompileDate;
+
+ private string _Reviewer;
+
+ private System.Nullable _RevieweDate;
+
+ 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 OnRecordIdChanging(string value);
+ partial void OnRecordIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnCodeChanging(string value);
+ partial void OnCodeChanged();
+ partial void OnNameChanging(string value);
+ partial void OnNameChanged();
+ partial void OnModelNumberChanging(string value);
+ partial void OnModelNumberChanged();
+ partial void OnSpecificationsChanging(string value);
+ partial void OnSpecificationsChanged();
+ partial void OnNominalPressureChanging(string value);
+ partial void OnNominalPressureChanged();
+ partial void OnNumChanging(System.Nullable value);
+ partial void OnNumChanged();
+ partial void OnPressureTestChanging(string value);
+ partial void OnPressureTestChanged();
+ partial void OnSealTestChanging(string value);
+ partial void OnSealTestChanged();
+ partial void OnUpperSealTestChanging(string value);
+ partial void OnUpperSealTestChanged();
+ partial void OnTestResultsChanging(string value);
+ partial void OnTestResultsChanged();
+ partial void OnRemarkChanging(string value);
+ partial void OnRemarkChanged();
+ partial void OnCompileManChanging(string value);
+ partial void OnCompileManChanged();
+ partial void OnCompileDateChanging(System.Nullable value);
+ partial void OnCompileDateChanged();
+ partial void OnReviewerChanging(string value);
+ partial void OnReviewerChanged();
+ partial void OnRevieweDateChanging(System.Nullable value);
+ partial void OnRevieweDateChanged();
+ #endregion
+
+ public JGZL_ValveTestConfirmationForm()
+ {
+ this._Base_Project = default(EntityRef);
+ this._Sys_User = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string RecordId
+ {
+ get
+ {
+ return this._RecordId;
+ }
+ set
+ {
+ if ((this._RecordId != value))
+ {
+ this.OnRecordIdChanging(value);
+ this.SendPropertyChanging();
+ this._RecordId = value;
+ this.SendPropertyChanged("RecordId");
+ this.OnRecordIdChanged();
+ }
+ }
+ }
+
+ [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="_Code", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ public string Code
+ {
+ get
+ {
+ return this._Code;
+ }
+ set
+ {
+ if ((this._Code != value))
+ {
+ this.OnCodeChanging(value);
+ this.SendPropertyChanging();
+ this._Code = value;
+ this.SendPropertyChanged("Code");
+ this.OnCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
+ public string Name
+ {
+ get
+ {
+ return this._Name;
+ }
+ set
+ {
+ if ((this._Name != value))
+ {
+ this.OnNameChanging(value);
+ this.SendPropertyChanging();
+ this._Name = value;
+ this.SendPropertyChanged("Name");
+ this.OnNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModelNumber", DbType="NVarChar(50)")]
+ public string ModelNumber
+ {
+ get
+ {
+ return this._ModelNumber;
+ }
+ set
+ {
+ if ((this._ModelNumber != value))
+ {
+ this.OnModelNumberChanging(value);
+ this.SendPropertyChanging();
+ this._ModelNumber = value;
+ this.SendPropertyChanged("ModelNumber");
+ this.OnModelNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Specifications", DbType="NVarChar(50)")]
+ public string Specifications
+ {
+ get
+ {
+ return this._Specifications;
+ }
+ set
+ {
+ if ((this._Specifications != value))
+ {
+ this.OnSpecificationsChanging(value);
+ this.SendPropertyChanging();
+ this._Specifications = value;
+ this.SendPropertyChanged("Specifications");
+ this.OnSpecificationsChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NominalPressure", DbType="NVarChar(50)")]
+ public string NominalPressure
+ {
+ get
+ {
+ return this._NominalPressure;
+ }
+ set
+ {
+ if ((this._NominalPressure != value))
+ {
+ this.OnNominalPressureChanging(value);
+ this.SendPropertyChanging();
+ this._NominalPressure = value;
+ this.SendPropertyChanged("NominalPressure");
+ this.OnNominalPressureChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num", DbType="Int")]
+ public System.Nullable Num
+ {
+ get
+ {
+ return this._Num;
+ }
+ set
+ {
+ if ((this._Num != value))
+ {
+ this.OnNumChanging(value);
+ this.SendPropertyChanging();
+ this._Num = value;
+ this.SendPropertyChanged("Num");
+ this.OnNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureTest", DbType="NVarChar(50)")]
+ public string PressureTest
+ {
+ get
+ {
+ return this._PressureTest;
+ }
+ set
+ {
+ if ((this._PressureTest != value))
+ {
+ this.OnPressureTestChanging(value);
+ this.SendPropertyChanging();
+ this._PressureTest = value;
+ this.SendPropertyChanged("PressureTest");
+ this.OnPressureTestChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SealTest", DbType="NVarChar(50)")]
+ public string SealTest
+ {
+ get
+ {
+ return this._SealTest;
+ }
+ set
+ {
+ if ((this._SealTest != value))
+ {
+ this.OnSealTestChanging(value);
+ this.SendPropertyChanging();
+ this._SealTest = value;
+ this.SendPropertyChanged("SealTest");
+ this.OnSealTestChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpperSealTest", DbType="NVarChar(50)")]
+ public string UpperSealTest
+ {
+ get
+ {
+ return this._UpperSealTest;
+ }
+ set
+ {
+ if ((this._UpperSealTest != value))
+ {
+ this.OnUpperSealTestChanging(value);
+ this.SendPropertyChanging();
+ this._UpperSealTest = value;
+ this.SendPropertyChanged("UpperSealTest");
+ this.OnUpperSealTestChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestResults", DbType="NVarChar(2000)")]
+ public string TestResults
+ {
+ get
+ {
+ return this._TestResults;
+ }
+ set
+ {
+ if ((this._TestResults != value))
+ {
+ this.OnTestResultsChanging(value);
+ this.SendPropertyChanging();
+ this._TestResults = value;
+ this.SendPropertyChanged("TestResults");
+ this.OnTestResultsChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+ 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="_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.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="_RevieweDate", DbType="DateTime")]
+ public System.Nullable RevieweDate
+ {
+ get
+ {
+ return this._RevieweDate;
+ }
+ set
+ {
+ if ((this._RevieweDate != value))
+ {
+ this.OnRevieweDateChanging(value);
+ this.SendPropertyChanging();
+ this._RevieweDate = value;
+ this.SendPropertyChanged("RevieweDate");
+ this.OnRevieweDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveTestConfirmationForm_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_ValveTestConfirmationForm.Remove(this);
+ }
+ this._Base_Project.Entity = value;
+ if ((value != null))
+ {
+ value.JGZL_ValveTestConfirmationForm.Add(this);
+ this._ProjectId = value.ProjectId;
+ }
+ else
+ {
+ this._ProjectId = default(string);
+ }
+ this.SendPropertyChanged("Base_Project");
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveTestConfirmationForm_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_ValveTestConfirmationForm.Remove(this);
+ }
+ this._Sys_User.Entity = value;
+ if ((value != null))
+ {
+ value.JGZL_ValveTestConfirmationForm.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.OAM_UesrQualified")]
public partial class OAM_UesrQualified : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -110313,6 +111543,10 @@ namespace Model
private EntitySet _JGZL_TeamWeldingInspection;
+ private EntitySet _JGZL_ValveInspectionTestRecord;
+
+ private EntitySet _JGZL_ValveTestConfirmationForm;
+
private EntitySet _Project_User;
private EntitySet _Project_UserButtonPower;
@@ -110411,6 +111645,8 @@ namespace Model
this._JGZL_QualityControlPointInspection = new EntitySet(new Action(this.attach_JGZL_QualityControlPointInspection), new Action(this.detach_JGZL_QualityControlPointInspection));
this._JGZL_SpecialEquipmentMaintenance = new EntitySet(new Action(this.attach_JGZL_SpecialEquipmentMaintenance), new Action(this.detach_JGZL_SpecialEquipmentMaintenance));
this._JGZL_TeamWeldingInspection = new EntitySet(new Action(this.attach_JGZL_TeamWeldingInspection), new Action(this.detach_JGZL_TeamWeldingInspection));
+ this._JGZL_ValveInspectionTestRecord = new EntitySet(new Action(this.attach_JGZL_ValveInspectionTestRecord), new Action(this.detach_JGZL_ValveInspectionTestRecord));
+ this._JGZL_ValveTestConfirmationForm = new EntitySet(new Action(this.attach_JGZL_ValveTestConfirmationForm), new Action(this.detach_JGZL_ValveTestConfirmationForm));
this._Project_User = new EntitySet(new Action(this.attach_Project_User), new Action(this.detach_Project_User));
this._Project_UserButtonPower = new EntitySet(new Action(this.attach_Project_UserButtonPower), new Action(this.detach_Project_UserButtonPower));
this._Project_UserPower = new EntitySet(new Action(this.attach_Project_UserPower), new Action(this.detach_Project_UserPower));
@@ -111270,6 +112506,32 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveInspectionTestRecord_Sys_User", Storage="_JGZL_ValveInspectionTestRecord", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
+ public EntitySet JGZL_ValveInspectionTestRecord
+ {
+ get
+ {
+ return this._JGZL_ValveInspectionTestRecord;
+ }
+ set
+ {
+ this._JGZL_ValveInspectionTestRecord.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ValveTestConfirmationForm_Sys_User", Storage="_JGZL_ValveTestConfirmationForm", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
+ public EntitySet JGZL_ValveTestConfirmationForm
+ {
+ get
+ {
+ return this._JGZL_ValveTestConfirmationForm;
+ }
+ set
+ {
+ this._JGZL_ValveTestConfirmationForm.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_User_Sys_User", Storage="_Project_User", ThisKey="UserId", OtherKey="UserId", DeleteRule="NO ACTION")]
public EntitySet Project_User
{
@@ -111841,6 +113103,30 @@ namespace Model
entity.Sys_User = null;
}
+ private void attach_JGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord entity)
+ {
+ this.SendPropertyChanging();
+ entity.Sys_User = this;
+ }
+
+ private void detach_JGZL_ValveInspectionTestRecord(JGZL_ValveInspectionTestRecord entity)
+ {
+ this.SendPropertyChanging();
+ entity.Sys_User = null;
+ }
+
+ private void attach_JGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm entity)
+ {
+ this.SendPropertyChanging();
+ entity.Sys_User = this;
+ }
+
+ private void detach_JGZL_ValveTestConfirmationForm(JGZL_ValveTestConfirmationForm entity)
+ {
+ this.SendPropertyChanging();
+ entity.Sys_User = null;
+ }
+
private void attach_Project_User(Project_User entity)
{
this.SendPropertyChanging();
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index a48b337..ef14066 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,4 +1,4 @@
-
+
Debug|Any CPU