diff --git a/CreateModel.bat b/CreateModel.bat
index 3c459ce..8b5f697 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -27,7 +27,7 @@ REM --------------
 @echo.
 @call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:.\SQL2019 /database:HJGLDB_DS /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:.\SQL2022 /database:HJGLDB_DS /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/DataBase/鐗堟湰鏃ュ織/HJGLDB_DS_2025-12-09_bwj.sql b/DataBase/鐗堟湰鏃ュ織/HJGLDB_DS_2025-12-09_bwj.sql
new file mode 100644
index 0000000..6ff3adc
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/HJGLDB_DS_2025-12-09_bwj.sql
@@ -0,0 +1,90 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('2A84FA58-8B20-48ED-A621-3EC98CF4AD28','交工资料','',250,'0','3')
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('A4B2E5A9-96A8-460F-885A-BE5FF9B5019E','工程施工开工报告','JGZL/CommencementReport.aspx',10,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+go
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('E8A5E227-B90B-4F1D-BAC9-63992DF65E74','A4B2E5A9-96A8-460F-885A-BE5FF9B5019E','增加',1)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('ABB85733-F474-4D68-BED0-F1D92FA0765F','A4B2E5A9-96A8-460F-885A-BE5FF9B5019E','修改',2)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('2C370582-BE78-4297-8C29-30FCD49CEFF1','A4B2E5A9-96A8-460F-885A-BE5FF9B5019E','删除',3)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('2AE25E38-D278-4697-8CC1-4095BCDEF6B5','A4B2E5A9-96A8-460F-885A-BE5FF9B5019E','保存',4)
+go
+
+CREATE TABLE [dbo].[JGZL_CommencementReport](
+	[CommencementReportId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[ContractNumber] [nvarchar](100) NULL,
+	[DesignUnit] [nvarchar](50) NULL,
+	[PlannedStartDate] [datetime] NULL,
+	[PlannedEndDate] [datetime] NULL,
+	[ProjectContent] [nvarchar](2000) NULL,
+	[Conditions] [nvarchar](1000) NULL,
+	[ReviewOpinion] [nvarchar](1000) NULL,
+	[QualitySupervisionOpinion] [nvarchar](1000) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JGZL_CommencementReport] PRIMARY KEY CLUSTERED 
+(
+	[CommencementReportId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[JGZL_CommencementReport]  WITH CHECK ADD  CONSTRAINT [FK_JGZL_CommencementReport_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JGZL_CommencementReport] CHECK CONSTRAINT [FK_JGZL_CommencementReport_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JGZL_CommencementReport]  WITH CHECK ADD  CONSTRAINT [FK_JGZL_CommencementReport_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JGZL_CommencementReport] CHECK CONSTRAINT [FK_JGZL_CommencementReport_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'CommencementReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'施工合同编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'ContractNumber'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设计单位' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'DesignUnit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'计划开工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'PlannedStartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'计划交工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'PlannedEndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工程内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'ProjectContent'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开工条件' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'Conditions'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审查意见' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'ReviewOpinion'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'质量监督意见' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'QualitySupervisionOpinion'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工程施工开工报告' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_CommencementReport'
+GO
+
+
diff --git a/DataBase/鐗堟湰鏃ュ織/HJGLDB_DS_2025-12-09_gf.sql b/DataBase/鐗堟湰鏃ュ織/HJGLDB_DS_2025-12-09_gf.sql
new file mode 100644
index 0000000..47af699
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/HJGLDB_DS_2025-12-09_gf.sql
@@ -0,0 +1,185 @@
+
+ALTER  PROC [dbo].[HJGL_sp_StatisticsSampleTable]    
+	@projectId NVARCHAR(50) = NULL,
+	@iso_isoNo VARCHAR(50) = NULL,
+	@isHotPress bit = NULL,
+	@Welded NVARCHAR(50) =NULL,
+	@ndtType NVARCHAR(10) = NULL,
+	@ndtResult NVARCHAR(20)=NULL
+    
+AS
+/*********统计样表 佘春生修改于2022.11.30********/
+SELECT 
+JointInfo.JOT_ID,
+project.ProjectCode,  --施工号
+IsoInfo.PressureTestPackageNo,--试压包编号
+IsoInfo.ISO_ID,
+IsoInfo.ISO_IsoNo, --管线号
+'1-'+IsoClass.ISC_IsoName+'-'+Ser.SER_Code+'-'+Steel.STE_Code AS ISO_Code,   --管道编号
+IsoClass.ISC_IsoName,  --管道等级
+Ser.SER_Name,  --介质
+IsoInfo.ISO_DesignPress,  --设计压力
+IsoInfo.PipeLineClass,    --管道类别
+JointInfo.JOT_JointNo, --焊缝编号
+JointInfo.JOT_JointDesc,  --焊缝规格
+JointInfo.JOT_Location,   --焊接位置
+WeldMethod.WME_Name,      --焊接方法
+JointType.JOTY_Code,      --焊缝类型
+JointType.JOTY_Group,
+Sort1,Sort2,Sort3,Sort4,Sort5,
+IsoInfo.ISO_Insulator,    --绝热类别
+IsoInfo.ISO_DesignTemperature,   --设计温度
+IsoInfo.ISO_TestPress,           --耐压试验
+(CASE WHEN WeldMat.WMT_MatCode IS NOT NULL AND WeldSilk.WMT_MatCode IS NOT NULL and WeldMat.WMT_MatCode!=WeldSilk.WMT_MatCode
+                                  THEN WeldMat.WMT_MatCode + '/' + WeldSilk.WMT_MatCode
+                                  WHEN WeldMat.WMT_MatCode IS NOT NULL THEN WeldMat.WMT_MatCode
+                                  ELSE ISNULL(WeldSilk.WMT_MatCode,'') END) AS WeldMatSilkCode,
+(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code,
+--Welder1.WED_Code,--焊工号
+Steel.STE_Code,--材质
+Steel.STE_Name,--材质类型
+NDTRate.NDTR_Name,--对应检测比例
+(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate
+	ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, --焊接日期
+JointInfo.JOT_Size,--寸经
+Batch.BatchCode,--批次
+BatchDetail.NDT,   --检测方式Id
+(CASE WHEN BatchDetail.PointType=2 THEN 'K' ELSE '' END) AS PointType,--扩拍号
+JointInfo.JOT_Dia,--直径
+JointInfo.JOT_Sch, --壁厚
+(CASE WHEN JointInfo.RT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS RTTrust,  --RT委托
+JointInfo.RT_TrustCode,   --RT委托单编号
+JointInfo.RT_TrustDate AS RTTrustDate,  --射线检测委托日期
+ 
+ JointInfo.RTFeedbackDate,  --射线检测反馈日期
+ JointInfo.RT_States AS RTTestResult,--RT检测结果 
+ 
+ (CASE WHEN JointInfo.UT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS  UTTrust,--UT委托
+ JointInfo.UT_States AS UTTestResult,--UT检测结果
+  
+ (CASE WHEN JointInfo.MT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS MTTrust,--MT委托
+ JointInfo.MT_States AS MTTestResult,--MT检测结果
+
+ (CASE WHEN JointInfo.PT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS PTTrust,--PT委托
+ JointInfo.PT_TrustCode,  --PT委托单编号
+ JointInfo.PT_TrustDate,   --PT委托日期
+ JointInfo.PT_States AS PTTestResult,--PT检测结果
+
+ (CASE WHEN JointInfo.PAUT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS PAUTTrust,  --PAUT委托
+ JointInfo.PAUT_TrustCode,   --PAUT委托单编号
+  JointInfo.PAUT_TrustDate AS PAUTTrustDate,  --PAUT检测委托日期
+  JointInfo.PAUT_States AS PAUTTestResult,--PAUT检测结果 
+
+  (CASE WHEN (SELECT TOP 1 UnableCheck FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID )=1 
+        THEN '√' ELSE '' END) AS UnableCheck,
+  (SELECT TOP 1 UnableCheckReason FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID ) AS UnableCheckReason,
+
+(CASE WHEN JointInfo.ProessTypes like '%4|5%' Then '消应力热处理,稳定化处理' 
+WHEN JointInfo.ProessTypes like '%4%' Then '消应力热处理'
+WHEN JointInfo.ProessTypes like '%5%' Then '稳定化处理'
+                         ELSE '' END) AS ProessTypes,--热处理类型 
+(case when JointInfo.ProessTypes like '%4%' or JointInfo.ProessTypes like '%5%' then 'Y'
+else 'N' end) as IS_Proess,
+(case when JointInfo.ProessTypes like '%1%' then 'Y'
+else '' end) as IS_Preheating,
+(select top 1 HotProessTrustCode from HJGL_CH_HotProessTrust t left join HJGL_CH_HotProessTrustItem i on t.HotProessTrustId=i.HotProessTrustId where i.JOT_ID=JointInfo.JOT_ID order by TrustDate desc)
+as HotProessTrustCode,   --热处理委托编号
+JointInfo.HotProessTrustDate,--热处理委托时间
+JointInfo.HotResultDate,--热处理反馈时间
+(select top 1 HotHardCode from HJGL_CH_HardTestReport t left join HJGL_CH_HardTestReportItem i on t.HardTestReportId=i.HardTestReportId where i.JOT_ID=JointInfo.JOT_ID order by TestDate desc)
+as HotHardCode,   --硬度委托编号
+JointInfo.HardTrustDate,--硬度委托时间
+JointInfo.HardResultDate,--硬度反馈时间
+(case when JointInfo.HardTestResultOK=1 then '合格' when JointInfo.HardTestResultOK=0 then '不合格' else '' end) as HardResult,--硬度检测结果
+BatchDetail.BatchDetailId
+FROM dbo.HJGL_PW_JointInfo AS JointInfo
+LEFT JOIN DBO.HJGL_BO_BatchDetail AS BatchDetail ON JointInfo.JOT_ID = BatchDetail.JOT_ID
+LEFT JOIN DBO.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID
+LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
+LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=JointInfo.JOTY_ID
+LEFT JOIN DBO.HJGL_BO_Batch AS Batch ON Batch.BatchId = BatchDetail.BatchId
+LEFT JOIN dbo.Base_Project project ON project.ProjectId=JointInfo.ProjectId
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID
+LEFT JOIN DBO.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
+LEFT JOIN DBO.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
+LEFT JOIN DBO.HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID = JointInfo.DReportID
+LEFT JOIN dbo.HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID = JointInfo.NDTR_ID
+LEFT JOIN dbo.HJGL_BS_IsoClass AS IsoClass ON IsoClass.ISC_ID =IsoInfo.ISC_ID
+LEFT JOIN dbo.HJGL_BS_Service AS Ser ON Ser.SER_ID = IsoInfo.SER_ID
+LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=JointInfo.JOT_WeldMat
+LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=JointInfo.JOT_WeldSilk
+
+WHERE (JointInfo.ProjectId=@projectId OR @projectId IS NULL) 
+       AND ((CASE WHEN @ndtType='RT' THEN JointInfo.RT_TrustCode
+	             WHEN @ndtType='PT' THEN JointInfo.PT_TrustCode
+				 WHEN @ndtType='MT' THEN JointInfo.MT_TrustCode
+				 WHEN @ndtType='UT' THEN JointInfo.UT_TrustCode
+				 WHEN @ndtType='PAUT' THEN JointInfo.PAUT_TrustCode END) IS NOT NULL OR  @ndtType IS NULL)
+      AND ((CASE WHEN @ndtType='RT' AND @ndtResult IS NOT NULL THEN JointInfo.RT_States
+	             WHEN @ndtType='PT' AND @ndtResult IS NOT NULL THEN JointInfo.PT_States
+				 WHEN @ndtType='MT' AND @ndtResult IS NOT NULL THEN JointInfo.MT_States
+				 WHEN @ndtType='UT' AND @ndtResult IS NOT NULL THEN JointInfo.UT_States
+				 WHEN @ndtType='PAUT' AND @ndtResult IS NOT NULL THEN JointInfo.PAUT_States END) =@ndtResult OR @ndtResult IS NULL)
+AND ((case when JointInfo.DReportID IS NOT NULL then '1' else '2' end)=@Welded OR @Welded IS NULL)
+AND (IsoInfo.ISO_IsoNo =@iso_isoNo OR @iso_isoNo IS NULL)
+AND (((SELECT TOP 1 TrustDate from dbo.HJGL_CH_HotProessTrustItem a 
+      WHERE a.JOT_ID=BatchDetail.JOT_ID and (a.ProessTypes='4' OR a.ProessTypes='5')) IS NOT NULL
+            AND @isHotPress=1) OR  @isHotPress IS NULL)
+ORDER BY project.ProjectCode,IsoInfo.ISO_IsoNo,JointInfo.JOT_JointNo
+
+
+
+
+GO
+
+
+INSERT INTO dbo.Sys_Menu(MenuId, MenuName, Url, SortIndex, SuperMenu,MenuModule)
+VALUES ('19FC40C2-4FDC-44DC-A785-85491BACAC6D','焊材质保书','HJGL/MaterialManage/QualityCertificate.aspx',5,'B2B4326D-8FD6-499B-965B-6B8D9BD4CC06','7')
+GO
+/*焊材质保书*/
+INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('1B26BF66-1CEE-42B0-8477-F0A74AE2B404','19FC40C2-4FDC-44DC-A785-85491BACAC6D','增加',1)
+INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B4AC36B0-DD9B-48A4-AE55-8DFED0C40917','19FC40C2-4FDC-44DC-A785-85491BACAC6D','修改',2)
+INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('4ADD8C65-3085-444E-BA2D-A086B04DD54C','19FC40C2-4FDC-44DC-A785-85491BACAC6D','删除',3)
+INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('03A9A0A8-62E5-405B-924C-0DDD40F12CB4','19FC40C2-4FDC-44DC-A785-85491BACAC6D','保存',4)
+go
+
+
+
+CREATE TABLE [dbo].[Weld_QualityCertificate](
+	[QualityCertificateId] [nvarchar](50) NOT NULL,
+	[WeldId] [nvarchar](50) NULL,
+	[HeartNo] [nvarchar](50) NULL,
+	[Warrantybook] [nvarchar](50) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_Weld_QualityCertificate] PRIMARY KEY CLUSTERED 
+(
+	[QualityCertificateId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'QualityCertificateId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'焊材id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'WeldId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'批号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'HeartNo'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'入库自编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'Warrantybook'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'焊材质保书表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_QualityCertificate'
+GO
+
+
+
diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj
index dce8a56..7faf8e8 100644
--- a/HJGL_DS/BLL/BLL.csproj
+++ b/HJGL_DS/BLL/BLL.csproj
@@ -218,6 +218,7 @@
     <Compile Include="HJGL\MaterialManage\HJGL_EMaterialRegistService.cs" />
     <Compile Include="HJGL\MaterialManage\HJGL_EMInventoryRecordsService.cs" />
     <Compile Include="HJGL\MaterialManage\HJGL_EWeldRHRecordService.cs" />
+    <Compile Include="HJGL\MaterialManage\QualityCertificateService.cs" />
     <Compile Include="HJGL\MaterialManage\TemperatureAndHumidityProjectService.cs" />
     <Compile Include="HJGL\PersonManage\HJGL_PersonManageService.cs" />
     <Compile Include="HJGL\PersonManage\HJGL_WelderQualifiedProjectService.cs" />
@@ -244,6 +245,7 @@
     <Compile Include="HJGL\WeldingManage\WelderOKRateService.cs" />
     <Compile Include="HJGL\WeldingManage\WelderOKRateStatisticsService.cs" />
     <Compile Include="HJGL\WeldingManage\WeldRecordInService.cs" />
+    <Compile Include="JGZL\CommencementReportService.cs" />
     <Compile Include="JsonHelper.cs" />
     <Compile Include="libFace.cs" />
     <Compile Include="libOpenCV.cs" />
diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs
index f721b55..0456667 100644
--- a/HJGL_DS/BLL/Common/Const.cs
+++ b/HJGL_DS/BLL/Common/Const.cs
@@ -1682,6 +1682,11 @@ namespace BLL
         #endregion
 
         #region 鐒婃潯鐑樼儰璁板綍
+        /// <summary>
+        /// 鐒婃潗璐ㄤ繚涔�
+        /// </summary>
+        public const string CLGL_QualityCertificateMenuId = "19FC40C2-4FDC-44DC-A785-85491BACAC6D";
+
         /// <summary>
         /// 鐒婃潯鐑樼儰璁板綍
         /// </summary>
@@ -1749,6 +1754,13 @@ namespace BLL
 
         #endregion
 
+        #region 浜ゅ伐璧勬枡鑿滃崟Id
+        /// <summary>
+        /// 宸ョ▼鏂藉伐寮�宸ユ姤鍛�
+        /// </summary>
+        public const string JGZL_CommencementReportMenuId = "A4B2E5A9-96A8-460F-885A-BE5FF9B5019E";
+        #endregion
+
         #region 鎶ヨ〃瀵瑰簲ID
 
         /// <summary>
diff --git a/HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs b/HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs
new file mode 100644
index 0000000..7957157
--- /dev/null
+++ b/HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs
@@ -0,0 +1,73 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace BLL
+{
+    public static class QualityCertificateService
+    {
+        /// <summary>
+        /// 鏍规嵁鐒婃潗璐ㄤ繚涔d鑾峰彇鐒婃潗璐ㄤ繚涔︿俊鎭�
+        /// </summary>
+        /// <param name="qualityCertificateId">鐒婃潗璐ㄤ繚涔d</param>
+        /// <returns></returns>
+        public static Model.Weld_QualityCertificate GetQualityCertificateByQualityCertificateId(string qualityCertificateId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var QualityCertificate = db.Weld_QualityCertificate.FirstOrDefault(e => e.QualityCertificateId == qualityCertificateId);
+            return QualityCertificate;
+        }
+
+        /// <summary>
+        /// 娣诲姞鐒婃潗璐ㄤ繚涔�
+        /// </summary>
+        /// <param name="qualityCertificate"></param>
+        public static void AddQualityCertificate(Model.Weld_QualityCertificate qualityCertificate)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_QualityCertificate newQualityCertificate = new Model.Weld_QualityCertificate();
+
+            newQualityCertificate.QualityCertificateId = qualityCertificate.QualityCertificateId;
+            newQualityCertificate.WeldId = qualityCertificate.WeldId;
+            newQualityCertificate.HeartNo = qualityCertificate.HeartNo;
+            newQualityCertificate.Warrantybook = qualityCertificate.Warrantybook;
+            newQualityCertificate.CompileMan = qualityCertificate.CompileMan;
+            newQualityCertificate.CompileDate = qualityCertificate.CompileDate;
+
+            db.Weld_QualityCertificate.InsertOnSubmit(newQualityCertificate);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼鐒婁笣鐑樼儰璁板綍
+        /// </summary>
+        /// <param name="qualityCertificate"></param>
+        public static void UpdateQualityCertificate(Model.Weld_QualityCertificate qualityCertificate)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_QualityCertificate newQualityCertificate = db.Weld_QualityCertificate.First(e => e.QualityCertificateId == qualityCertificate.QualityCertificateId);
+
+            newQualityCertificate.WeldId = qualityCertificate.WeldId;
+            newQualityCertificate.HeartNo = qualityCertificate.HeartNo;
+            newQualityCertificate.Warrantybook = qualityCertificate.Warrantybook;
+            newQualityCertificate.CompileMan = qualityCertificate.CompileMan;
+            newQualityCertificate.CompileDate = qualityCertificate.CompileDate;
+
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鐒婁笣鐑樼儰璁板綍
+        /// </summary>
+        /// <param name="eletrodeId"></param>
+        public static void DeleteQualityCertificate(string qualityCertificateId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_QualityCertificate qualityCertificate = db.Weld_QualityCertificate.First(e => e.QualityCertificateId == qualityCertificateId);
+            db.Weld_QualityCertificate.DeleteOnSubmit(qualityCertificate);
+            db.SubmitChanges();
+        }
+    }
+}
diff --git a/HJGL_DS/BLL/JGZL/CommencementReportService.cs b/HJGL_DS/BLL/JGZL/CommencementReportService.cs
new file mode 100644
index 0000000..c76c436
--- /dev/null
+++ b/HJGL_DS/BLL/JGZL/CommencementReportService.cs
@@ -0,0 +1,86 @@
+锘縰sing Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 宸ョ▼鏂藉伐寮�宸ユ姤鍛�
+    /// </summary>
+    public class CommencementReportService
+    {
+        /// <summary>
+        /// 鏍规嵁涓婚敭鑾峰彇宸ョ▼鏂藉伐寮�宸ユ姤鍛�
+        /// </summary>
+        /// <param name="commencementReportId"></param>
+        /// <returns></returns>
+        public static Model.JGZL_CommencementReport GetCommencementReportById(string commencementReportId)
+        {
+            return Funs.DB.JGZL_CommencementReport.FirstOrDefault(e => e.CommencementReportId == commencementReportId);
+        }
+
+        /// <summary>
+        /// 娣诲姞宸ョ▼鏂藉伐寮�宸ユ姤鍛�
+        /// </summary>
+        /// <param name="commencementReport"></param>
+        public static void AddCommencementReport(Model.JGZL_CommencementReport commencementReport)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_CommencementReport newCommencementReport = new Model.JGZL_CommencementReport();
+            newCommencementReport.CommencementReportId = commencementReport.CommencementReportId;
+            newCommencementReport.ProjectId = commencementReport.ProjectId;
+            newCommencementReport.ContractNumber = commencementReport.ContractNumber;
+            newCommencementReport.DesignUnit = commencementReport.DesignUnit;
+            newCommencementReport.PlannedStartDate = commencementReport.PlannedStartDate;
+            newCommencementReport.PlannedEndDate = commencementReport.PlannedEndDate;
+            newCommencementReport.ProjectContent = commencementReport.ProjectContent;
+            newCommencementReport.Conditions = commencementReport.Conditions;
+            newCommencementReport.ReviewOpinion = commencementReport.ReviewOpinion;
+            newCommencementReport.QualitySupervisionOpinion = commencementReport.QualitySupervisionOpinion;
+            newCommencementReport.CompileMan = commencementReport.CompileMan;
+            newCommencementReport.CompileDate = commencementReport.CompileDate;
+            db.JGZL_CommencementReport.InsertOnSubmit(newCommencementReport);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼宸ョ▼鏂藉伐鎶ュ憡
+        /// </summary>
+        /// <param name="commencementReport"></param>
+        public static void UpdateCommencementReport(Model.JGZL_CommencementReport commencementReport)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_CommencementReport newCommencementReport = db.JGZL_CommencementReport.FirstOrDefault(e => e.CommencementReportId == commencementReport.CommencementReportId);
+            if (newCommencementReport != null)
+            {
+                newCommencementReport.ContractNumber = commencementReport.ContractNumber;
+                newCommencementReport.DesignUnit = commencementReport.DesignUnit;
+                newCommencementReport.PlannedStartDate = commencementReport.PlannedStartDate;
+                newCommencementReport.PlannedEndDate = commencementReport.PlannedEndDate;
+                newCommencementReport.ProjectContent = commencementReport.ProjectContent;
+                newCommencementReport.Conditions = commencementReport.Conditions;
+                newCommencementReport.ReviewOpinion = commencementReport.ReviewOpinion;
+                newCommencementReport.QualitySupervisionOpinion = commencementReport.QualitySupervisionOpinion;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓婚敭鍒犻櫎宸ョ▼鏂藉伐寮�宸ユ姤鍛�
+        /// </summary>
+        /// <param name="commencementReportId"></param>
+        public static void DeleteCommencementReportById(string commencementReportId)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_CommencementReport commencementReport = db.JGZL_CommencementReport.FirstOrDefault(e => e.CommencementReportId == commencementReportId);
+            if (commencementReport != null)
+            {
+                db.JGZL_CommencementReport.DeleteOnSubmit(commencementReport);
+                db.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs b/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs
index 67b8c85..ba5a5ca 100644
--- a/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs
+++ b/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Web.UI.WebControls;
 
 namespace BLL
 {
@@ -77,5 +78,45 @@ namespace BLL
         {
             return (from x in Funs.DB.Weld_StockInit where x.WeldId == weldId select x).Count();
         }
+
+        /// <summary>
+        /// 鍔犺浇鎵瑰彿涓嬫媺妗�
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="isShowPlease"></param>
+        public static void InitHeartNo(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "Value";
+            dropName.DataTextField = "Text";
+            dropName.DataSource = GetHeartNoList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏂藉伐閮ㄧ敤鎴�
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static ListItem[] GetHeartNoList()
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var ls = (from x in db.Weld_StockIn
+                            select new {
+                                x.HeartNo,
+                                x.Warrantybook
+                            }).Distinct().ToList();
+                ListItem[] lis = new ListItem[ls.Count()];
+                for (int i = 0; i < ls.Count(); i++)
+                {
+                    lis[i] = new ListItem(ls[i].HeartNo ?? "", ls[i].Warrantybook.ToString());
+                }
+                return lis;
+            }
+        }
     }
 }
diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt
index 270b3e2..b27fd49 100644
--- a/HJGL_DS/FineUIPro.Web/ErrLog.txt
+++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt
@@ -35,3 +35,26 @@ IP鍦板潃:::1
 
 鍑洪敊鏃堕棿:11/11/2025 15:17:16
 
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:IndexOutOfRangeException
+閿欒淇℃伅:鏃犳硶鎵惧埌鍒� CompileDate銆�
+閿欒鍫嗘爤:
+   鍦� System.Data.DataTable.ParseSortString(String sortString)
+   鍦� System.Data.DataView.CheckSort(String sort)
+   鍦� System.Data.DataView.set_Sort(String value)
+   鍦� FineUIPro.Web.PageBase.GetPagedDataTable(Grid Grid1, DataTable tb) 浣嶇疆 D:\宸ヤ綔\榧庣洓\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:琛屽彿 328
+   鍦� FineUIPro.Web.HJGL.MaterialManage.QualityCertificate.BindGrid() 浣嶇疆 D:\宸ヤ綔\榧庣洓\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\MaterialManage\QualityCertificate.aspx.cs:琛屽彿 63
+   鍦� FineUIPro.Web.HJGL.MaterialManage.QualityCertificate.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\宸ヤ綔\榧庣洓\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\MaterialManage\QualityCertificate.aspx.cs:琛屽彿 31
+   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
+   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
+   鍦� System.Web.UI.Control.LoadRecursive()
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:12/09/2025 16:42:15
+鍑洪敊鏂囦欢:http://localhost:64304/HJGL/MaterialManage/QualityCertificate.aspx
+IP鍦板潃:::1
+鎿嶄綔浜哄憳:绠＄悊鍛�
+
+鍑洪敊鏃堕棿:12/09/2025 16:42:15
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/宸ョ▼鏂藉伐寮�宸ユ姤鍛�.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/宸ョ▼鏂藉伐寮�宸ユ姤鍛�.frx
new file mode 100644
index 0000000..c32eae1
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/宸ョ▼鏂藉伐寮�宸ユ姤鍛�.frx
@@ -0,0 +1,125 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/09/2025 11:39:20" ReportInfo.Modified="12/09/2025 14:32:25" ReportInfo.CreatorVersion="2017.1.16.0">
+  <Dictionary>
+    <Parameter Name="ProjectName" DataType="System.String"/>
+    <Parameter Name="ContractNumber" DataType="System.String"/>
+    <Parameter Name="DesignUnit" DataType="System.String"/>
+    <Parameter Name="PlannedStartDate" DataType="System.String"/>
+    <Parameter Name="PlannedEndDate" DataType="System.String"/>
+    <Parameter Name="ProjectContent" DataType="System.String"/>
+    <Parameter Name="Conditions" DataType="System.String"/>
+    <Parameter Name="ReviewOpinion" DataType="System.String"/>
+    <Parameter Name="QualitySupervisionOpinion" DataType="System.String"/>
+  </Dictionary>
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" Guides="0,623.7,160.65,69.3,59.85,374.85,107.1,31.5,100.8,267.75,248.85,211.05,422.1">
+    <PageHeaderBand Name="PageHeader1" Width="623.7" Height="788.26" Guides="0,788.26,86.21,20.06,66.15,125.17,38.96,164.13,360.69,196.56,503.6,142.91,635.9,132.3,749.3,113.4">
+      <TableObject Name="Table1" Width="623.7" Height="788.26">
+        <TableColumn Name="Column1" Width="31.5"/>
+        <TableColumn Name="Column2" Width="69.3"/>
+        <TableColumn Name="Column3" Width="59.85"/>
+        <TableColumn Name="Column4" Width="107.1"/>
+        <TableColumn Name="Column5" Width="107.1"/>
+        <TableColumn Name="Column6" Width="248.85"/>
+        <TableRow Name="Row1" Height="20.06">
+          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3503鈥擩105A" HorzAlign="Center" VertAlign="Center" Font="榛戜綋, 10.5pt" ColSpan="3" RowSpan="2"/>
+          <TableCell Name="Cell2" Border.Lines="All"/>
+          <TableCell Name="Cell3" Border.Lines="All"/>
+          <TableCell Name="Cell4" Border.Lines="All" Text="宸ョ▼鏂藉伐寮�宸ユ姤鍛�" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 16pt, style=Bold" ColSpan="2" RowSpan="2"/>
+          <TableCell Name="Cell5" Border.Lines="All"/>
+          <TableCell Name="Cell26" Border.Lines="Left, Right, Top" Text="宸ョ▼鍚嶇О锛�" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row9" Height="66.15">
+          <TableCell Name="Cell57" Border.Lines="All"/>
+          <TableCell Name="Cell58" Border.Lines="All"/>
+          <TableCell Name="Cell59" Border.Lines="All"/>
+          <TableCell Name="Cell60" Border.Lines="All"/>
+          <TableCell Name="Cell61" Border.Lines="All"/>
+          <TableCell Name="Cell62" Border.Lines="Left, Right, Bottom" Text="[ProjectName]" Font="妤蜂綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row2" Height="38.96">
+          <TableCell Name="Cell6" Border.Lines="All" Text="鏂藉伐鍚堝悓缂栧彿" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell7" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell8" Border.Lines="All" Text="[ContractNumber]" HorzAlign="Center" VertAlign="Center" Font="妤蜂綋, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell9" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="妤蜂綋, 10.5pt"/>
+          <TableCell Name="Cell10" Border.Lines="All" Text="璁捐鍗曚綅" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell28" Border.Lines="All" Text="[DesignUnit]" HorzAlign="Center" VertAlign="Center" Font="妤蜂綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row3" Height="38.96">
+          <TableCell Name="Cell11" Border.Lines="All" Text="璁″垝寮�宸ユ棩鏈�" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell13" Border.Lines="All" Text="[PlannedStartDate]" HorzAlign="Center" VertAlign="Center" Font="妤蜂綋, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell14" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="妤蜂綋, 10.5pt"/>
+          <TableCell Name="Cell15" Border.Lines="All" Text="璁″垝浜ゅ伐鏃ユ湡" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell30" Border.Lines="All" Text="[PlannedEndDate]" HorzAlign="Center" VertAlign="Center" Font="妤蜂綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row4" Height="196.56">
+          <TableCell Name="Cell16" Border.Lines="All" Text="宸�&#13;&#10;绋�&#13;&#10;鍐�&#13;&#10;瀹�" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell17" Border.Lines="All" Text="[ProjectContent]" Font="妤蜂綋, 10.5pt" ColSpan="5"/>
+          <TableCell Name="Cell18" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell19" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell20" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell32" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row5" Height="142.91">
+          <TableCell Name="Cell21" Border.Lines="All" Text="寮�&#13;&#10;宸�&#13;&#10;鏉�&#13;&#10;浠�" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell22" Border.Lines="All" Text="[Conditions]" Font="妤蜂綋, 10.5pt" ColSpan="5"/>
+          <TableCell Name="Cell23" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell24" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell25" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row6" Height="132.3">
+          <TableCell Name="Cell36" Border.Lines="All" Text="瀹�&#13;&#10;鏌�&#13;&#10;鎰�&#13;&#10;瑙�" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell37" Border.Lines="All" Text="[ReviewOpinion]" Font="妤蜂綋, 10.5pt" ColSpan="5"/>
+          <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell41" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row7" Height="113.4">
+          <TableCell Name="Cell43" Border.Lines="All" Text="璐�&#13;&#10;閲�&#13;&#10;鐩�&#13;&#10;鐫�&#13;&#10;鎰�&#13;&#10;瑙�" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell44" Border.Lines="Left, Right, Top" Text="[QualitySupervisionOpinion]" Font="妤蜂綋, 10.5pt" ColSpan="5"/>
+          <TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell46" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell47" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell48" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row8" Height="38.96">
+          <TableCell Name="Cell50" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell51" Border.Lines="Left, Right, Bottom" Text="     宸ョ▼璐ㄩ噺鐩戠潱绔欓暱/缁勯暱锛氾紙鐩戠潱绔�/缁勭珷锛夊勾鏈堟棩" VertAlign="Center" Font="瀹嬩綋, 10.5pt" ColSpan="5"/>
+          <TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell55" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+    </PageHeaderBand>
+    <PageFooterBand Name="PageFooter1" Top="792.26" Width="623.7" Height="179.52" Guides="0,179.52,35.43,99.21,144.09">
+      <TableObject Name="Table2" Width="623.7" Height="179.52" Border.Lines="Left, Right, Bottom">
+        <TableColumn Name="Column7" Width="211.05"/>
+        <TableColumn Name="Column8" Width="211.05"/>
+        <TableColumn Name="Column9" Width="201.6"/>
+        <TableRow Name="Row10" Height="35.43">
+          <TableCell Name="Cell63" Border.Lines="All" Text="寤鸿鍗曚綅" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell64" Border.Lines="All" Text="鐩戠悊鍗曚綅" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell65" Border.Lines="All" Text="鏂藉伐鍗曚綅" HorzAlign="Center" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row11" Height="63.78">
+          <TableCell Name="Cell68" Border.Lines="Left, Right, Top" Text="锛堥」鐩儴绔狅級" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell69" Border.Lines="Left, Right, Top" Text="锛堥」鐩儴绔狅級" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell70" Border.Lines="Left, Right, Top" Text="锛堥」鐩儴绔狅級" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row12" Height="44.88">
+          <TableCell Name="Cell73" Border.Lines="Left, Right" Text="椤圭洰缁忕悊锛�" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell74" Border.Lines="Left, Right" Text="椤圭洰鎬荤洃锛�" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell75" Border.Lines="Left, Right" Text="椤圭洰缁忕悊锛�" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row13" Height="35.43">
+          <TableCell Name="Cell78" Border.Lines="Left, Right, Bottom" Text="鏃ユ湡锛�   骞�  鏈�  鏃�" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell79" Border.Lines="Left, Right, Bottom" Text="鏃ユ湡锛�   骞�  鏈�  鏃�" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+          <TableCell Name="Cell80" Border.Lines="Left, Right, Bottom" Text="鏃ユ湡锛�   骞�  鏈�  鏃�" VertAlign="Center" Font="瀹嬩綋, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+    </PageFooterBand>
+  </ReportPage>
+</Report>
diff --git a/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/QualityCertificate/639008956132961833_鐒婂彛淇℃伅瀵煎叆妯℃澘.xls b/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/QualityCertificate/639008956132961833_鐒婂彛淇℃伅瀵煎叆妯℃澘.xls
new file mode 100644
index 0000000..2bb2a2f
Binary files /dev/null and b/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/QualityCertificate/639008956132961833_鐒婂彛淇℃伅瀵煎叆妯℃澘.xls differ
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index a3d9ce2..8f7f6b2 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1136,6 +1136,8 @@
     <Content Include="HJGL\MaterialManage\EWeldRHRecordNew.aspx" />
     <Content Include="HJGL\MaterialManage\EWeldRHRecordNewSelect.aspx" />
     <Content Include="HJGL\MaterialManage\FluxReleaseRecords.aspx" />
+    <Content Include="HJGL\MaterialManage\QualityCertificate.aspx" />
+    <Content Include="HJGL\MaterialManage\QualityCertificateEdit.aspx" />
     <Content Include="HJGL\MaterialManage\SolderBakingRecordProject.aspx" />
     <Content Include="HJGL\MaterialManage\SolderBakingRecordProjectSelect.aspx" />
     <Content Include="HJGL\MaterialManage\WeldingWireRecovery.aspx" />
@@ -1239,6 +1241,8 @@
     <Content Include="Images\SINOPEC.gif" />
     <Content Include="Images\UnitLogo.jpg" />
     <Content Include="Images\wrong.jpg" />
+    <Content Include="JGZL\CommencementReport.aspx" />
+    <Content Include="JGZL\CommencementReportEdit.aspx" />
     <Content Include="Login.aspx" />
     <Content Include="AttachFile\fileupload.ashx" />
     <Content Include="Captcha\captcha.ashx" />
@@ -5895,6 +5899,20 @@
     <Compile Include="HJGL\MaterialManage\FluxReleaseRecords.aspx.designer.cs">
       <DependentUpon>FluxReleaseRecords.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificate.aspx.cs">
+      <DependentUpon>QualityCertificate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificate.aspx.designer.cs">
+      <DependentUpon>QualityCertificate.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificateEdit.aspx.cs">
+      <DependentUpon>QualityCertificateEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificateEdit.aspx.designer.cs">
+      <DependentUpon>QualityCertificateEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\MaterialManage\SolderBakingRecordProject.aspx.cs">
       <DependentUpon>SolderBakingRecordProject.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -6504,6 +6522,20 @@
     <Compile Include="HJGL\WeldingReport\WeldInspectionCheckRecordItem.aspx.designer.cs">
       <DependentUpon>WeldInspectionCheckRecordItem.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JGZL\CommencementReport.aspx.cs">
+      <DependentUpon>CommencementReport.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JGZL\CommencementReport.aspx.designer.cs">
+      <DependentUpon>CommencementReport.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JGZL\CommencementReportEdit.aspx.cs">
+      <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JGZL\CommencementReportEdit.aspx.designer.cs">
+      <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Login.aspx.cs">
       <DependentUpon>Login.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8aa7c11..bf54086 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx
new file mode 100644
index 0000000..d594206
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx
@@ -0,0 +1,134 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityCertificate.aspx.cs" Inherits="FineUIPro.Web.HJGL.MaterialManage.QualityCertificate" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>鐒婃潗璐ㄤ繚涔�</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .customlabel span {
+            color: red;
+           font-weight: bold;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="鐒婃潗鍏ュ簱褰曞叆" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="QualityCertificateId" AllowCellEditing="true" ClicksToEdit="2"
+                DataIDField="QualityCertificateId" AllowSorting="true" SortField="CompileDate" SortDirection="DESC"
+                OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" ForceFit="true"
+                OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
+                EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                        <Items>
+                            <f:TextBox runat="server" Label="鐒婃潗鐗屽彿" ID="txtWeldName" EmptyText="杈撳叆鏌ヨ鏉′欢" AutoPostBack="true"
+                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
+                            </f:TextBox>
+                            <f:DropDownList ID="drpWeldType" runat="server" Label="鐒婃潗绫诲瀷" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                                OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="75px">
+                            </f:DropDownList>
+                            <f:TextBox runat="server" Label="鎵瑰彿" ID="txtHeartNo" EmptyText="杈撳叆鏌ヨ鏉′欢" AutoPostBack="true"
+                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
+                            </f:TextBox>
+                            <f:TextBox runat="server" Label="鍏ュ簱鑷紪鍙�" ID="txtWarrantybook" EmptyText="杈撳叆鏌ヨ鏉′欢" AutoPostBack="true"
+                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
+                            </f:TextBox>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                            <f:Button ID="btnNew" Text="澧炲姞" Icon="Add" runat="server" OnClick="btnNew_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="搴忓彿" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                    <f:RenderField Width="150px" ColumnID="WeldName" DataField="WeldName" FieldType="String"
+                        HeaderText="鐒婃潗鐗屽彿" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldName">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldCode" DataField="WeldCode" FieldType="String"
+                        HeaderText="鐒婃潗鍨嬪彿" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldCode">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
+                        HeaderText="瑙勬牸" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField> 
+                    <f:RenderField Width="90px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
+                        HeaderText="绫诲瀷" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="HeartNo" DataField="HeartNo" FieldType="String"
+                        HeaderText="鎵瑰彿" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String"
+                        HeaderText="鍏ュ簱鑷紪鍙�" HeaderTextAlign="Center" TextAlign="Center" SortField="Warrantybook">
+                    </f:RenderField>
+                    <f:WindowField TextAlign="Center" Width="60px" WindowID="WindowAtt" HeaderText="闄勪欢" Text="闄勪欢" ToolTip="闄勪欢涓婁紶鏌ョ湅" 
+                        DataIFrameUrlFields="QualityCertificateId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/QualityCertificate&menuId=19FC40C2-4FDC-44DC-A785-85491BACAC6D"
+                        HeaderTextAlign="Center" />
+                </Columns>
+                <Listeners>
+                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                </Listeners>
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    <f:Window ID="Window1" Title="缂栬緫鐒婃潗璐ㄤ繚涔�" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="800px" Height="350px">
+    </f:Window>
+    <f:Window ID="Window2" Title="绉诲簱" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="1000px" Height="600px">
+    </f:Window>
+        <f:Window ID="Window3" Title="瀵煎叆鐒婃潗鍏ュ簱" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="600px" Height="280px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="闄勪欢椤甸潰" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+            runat="server" Text="缂栬緫" Icon="Pencil">
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+            ConfirmText="鍒犻櫎閫変腑琛岋紵" ConfirmTarget="Top" runat="server" Text="鍒犻櫎" Icon="Delete">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 杩斿洖false锛屾潵闃绘娴忚鍣ㄥ彸閿彍鍗�
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs
new file mode 100644
index 0000000..c0bb619
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs
@@ -0,0 +1,288 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.HJGL.MaterialManage
+{
+    public partial class QualityCertificate : PageBase
+    {
+        #region 鍔犺浇椤甸潰
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                this.drpWeldType.DataTextField = "WeldTypeName";
+                this.drpWeldType.DataValueField = "WeldTypeId";
+                this.drpWeldType.DataSource = BLL.WeldTypeService.GetWeldTypeList();
+                this.drpWeldType.DataBind();
+                Funs.FineUIPleaseSelect(this.drpWeldType);
+
+                // 缁戝畾琛ㄦ牸
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT QC.QualityCertificateId,QC.WeldId,QC.Warrantybook,Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,QC.HeartNo,QC.CompileDate,
+                                    WeldType.WeldTypeName
+                              FROM dbo.Weld_QualityCertificate AS QC
+                              LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=QC.WeldId
+                              LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId
+                              WHERE 1=1  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim()))
+            {
+                strSql += " AND Weld.WeldName LIKE @WeldName";
+                listStr.Add(new SqlParameter("@WeldName", "%" + this.txtWeldName.Text.Trim() + "%"));
+            }
+            if (drpWeldType.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND Weld.WeldTypeId = @WeldTypeId";
+                listStr.Add(new SqlParameter("@WeldTypeId", drpWeldType.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtHeartNo.Text.Trim()))
+            {
+                strSql += " AND QC.HeartNo LIKE @HeartNo";
+                listStr.Add(new SqlParameter("@HeartNo", "%" + this.txtHeartNo.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtWarrantybook.Text.Trim()))
+            {
+                strSql += " AND QC.Warrantybook LIKE @Warrantybook";
+                listStr.Add(new SqlParameter("@Warrantybook", "%" + this.txtWarrantybook.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 琛ㄥご杩囨护
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 椤电储寮曟敼鍙樹簨浠�
+        /// <summary>
+        /// 椤电储寮曟敼鍙樹簨浠�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
+        #region 鎺掑簭
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 鍒嗛〉閫夋嫨涓嬫媺鏀瑰彉浜嬩欢
+        /// <summary>
+        /// 鍒嗛〉閫夋嫨涓嬫媺鏀瑰彉浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 寮瑰嚭缂栬緫绐楀彛鍏抽棴浜嬩欢
+        /// <summary>
+        /// 寮瑰嚭缂栬緫绐椾綋鍏抽棴浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 鏌ヨ
+        /// <summary>
+        /// 鏌ヨ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 澧炲姞鎸夐挳
+        /// <summary>
+        /// 澧炲姞鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnAdd))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityCertificateEdit.aspx?QualityCertificateId={0}", string.Empty, "缂栬緫 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 缂栬緫
+        /// <summary>
+        /// 鍙屽嚮Grid浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 缂栬緫鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 缂栬緫鏁版嵁鏂规硶
+        /// </summary>
+        private void EditData()
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnModify))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("璇疯嚦灏戦�夋嫨涓�鏉¤褰曪紒", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                string id = Grid1.SelectedRowID;
+                if (!string.IsNullOrEmpty(id))
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityCertificateEdit.aspx?QualityCertificateId={0}", id, "缂栬緫 - ")));
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 鍒犻櫎
+        /// <summary>
+        /// 鍙抽敭鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鏂规硶
+        /// </summary>
+        private void DeleteData()
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 1)
+                {
+                    string rowID = Grid1.SelectedRowID.ToString();
+                    if (this.judgementDelete(rowID))
+                    {
+                        CommonService.DeleteAttachFileById(rowID);//鍒犻櫎闄勪欢
+                        BLL.QualityCertificateService.DeleteQualityCertificate(rowID);
+                        BLL.Sys_LogService.AddLog(BLL.Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "鍒犻櫎鐒婃潗璐ㄤ繚涔�");
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍锛�", MessageBoxIcon.Warning);
+                    return;
+                }
+                this.BindGrid();
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+
+            }
+            else
+            {
+                Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// 鍒ゆ柇鏄惁鍙垹闄�
+        /// </summary>
+        /// <param name="rowID"></param>
+        /// <param name="isShow"></param>
+        /// <returns></returns>
+        private bool judgementDelete(string rowID)
+        {
+            string content = string.Empty;
+            //var q = from x in Funs.DB.Weld_UsingMat where x.StockInId == rowID select x;
+            //if (q.Count() > 0)
+            //{
+            //    content = "璇ュ叆搴撴潗鏂欏凡鏈夐鐢紝涓嶈兘鍒犻櫎锛�";
+            //}
+            if (string.IsNullOrEmpty(content))
+            {
+                return true;
+            }
+            else
+            {
+                Alert.ShowInTop(content);
+                return false;
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs
new file mode 100644
index 0000000..f2d2957
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs
@@ -0,0 +1,213 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.MaterialManage {
+    
+    
+    public partial class QualityCertificate {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtWeldName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldName;
+        
+        /// <summary>
+        /// drpWeldType 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWeldType;
+        
+        /// <summary>
+        /// txtHeartNo 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtHeartNo;
+        
+        /// <summary>
+        /// txtWarrantybook 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWarrantybook;
+        
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnNew 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// lblNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+        
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// Window3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+        
+        /// <summary>
+        /// WindowAtt 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+        
+        /// <summary>
+        /// Menu1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuEdit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+        
+        /// <summary>
+        /// btnMenuDelete 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx
new file mode 100644
index 0000000..d71eac2
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx
@@ -0,0 +1,79 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityCertificateEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.MaterialManage.QualityCertificateEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>缂栬緫鐒婃潗璐ㄤ繚涔�</title>
+    <style>
+        .customlabel span {
+            color: red;
+           font-weight: bold;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Form2" runat="server" />
+    <f:Form ID="Form2" ShowBorder="False" BodyPadding="5px" ShowHeader="False" runat="server"
+        RedStarPosition="BeforeText">
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:HiddenField ID="hdWeldId" runat="server">
+                    </f:HiddenField>
+                    <f:HiddenField ID="hdQualityCertificateId" runat="server"></f:HiddenField>
+                </Items>
+            </f:FormRow>
+            <f:FormRow ColumnWidths="45% 5% 50%">
+                <Items>
+                    <f:TextBox ID="txtWeldName" runat="server" Label="鐒婃潗鐗屽彿" LabelAlign="Right" Readonly="true"
+                         ShowRedStar="true">
+                    </f:TextBox>
+                    <f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="鏌ユ壘鐒婃潗淇℃伅">
+                    </f:Button>
+                     <f:TextBox ID="txtWeldSpec" runat="server" Label="瑙勬牸" LabelAlign="Right" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpHeartNo" runat="server" Label="鎵瑰彿" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                                OnSelectedIndexChanged="drpHeartNo_SelectedIndexChanged">
+                            </f:DropDownList>
+                    <f:TextBox ID="txtWeldType" runat="server" Label="绫诲瀷" LabelAlign="Right" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items> 
+                    <f:Label runat="server" ID="txtWarrantybook" Label="鍏ュ簱鑷紪鍙�" LabelAlign="Right"></f:Label>
+                    <f:LinkButton ID="UploadAttach2" runat="server" Label="璐ㄤ繚涔﹂檮浠�" Text="涓婁紶鍜屾煡鐪�" OnClick="btnAttachUrl2_Click"
+                        LabelAlign="Right">
+                    </f:LinkButton>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar2" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="淇濆瓨" ValidateForms="Form2"
+                        OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" Text="鍏抽棴" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    <f:Window ID="Window1" Title="鏌ユ壘鐒婃潗淇℃伅" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="800px" Height="600px">
+    </f:Window>
+    <f:Window ID="Window2" Title="鏂囦欢涓婁紶" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="680px"
+        Height="480px">
+    </f:Window>
+    </form>
+</body>
+</html>
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs
new file mode 100644
index 0000000..4fe0cdb
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs
@@ -0,0 +1,216 @@
+锘縰sing System;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.HJGL.MaterialManage
+{
+    public partial class QualityCertificateEdit : PageBase
+    {
+        #region 瀹氫箟椤�
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        private string QualityCertificateId
+        {
+            get
+            {
+                return (string)ViewState["QualityCertificateId"];
+            }
+            set
+            {
+                ViewState["QualityCertificateId"] = value;
+            }
+        }
+        #endregion
+
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.QualityCertificateId = Request.Params["QualityCertificateId"];
+                StockInitService.InitHeartNo(this.drpHeartNo, true);
+                if (!string.IsNullOrEmpty(this.QualityCertificateId))
+                {
+                    this.hdQualityCertificateId.Text = this.QualityCertificateId;
+                    Model.Weld_QualityCertificate qc = BLL.QualityCertificateService.GetQualityCertificateByQualityCertificateId(this.QualityCertificateId);
+                    if (qc != null)
+                    {
+                        if (!string.IsNullOrEmpty(qc.WeldId))
+                        {
+                            this.hdWeldId.Text = qc.WeldId;
+                            var weld = BLL.WeldInfoService.GetWeldInfoById(qc.WeldId);
+                            if (weld != null)
+                            {
+                                //this.txtWeldCode.Text = weld.WeldCode;
+                                this.txtWeldName.Text = weld.WeldName;
+                                this.txtWeldSpec.Text = weld.WeldSpec;
+                                if (!string.IsNullOrEmpty(weld.WeldTypeId))
+                                {
+                                    var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId);
+                                    if (weldType != null)
+                                    {
+                                        this.txtWeldType.Text = weldType.WeldTypeName;
+                                    }
+                                }
+                            }
+                            this.drpHeartNo.SelectedItem.Text = qc.HeartNo;
+                            this.txtWarrantybook.Text = qc.Warrantybook;
+                        }
+                    }
+                }
+                else
+                {
+                    
+                }
+            }
+        }
+        #endregion
+
+        #region 淇濆瓨
+        /// <summary>
+        /// 淇濆瓨鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (this.hdWeldId.Text == string.Empty)
+            {
+                Alert.ShowInTop("璇烽�夋嫨鐒婃潗鐗屽彿锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.drpHeartNo.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("璇烽�夋嫨鎵瑰彿锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim()))
+            {
+                Alert.ShowInTop("璇蜂笂浼犺川淇濅功闄勪欢锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            SaveData();
+            ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        /// <summary>
+        /// 淇濆瓨鏁版嵁
+        /// </summary>
+        private void SaveData()
+        {
+            Model.Weld_QualityCertificate qc = new Model.Weld_QualityCertificate();
+            if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
+            {
+                qc.WeldId = this.hdWeldId.Text.Trim();
+            }
+
+            qc.Warrantybook = this.txtWarrantybook.Text.Trim();
+            //qc.Number = txtNumber.Text.Trim();
+            qc.HeartNo = drpHeartNo.SelectedItem.Text.Trim();
+            qc.Warrantybook = txtWarrantybook.Text.Trim();
+            qc.CompileMan = this.CurrUser.UserId;
+            qc.CompileDate = DateTime.Now;
+            if (!string.IsNullOrEmpty(this.QualityCertificateId))
+            {
+                qc.QualityCertificateId = this.QualityCertificateId;
+                BLL.QualityCertificateService.UpdateQualityCertificate(qc);
+                BLL.Sys_LogService.AddLog(Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "淇敼鐒婃潗璐ㄤ繚涔�");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(this.hdQualityCertificateId.Text.Trim()))
+                {
+                    qc.QualityCertificateId = SQLHelper.GetNewID(typeof(Model.Weld_QualityCertificate));
+                }
+                else
+                {
+                    qc.QualityCertificateId = this.hdQualityCertificateId.Text.Trim();
+                }
+                BLL.QualityCertificateService.AddQualityCertificate(qc);
+                BLL.Sys_LogService.AddLog(Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "娣诲姞鐒婃潗璐ㄤ繚涔�");
+            }
+        }
+        #endregion        
+
+        #region 闄勪欢涓婁紶
+        /// <summary>
+        /// 涓婁紶闄勪欢璧勬簮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl2_Click(object sender, EventArgs e)
+        {
+            string edit = "0"; // 琛ㄧず鑳芥墦寮�闄勪欢涓婁紶绐楀彛锛屼絾涓嶈兘涓婁紶闄勪欢
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnSave))
+            {
+                if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim()))
+                {
+                    this.hdQualityCertificateId.Text = SQLHelper.GetNewID();
+                }
+                edit = "1";
+                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/QualityCertificate&menuId={1}&edit={2}", this.hdQualityCertificateId.Text, Const.CLGL_QualityCertificateMenuId, edit)));
+            }
+        }
+        #endregion
+
+        #region 鏌ユ壘鐒婃潗淇℃伅
+        /// <summary>
+        /// 鏌ユ壘鐒婃潗淇℃伅
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSelect_Click(object sender, EventArgs e)
+        {
+            string window = String.Format("../../WeldMat/Stock/ShowWeldInfo.aspx", "缂栬緫 - ");
+            PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
+        }
+
+        #region 寮瑰嚭缂栬緫绐楀彛鍏抽棴浜嬩欢
+        /// <summary>
+        /// 寮瑰嚭缂栬緫绐椾綋鍏抽棴浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.hdWeldId.Text))
+            {
+                var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text);
+                if (weld != null)
+                {
+                    //this.txtWeldCode.Text = weld.WeldCode;
+                    this.txtWeldName.Text = weld.WeldName;
+                    this.txtWeldSpec.Text = weld.WeldSpec;
+                    if (!string.IsNullOrEmpty(weld.WeldTypeId))
+                    {
+                        var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId);
+                        if (weldType != null)
+                        {
+                            this.txtWeldType.Text = weldType.WeldTypeName;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #endregion
+
+        protected void drpHeartNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.txtWarrantybook.Text = string.Empty;
+            if (this.drpHeartNo.SelectedValue != BLL.Const._Null)
+            {
+                this.txtWarrantybook.Text = this.drpHeartNo.SelectedValue;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs
new file mode 100644
index 0000000..327a2bf
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs
@@ -0,0 +1,168 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.MaterialManage {
+    
+    
+    public partial class QualityCertificateEdit {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Form2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// hdWeldId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdWeldId;
+        
+        /// <summary>
+        /// hdQualityCertificateId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdQualityCertificateId;
+        
+        /// <summary>
+        /// txtWeldName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldName;
+        
+        /// <summary>
+        /// btnSelect 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSelect;
+        
+        /// <summary>
+        /// txtWeldSpec 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldSpec;
+        
+        /// <summary>
+        /// drpHeartNo 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHeartNo;
+        
+        /// <summary>
+        /// txtWeldType 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldType;
+        
+        /// <summary>
+        /// txtWarrantybook 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtWarrantybook;
+        
+        /// <summary>
+        /// UploadAttach2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.LinkButton UploadAttach2;
+        
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnClose 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+    }
+}
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
index b2773cb..258a7c5 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
@@ -200,14 +200,15 @@
             this.ddlCheckFlag.Text = "鏈娴�";
             if (!string.IsNullOrEmpty(this.JOT_ID))
             {
-                var hotItems = from x in BLL.Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == JOT_ID select x;
+                //var hotItems = from x in BLL.Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == JOT_ID select x;
                 var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(JOT_ID);
                 var batch = (from x in Funs.DB.HJGL_BO_Batch
                              join y in Funs.DB.HJGL_BO_BatchDetail
                              on x.BatchId equals y.BatchId
                              where y.JOT_ID == this.JOT_ID
                              select x).FirstOrDefault();
-                if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId)
+                //if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId)
+                if ((batchDetail != null) && this.CurrUser.UserId != BLL.Const.GlyId)
                 {
                     this.TextIsReadOnly(true);
                     var trustItem = (from x in Funs.DB.HJGL_CH_TrustItem
@@ -262,16 +263,16 @@
                     }
                 }
 
-                if (hotItems.Count() > 0)
-                {
-                    drpIS_Proess.Enabled = false;
-                    //drpProessTypes.Enabled = false;
-                }
-                else
-                {
-                    drpIS_Proess.Enabled = true;
-                    //drpProessTypes.Enabled = true;
-                }
+                //if (hotItems.Count() > 0)
+                //{
+                //    drpIS_Proess.Enabled = false;
+                //    //drpProessTypes.Enabled = false;
+                //}
+                //else
+                //{
+                //    drpIS_Proess.Enabled = true;
+                //    //drpProessTypes.Enabled = true;
+                //}
 
                 //鐑鐞嗗悗鍙兘澧炲姞鐑鐞嗙被鍨嬶紝鎴栬�呭幓闄よ繕鏈鎵樼殑鐑鐞嗙被鍨�
             }
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx
index 55a8105..6cb1e16 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx
@@ -50,7 +50,7 @@
                 <Items>
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="缁熻鏍疯〃" EnableCollapse="true"
                         runat="server" BoxFlex="1" EnableColumnLines="true"  AllowSorting="true"
-                        SortField="ISO_IsoNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                        SortField="ISO_IsoNo,JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
                         IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
                         <Columns>
                             <f:RowNumberField />
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx
new file mode 100644
index 0000000..d7bc350
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx
@@ -0,0 +1,124 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CommencementReport.aspx.cs" Inherits="FineUIPro.Web.JGZL.CommencementReport" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>宸ョ▼鏂藉伐寮�宸ユ姤鍛�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="220px" Title="宸ョ▼鏂藉伐寮�宸ユ姤鍛�" ShowBorder="true" Layout="VBox"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProjectId" runat="server" Label="椤圭洰" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                                    OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="50px">
+                                </f:DropDownList>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="宸ョ▼鏂藉伐寮�宸ユ姤鍛婅妭鐐规爲" OnNodeCommand="tvControlItem_NodeCommand"
+                            runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
+                            AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
+                        </f:Tree>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="宸ョ▼鏂藉伐寮�宸ユ姤鍛�"
+                    TitleToolTip="宸ョ▼鏂藉伐寮�宸ユ姤鍛�" AutoScroll="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                            <Items>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnAdd" runat="server" Icon="Add" Text="澧炲姞" OnClick="btnAdd_Click"></f:Button>
+                                <f:Button ID="btnPrint" Text="宸ョ▼鏂藉伐寮�宸ユ姤鍛婃墦鍗�" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="宸ョ▼鏂藉伐寮�宸ユ姤鍛�" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="CommencementReportId" AllowCellEditing="true"
+                            EnableColumnLines="true" ClicksToEdit="1" DataIDField="CommencementReportId" AllowSorting="true"
+                            SortField="ContractNumber" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="搴忓彿" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField HeaderText="鏂藉伐鍚堝悓缂栧彿" ColumnID="ContractNumber" DataField="ContractNumber" SortField="ContractNumber"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="璁捐鍗曚綅" ColumnID="DesignUnit" DataField="DesignUnit" SortField="DesignUnit"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="200px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="璁″垝寮�宸ユ棩鏈�" ColumnID="PlannedStartDate" DataField="PlannedStartDate" SortField="PlannedStartDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="璁″垝浜ゅ伐鏃ユ湡" ColumnID="PlannedEndDate" DataField="PlannedEndDate" SortField="PlannedEndDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="宸ョ▼鍐呭" ColumnID="ProjectContent" DataField="ProjectContent" SortField="ProjectContent"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="寮�宸ユ潯浠�" ColumnID="Conditions" DataField="Conditions" SortField="Conditions"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="宸ョ▼鏂藉伐寮�宸ユ姤鍛�" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1100px" Height="620px">
+        </f:Window>
+        <f:Window ID="WindowPrint" Title="鎵撳嵃宸ョ▼鏂藉伐寮�宸ユ姤鍛�" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+            Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
+            Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="缂栬緫" Icon="TableEdit">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                ConfirmText="鍒犻櫎閫変腑琛岋紵" ConfirmTarget="Top" runat="server" Text="鍒犻櫎" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 杩斿洖false锛屾潵闃绘娴忚鍣ㄥ彸閿彍鍗�
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs
new file mode 100644
index 0000000..bdc9b77
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.cs
@@ -0,0 +1,388 @@
+锘縰sing BLL;
+using Newtonsoft.Json.Linq;
+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;
+using Org.BouncyCastle.Bcpg.OpenPgp;
+
+namespace FineUIPro.Web.JGZL
+{
+    public partial class CommencementReport : PageBase
+    {
+        #region 鍔犺浇椤甸潰
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+
+                this.drpProjectId.DataTextField = "ProjectCode";
+                this.drpProjectId.DataValueField = "ProjectId";
+                this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
+                this.drpProjectId.DataBind();
+                Funs.FineUIPleaseSelect(this.drpProjectId);
+
+                this.InitTreeMenu();//鍔犺浇鏍�
+            }
+        }
+        #endregion
+
+        #region 鍔犺浇鏍戦」鐩�
+        /// <summary>
+        /// 鍔犺浇鏍�
+        /// </summary>
+        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<Model.Base_Project> 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
+        /// <summary>
+        /// 鐐瑰嚮TreeView
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            if (this.tvControlItem.SelectedNodeID != "0")
+            {
+                this.BindGrid();
+            }
+        }
+        #endregion
+
+        #region 鏁版嵁缁戝畾
+        /// <summary>
+        /// 鏁版嵁缁戝畾
+        /// </summary>
+        private void BindGrid()
+        {
+            //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1");
+            string strSql = @"SELECT * from JGZL_CommencementReport where 1=1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            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 椤电储寮曟敼鍙樹簨浠�
+        /// <summary>
+        /// 椤电储寮曟敼鍙樹簨浠�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 鎺掑簭
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 鍒嗛〉閫夋嫨涓嬫媺鏀瑰彉浜嬩欢
+        /// <summary>
+        /// 鍒嗛〉閫夋嫨涓嬫媺鏀瑰彉浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+        #endregion
+
+        #region 鏌ヨ
+        ///<summary>
+        ///鏌ヨ
+        ///</summary>
+        ///<param name="sender"></param>
+        ///<param name="e"></param>
+        protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.InitTreeMenu();
+        }
+
+        /// <summary>
+        /// 鏌ヨ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 鎵撳嵃
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPrint_Click(object sender, EventArgs e)
+        {
+            string projectId = this.tvControlItem.SelectedNodeID;
+
+            if (projectId != null)
+            {
+                if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+                {
+                    string initTemplatePath = "";
+                    string rootPath = Server.MapPath("~/");
+                    BLL.Common.FastReportService.ResetData();
+
+                    var report = BLL.CommencementReportService.GetCommencementReportById(this.Grid1.SelectedRowID);
+                    if (report != null)
+                    {
+                        Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                        keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
+                        keyValuePairs.Add("ContractNumber", report.ContractNumber);
+                        keyValuePairs.Add("DesignUnit", report.DesignUnit);
+                        keyValuePairs.Add("PlannedStartDate", report.PlannedStartDate.HasValue ? string.Format("{0:yyyy骞碝M鏈坉d鏃",report.PlannedStartDate) : "");
+                        keyValuePairs.Add("PlannedEndDate", report.PlannedEndDate.HasValue ? string.Format("{0:yyyy骞碝M鏈坉d鏃",report.PlannedEndDate) : "");
+                        keyValuePairs.Add("ProjectContent", report.ProjectContent);
+                        keyValuePairs.Add("Conditions", report.Conditions);
+                        keyValuePairs.Add("ReviewOpinion", report.ReviewOpinion);
+                        keyValuePairs.Add("QualitySupervisionOpinion", report.QualitySupervisionOpinion);
+                        BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+                    }
+                    initTemplatePath = "File\\Fastreport\\JGZL\\宸ョ▼鏂藉伐寮�宸ユ姤鍛�.frx";
+                    if (File.Exists(rootPath + initTemplatePath))
+                    {
+                        PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("璇烽�夋嫨涓�鏉¤褰曪紒", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("璇烽�夋嫨椤圭洰锛�", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 缁存姢
+        /// <summary>
+        /// 澧炲姞
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CommencementReportEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "鏂板 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("璇烽�夋嫨椤圭洰锛�", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// 鍙屽嚮缂栬緫
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_CommencementReportMenuId, BLL.Const.BtnModify))
+            {
+                if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+                {
+                    if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CommencementReportEdit.aspx?commencementReportId={0}", this.Grid1.SelectedRowID, "缂栬緫 - ")));
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("璇烽�夋嫨涓�鏉¤褰曪紒", MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("璇烽�夋嫨椤圭洰锛�", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 鍙抽敭缂栬緫
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_CommencementReportMenuId, BLL.Const.BtnModify))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("璇烽�夋嫨涓�鏉¤褰曪紒", MessageBoxIcon.Warning);
+                    return;
+                }
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CommencementReportEdit.aspx?commencementReportId={0}", Grid1.SelectedRowID, "缁存姢 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 鍙抽敭鍒犻櫎
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_CommencementReportMenuId, 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.CommencementReportService.DeleteCommencementReportById(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 鍒ゆ柇鏄惁鍙垹闄�
+        /// <summary>
+        /// 鍒ゆ柇鏄惁鍙互鍒犻櫎
+        /// </summary>
+        /// <returns></returns>
+        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 鍏抽棴寮瑰嚭绐楀彛鍙婂埛鏂伴〉闈�
+        /// <summary>
+        /// 鍏抽棴寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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/CommencementReport.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.designer.cs
new file mode 100644
index 0000000..f5097ed
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReport.aspx.designer.cs
@@ -0,0 +1,206 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+    public partial class CommencementReport
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// panelLeftRegion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// drpProjectId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectId;
+
+        /// <summary>
+        /// tvControlItem 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Tree tvControlItem;
+
+        /// <summary>
+        /// panelCenterRegion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnAdd 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAdd;
+
+        /// <summary>
+        /// btnPrint 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnPrint;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// WindowPrint 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window WindowPrint;
+
+        /// <summary>
+        /// Menu1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx
new file mode 100644
index 0000000..968fe2f
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx
@@ -0,0 +1,63 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CommencementReportEdit.aspx.cs" Inherits="FineUIPro.Web.JGZL.CommencementReportEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>缂栬緫宸ョ▼鏂藉伐寮�宸ユ姤鍛�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="10px"
+            runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="淇濆瓨" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtContractNumber" runat="server" Label="鏂藉伐鍚堝悓缂栧彿" LabelAlign="Right" LabelWidth="110px" MaxLength="100" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:TextBox ID="txtDesignUnit" runat="server" Label="璁捐鍗曚綅" LabelAlign="Right" LabelWidth="110px" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DatePicker ID="txtPlannedStartDate" runat="server" Label="璁″垝寮�宸ユ棩鏈�" LabelAlign="Right" LabelWidth="110px"></f:DatePicker>
+                        <f:DatePicker ID="txtPlannedEndDate" runat="server" Label="璁″垝浜ゅ伐鏃ユ湡" LabelAlign="Right" LabelWidth="110px"></f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtProjectContent" runat="server" Label="宸ョ▼鍐呭" LabelAlign="Right" LabelWidth="110px" MaxLength="2000" Required="true" ShowRedStar="true"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtConditions" runat="server" Label="寮�宸ユ潯浠�" LabelAlign="Right" LabelWidth="110px" MaxLength="1000"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtReviewOpinion" runat="server" Label="瀹℃煡鎰忚" LabelAlign="Right" LabelWidth="110px" MaxLength="1000"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtQualitySupervisionOpinion" runat="server" Label="璐ㄩ噺鐩戠潱鎰忚" LabelAlign="Right" LabelWidth="110px" MaxLength="1000"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx.cs
new file mode 100644
index 0000000..409b475
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx.cs
@@ -0,0 +1,121 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.JGZL
+{
+    public partial class CommencementReportEdit :PageBase
+    {
+        #region 瀹氫箟椤�
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        private string CommencementReportId
+        {
+            get
+            {
+                return (string)ViewState["CommencementReportId"];
+            }
+            set
+            {
+                ViewState["CommencementReportId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 椤圭洰Id
+        /// </summary>
+        private string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 鍔犺浇椤甸潰
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = Request.Params["projectId"];
+                this.CommencementReportId = Request.Params["commencementReportId"];
+                if (!string.IsNullOrEmpty(this.CommencementReportId))
+                {
+                    var report = BLL.CommencementReportService.GetCommencementReportById(this.CommencementReportId);
+                    if (report!=null)
+                    {
+                        this.txtContractNumber.Text = report.ContractNumber;
+                        this.txtDesignUnit.Text = report.DesignUnit;
+                        this.txtPlannedStartDate.Text = report.PlannedStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.PlannedStartDate) : "";
+                        this.txtPlannedEndDate.Text = report.PlannedEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.PlannedEndDate) : "";
+                        this.txtConditions.Text = report.Conditions;
+                        this.txtProjectContent.Text = report.ProjectContent;
+                        this.txtReviewOpinion.Text = report.ReviewOpinion;
+                        this.txtQualitySupervisionOpinion.Text = report.QualitySupervisionOpinion;
+                    }
+                }
+
+            }
+        }
+        #endregion
+
+        #region 鎻愪氦鎸夐挳
+        /// <summary>
+        /// 鎻愪氦鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_CommencementReportMenuId, Const.BtnSave))
+            {
+                Model.JGZL_CommencementReport newReport = new Model.JGZL_CommencementReport();
+                newReport.ContractNumber = this.txtContractNumber.Text.Trim();
+                newReport.DesignUnit = this.txtDesignUnit.Text.Trim();
+                newReport.PlannedStartDate = Funs.GetNewDateTime(this.txtPlannedStartDate.Text);
+                newReport.PlannedEndDate = Funs.GetNewDateTime(this.txtPlannedEndDate.Text);
+                newReport.ProjectContent = this.txtProjectContent.Text;
+                newReport.Conditions = this.txtConditions.Text;
+                newReport.ReviewOpinion =this.txtReviewOpinion.Text;
+                newReport.QualitySupervisionOpinion = this.txtQualitySupervisionOpinion.Text;
+                if (!string.IsNullOrEmpty(this.CommencementReportId))
+                {
+                    newReport.CommencementReportId = this.CommencementReportId;
+                    BLL.CommencementReportService.UpdateCommencementReport(newReport);
+                }
+                else
+                {
+                    newReport.ProjectId = this.ProjectId;
+                    newReport.CompileMan = this.CurrUser.UserId;
+                    newReport.CompileDate = DateTime.Now;
+                    newReport.CommencementReportId = SQLHelper.GetNewID(typeof(Model.JGZL_CommencementReport));
+                    this.CommencementReportId = newReport.CommencementReportId;
+                    BLL.CommencementReportService.AddCommencementReport(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/CommencementReportEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx.designer.cs
new file mode 100644
index 0000000..6257f8e
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/JGZL/CommencementReportEdit.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JGZL
+{
+
+
+    public partial class CommencementReportEdit
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// txtContractNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtContractNumber;
+
+        /// <summary>
+        /// txtDesignUnit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDesignUnit;
+
+        /// <summary>
+        /// txtPlannedStartDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPlannedStartDate;
+
+        /// <summary>
+        /// txtPlannedEndDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPlannedEndDate;
+
+        /// <summary>
+        /// txtProjectContent 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProjectContent;
+
+        /// <summary>
+        /// txtConditions 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtConditions;
+
+        /// <summary>
+        /// txtReviewOpinion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtReviewOpinion;
+
+        /// <summary>
+        /// txtQualitySupervisionOpinion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtQualitySupervisionOpinion;
+    }
+}
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index e233efb..5c46a5b 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--杩炴帴瀛楃涓�-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--绯荤粺鍚嶇О-->
     <add key="SystemName" value="璇哄繀杈剧剨鎺ョ鐞嗙郴缁�"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
index e05784d..60cfb7c 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
@@ -45,7 +45,8 @@
             </f:FormRow>
             <f:FormRow>
                 <Items> 
-                    <f:TextBox ID="txtHeartNo" runat="server" Label="鎵瑰彿" LabelAlign="Right" >
+                    <f:TextBox ID="txtHeartNo" runat="server" Label="鎵瑰彿" LabelAlign="Right" Required="true"
+                        ShowRedStar="true">
                     </f:TextBox>
                     <f:TextBox ID="txtWeldUnit" runat="server" Label="璁￠噺鍗曚綅" LabelAlign="Right" Readonly="true">
                     </f:TextBox>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx
index 6f8a5d3..b64ddf4 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx
@@ -73,6 +73,9 @@
                         <f:RenderField Width="80px" ColumnID="Amount" DataField="Amount" FieldType="Float"
                             HeaderText="绉诲叆鏁伴噺" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="MoveInMan" DataField="MoveInMan" FieldType="String"
+                            HeaderText="鎿嶄綔浜�" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="MoveInDate" DataField="MoveInDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"
                             HeaderText="鎿嶄綔鏃堕棿" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs
index 053b737..7d6d40f 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs
@@ -53,6 +53,7 @@ namespace FineUIPro.Web.WeldMat.Stock
                                     WeldType.WeldTypeName,
                                     (unit2.UnitName+'('+unitStoreMoveIn.UnitStoreName+')') as UnitStoreMoveInName,
                                     StockIn.Amount,
+                                    us.UserName as MoveInMan,
                                     StockIn.MoveInDate
                                 from Weld_StockIn as stockIn 
                                 left join Weld_UnitStore as unitStore on unitStore.UnitStoreId=stockIn.MoveInStoreId
@@ -61,6 +62,7 @@ namespace FineUIPro.Web.WeldMat.Stock
                                 LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId
                                 left join Weld_UnitStore as unitStoreMoveIn on unitStoreMoveIn.UnitStoreId=stockIn.UnitStoreId
                                 left join Base_Unit as unit2 on unit2.UnitId = unitStoreMoveIn.UnitId
+                                left join Sys_User as us on us.UserId=stockIn.MoveInManId
                                 where stockIn.Flag='1'
                                 and MoveInStoreId is not null ";
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs
index d6a9378..26745b7 100644
--- a/HJGL_DS/Model/Model.cs
+++ b/HJGL_DS/Model/Model.cs
@@ -371,6 +371,9 @@ namespace Model
     partial void InsertHJGL_WeldingProcedure_WeldRepairCard(HJGL_WeldingProcedure_WeldRepairCard instance);
     partial void UpdateHJGL_WeldingProcedure_WeldRepairCard(HJGL_WeldingProcedure_WeldRepairCard instance);
     partial void DeleteHJGL_WeldingProcedure_WeldRepairCard(HJGL_WeldingProcedure_WeldRepairCard instance);
+    partial void InsertJGZL_CommencementReport(JGZL_CommencementReport instance);
+    partial void UpdateJGZL_CommencementReport(JGZL_CommencementReport instance);
+    partial void DeleteJGZL_CommencementReport(JGZL_CommencementReport instance);
     partial void InsertOAM_UesrQualified(OAM_UesrQualified instance);
     partial void UpdateOAM_UesrQualified(OAM_UesrQualified instance);
     partial void DeleteOAM_UesrQualified(OAM_UesrQualified instance);
@@ -515,6 +518,9 @@ namespace Model
     partial void InsertWeld_ProjectPlan(Weld_ProjectPlan instance);
     partial void UpdateWeld_ProjectPlan(Weld_ProjectPlan instance);
     partial void DeleteWeld_ProjectPlan(Weld_ProjectPlan instance);
+    partial void InsertWeld_QualityCertificate(Weld_QualityCertificate instance);
+    partial void UpdateWeld_QualityCertificate(Weld_QualityCertificate instance);
+    partial void DeleteWeld_QualityCertificate(Weld_QualityCertificate instance);
     partial void InsertWeld_RecycleMat(Weld_RecycleMat instance);
     partial void UpdateWeld_RecycleMat(Weld_RecycleMat instance);
     partial void DeleteWeld_RecycleMat(Weld_RecycleMat instance);
@@ -1724,6 +1730,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<JGZL_CommencementReport> JGZL_CommencementReport
+		{
+			get
+			{
+				return this.GetTable<JGZL_CommencementReport>();
+			}
+		}
+		
 		public System.Data.Linq.Table<OAM_UesrQualified> OAM_UesrQualified
 		{
 			get
@@ -2316,6 +2330,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_UnitPerformance> View_UnitPerformance
+		{
+			get
+			{
+				return this.GetTable<View_UnitPerformance>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_UsePosition> View_UsePosition
 		{
 			get
@@ -2332,6 +2354,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Weld_QualityCertificate> Weld_QualityCertificate
+		{
+			get
+			{
+				return this.GetTable<Weld_QualityCertificate>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Weld_RecycleMat> Weld_RecycleMat
 		{
 			get
@@ -4289,6 +4319,8 @@ namespace Model
 		
 		private EntitySet<HJGL_WeldingProcedure_WeldHotProcessCard> _HJGL_WeldingProcedure_WeldHotProcessCard;
 		
+		private EntitySet<JGZL_CommencementReport> _JGZL_CommencementReport;
+		
 		private EntitySet<Project_Installation> _Project_Installation;
 		
 		private EntitySet<Project_RoleButtonPower> _Project_RoleButtonPower;
@@ -4413,6 +4445,7 @@ namespace Model
 			this._HJGL_WeldingProcedure_WeldingProcessCard = new EntitySet<HJGL_WeldingProcedure_WeldingProcessCard>(new Action<HJGL_WeldingProcedure_WeldingProcessCard>(this.attach_HJGL_WeldingProcedure_WeldingProcessCard), new Action<HJGL_WeldingProcedure_WeldingProcessCard>(this.detach_HJGL_WeldingProcedure_WeldingProcessCard));
 			this._HJGL_WeldingProcedure_WeldRepairCard = new EntitySet<HJGL_WeldingProcedure_WeldRepairCard>(new Action<HJGL_WeldingProcedure_WeldRepairCard>(this.attach_HJGL_WeldingProcedure_WeldRepairCard), new Action<HJGL_WeldingProcedure_WeldRepairCard>(this.detach_HJGL_WeldingProcedure_WeldRepairCard));
 			this._HJGL_WeldingProcedure_WeldHotProcessCard = new EntitySet<HJGL_WeldingProcedure_WeldHotProcessCard>(new Action<HJGL_WeldingProcedure_WeldHotProcessCard>(this.attach_HJGL_WeldingProcedure_WeldHotProcessCard), new Action<HJGL_WeldingProcedure_WeldHotProcessCard>(this.detach_HJGL_WeldingProcedure_WeldHotProcessCard));
+			this._JGZL_CommencementReport = new EntitySet<JGZL_CommencementReport>(new Action<JGZL_CommencementReport>(this.attach_JGZL_CommencementReport), new Action<JGZL_CommencementReport>(this.detach_JGZL_CommencementReport));
 			this._Project_Installation = new EntitySet<Project_Installation>(new Action<Project_Installation>(this.attach_Project_Installation), new Action<Project_Installation>(this.detach_Project_Installation));
 			this._Project_RoleButtonPower = new EntitySet<Project_RoleButtonPower>(new Action<Project_RoleButtonPower>(this.attach_Project_RoleButtonPower), new Action<Project_RoleButtonPower>(this.detach_Project_RoleButtonPower));
 			this._Project_RolePower = new EntitySet<Project_RolePower>(new Action<Project_RolePower>(this.attach_Project_RolePower), new Action<Project_RolePower>(this.detach_Project_RolePower));
@@ -5480,6 +5513,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_CommencementReport_Base_Project", Storage="_JGZL_CommencementReport", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<JGZL_CommencementReport> JGZL_CommencementReport
+		{
+			get
+			{
+				return this._JGZL_CommencementReport;
+			}
+			set
+			{
+				this._JGZL_CommencementReport.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> Project_Installation
 		{
@@ -6138,6 +6184,18 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_JGZL_CommencementReport(JGZL_CommencementReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_JGZL_CommencementReport(JGZL_CommencementReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_Project_Installation(Project_Installation entity)
 		{
 			this.SendPropertyChanging();
@@ -48158,7 +48216,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RT_TrustCode", DbType="VarChar(30)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RT_TrustCode", DbType="NVarChar(100)")]
 		public string RT_TrustCode
 		{
 			get
@@ -79126,6 +79184,414 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_CommencementReport")]
+	public partial class JGZL_CommencementReport : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _CommencementReportId;
+		
+		private string _ProjectId;
+		
+		private string _ContractNumber;
+		
+		private string _DesignUnit;
+		
+		private System.Nullable<System.DateTime> _PlannedStartDate;
+		
+		private System.Nullable<System.DateTime> _PlannedEndDate;
+		
+		private string _ProjectContent;
+		
+		private string _Conditions;
+		
+		private string _ReviewOpinion;
+		
+		private string _QualitySupervisionOpinion;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+		private EntityRef<Sys_User> _Sys_User;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnCommencementReportIdChanging(string value);
+    partial void OnCommencementReportIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnContractNumberChanging(string value);
+    partial void OnContractNumberChanged();
+    partial void OnDesignUnitChanging(string value);
+    partial void OnDesignUnitChanged();
+    partial void OnPlannedStartDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnPlannedStartDateChanged();
+    partial void OnPlannedEndDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnPlannedEndDateChanged();
+    partial void OnProjectContentChanging(string value);
+    partial void OnProjectContentChanged();
+    partial void OnConditionsChanging(string value);
+    partial void OnConditionsChanged();
+    partial void OnReviewOpinionChanging(string value);
+    partial void OnReviewOpinionChanged();
+    partial void OnQualitySupervisionOpinionChanging(string value);
+    partial void OnQualitySupervisionOpinionChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    #endregion
+		
+		public JGZL_CommencementReport()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Sys_User = default(EntityRef<Sys_User>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CommencementReportId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string CommencementReportId
+		{
+			get
+			{
+				return this._CommencementReportId;
+			}
+			set
+			{
+				if ((this._CommencementReportId != value))
+				{
+					this.OnCommencementReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._CommencementReportId = value;
+					this.SendPropertyChanged("CommencementReportId");
+					this.OnCommencementReportIdChanged();
+				}
+			}
+		}
+		
+		[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="_ContractNumber", DbType="NVarChar(100)")]
+		public string ContractNumber
+		{
+			get
+			{
+				return this._ContractNumber;
+			}
+			set
+			{
+				if ((this._ContractNumber != value))
+				{
+					this.OnContractNumberChanging(value);
+					this.SendPropertyChanging();
+					this._ContractNumber = value;
+					this.SendPropertyChanged("ContractNumber");
+					this.OnContractNumberChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignUnit", DbType="NVarChar(50)")]
+		public string DesignUnit
+		{
+			get
+			{
+				return this._DesignUnit;
+			}
+			set
+			{
+				if ((this._DesignUnit != value))
+				{
+					this.OnDesignUnitChanging(value);
+					this.SendPropertyChanging();
+					this._DesignUnit = value;
+					this.SendPropertyChanged("DesignUnit");
+					this.OnDesignUnitChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlannedStartDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlannedStartDate
+		{
+			get
+			{
+				return this._PlannedStartDate;
+			}
+			set
+			{
+				if ((this._PlannedStartDate != value))
+				{
+					this.OnPlannedStartDateChanging(value);
+					this.SendPropertyChanging();
+					this._PlannedStartDate = value;
+					this.SendPropertyChanged("PlannedStartDate");
+					this.OnPlannedStartDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlannedEndDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlannedEndDate
+		{
+			get
+			{
+				return this._PlannedEndDate;
+			}
+			set
+			{
+				if ((this._PlannedEndDate != value))
+				{
+					this.OnPlannedEndDateChanging(value);
+					this.SendPropertyChanging();
+					this._PlannedEndDate = value;
+					this.SendPropertyChanged("PlannedEndDate");
+					this.OnPlannedEndDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectContent", DbType="NVarChar(2000)")]
+		public string ProjectContent
+		{
+			get
+			{
+				return this._ProjectContent;
+			}
+			set
+			{
+				if ((this._ProjectContent != value))
+				{
+					this.OnProjectContentChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectContent = value;
+					this.SendPropertyChanged("ProjectContent");
+					this.OnProjectContentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Conditions", DbType="NVarChar(1000)")]
+		public string Conditions
+		{
+			get
+			{
+				return this._Conditions;
+			}
+			set
+			{
+				if ((this._Conditions != value))
+				{
+					this.OnConditionsChanging(value);
+					this.SendPropertyChanging();
+					this._Conditions = value;
+					this.SendPropertyChanged("Conditions");
+					this.OnConditionsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewOpinion", DbType="NVarChar(1000)")]
+		public string ReviewOpinion
+		{
+			get
+			{
+				return this._ReviewOpinion;
+			}
+			set
+			{
+				if ((this._ReviewOpinion != value))
+				{
+					this.OnReviewOpinionChanging(value);
+					this.SendPropertyChanging();
+					this._ReviewOpinion = value;
+					this.SendPropertyChanged("ReviewOpinion");
+					this.OnReviewOpinionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualitySupervisionOpinion", DbType="NVarChar(1000)")]
+		public string QualitySupervisionOpinion
+		{
+			get
+			{
+				return this._QualitySupervisionOpinion;
+			}
+			set
+			{
+				if ((this._QualitySupervisionOpinion != value))
+				{
+					this.OnQualitySupervisionOpinionChanging(value);
+					this.SendPropertyChanging();
+					this._QualitySupervisionOpinion = value;
+					this.SendPropertyChanged("QualitySupervisionOpinion");
+					this.OnQualitySupervisionOpinionChanged();
+				}
+			}
+		}
+		
+		[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<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_CommencementReport_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_CommencementReport.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.JGZL_CommencementReport.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_CommencementReport_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_CommencementReport.Remove(this);
+					}
+					this._Sys_User.Entity = value;
+					if ((value != null))
+					{
+						value.JGZL_CommencementReport.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
 	{
@@ -100575,6 +101041,8 @@ namespace Model
 		
 		private EntitySet<HJGL_WeldingProcedure_WeldHotProcessCard> _HJGL_WeldingProcedure_WeldHotProcessCard;
 		
+		private EntitySet<JGZL_CommencementReport> _JGZL_CommencementReport;
+		
 		private EntitySet<Project_User> _Project_User;
 		
 		private EntitySet<Project_UserButtonPower> _Project_UserButtonPower;
@@ -100656,6 +101124,7 @@ namespace Model
 			this._HJGL_Sys_DataInTemp = new EntitySet<HJGL_Sys_DataInTemp>(new Action<HJGL_Sys_DataInTemp>(this.attach_HJGL_Sys_DataInTemp), new Action<HJGL_Sys_DataInTemp>(this.detach_HJGL_Sys_DataInTemp));
 			this._HJGL_Sys_UserShowColumns = new EntitySet<HJGL_Sys_UserShowColumns>(new Action<HJGL_Sys_UserShowColumns>(this.attach_HJGL_Sys_UserShowColumns), new Action<HJGL_Sys_UserShowColumns>(this.detach_HJGL_Sys_UserShowColumns));
 			this._HJGL_WeldingProcedure_WeldHotProcessCard = new EntitySet<HJGL_WeldingProcedure_WeldHotProcessCard>(new Action<HJGL_WeldingProcedure_WeldHotProcessCard>(this.attach_HJGL_WeldingProcedure_WeldHotProcessCard), new Action<HJGL_WeldingProcedure_WeldHotProcessCard>(this.detach_HJGL_WeldingProcedure_WeldHotProcessCard));
+			this._JGZL_CommencementReport = new EntitySet<JGZL_CommencementReport>(new Action<JGZL_CommencementReport>(this.attach_JGZL_CommencementReport), new Action<JGZL_CommencementReport>(this.detach_JGZL_CommencementReport));
 			this._Project_User = new EntitySet<Project_User>(new Action<Project_User>(this.attach_Project_User), new Action<Project_User>(this.detach_Project_User));
 			this._Project_UserButtonPower = new EntitySet<Project_UserButtonPower>(new Action<Project_UserButtonPower>(this.attach_Project_UserButtonPower), new Action<Project_UserButtonPower>(this.detach_Project_UserButtonPower));
 			this._Project_UserPower = new EntitySet<Project_UserPower>(new Action<Project_UserPower>(this.attach_Project_UserPower), new Action<Project_UserPower>(this.detach_Project_UserPower));
@@ -101294,6 +101763,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_CommencementReport_Sys_User", Storage="_JGZL_CommencementReport", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
+		public EntitySet<JGZL_CommencementReport> JGZL_CommencementReport
+		{
+			get
+			{
+				return this._JGZL_CommencementReport;
+			}
+			set
+			{
+				this._JGZL_CommencementReport.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> Project_User
 		{
@@ -101661,6 +102143,18 @@ namespace Model
 			entity.Sys_User = null;
 		}
 		
+		private void attach_JGZL_CommencementReport(JGZL_CommencementReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Sys_User = this;
+		}
+		
+		private void detach_JGZL_CommencementReport(JGZL_CommencementReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Sys_User = null;
+		}
+		
 		private void attach_Project_User(Project_User entity)
 		{
 			this.SendPropertyChanging();
@@ -105634,6 +106128,8 @@ namespace Model
 		
 		private string _Welder;
 		
+		private string _WED_Unit;
+		
 		private string _STE_ID;
 		
 		private string _DReportID;
@@ -105752,6 +106248,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WED_Unit", DbType="NVarChar(50)")]
+		public string WED_Unit
+		{
+			get
+			{
+				return this._WED_Unit;
+			}
+			set
+			{
+				if ((this._WED_Unit != value))
+				{
+					this._WED_Unit = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="VarChar(50)")]
 		public string STE_ID
 		{
@@ -108678,6 +109190,357 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_UnitPerformance")]
+	public partial class View_UnitPerformance
+	{
+		
+		private System.Nullable<System.Guid> _Id;
+		
+		private string _ProjectCode;
+		
+		private string _WED_Unit;
+		
+		private string _UnitCode;
+		
+		private string _UnitName;
+		
+		private System.Nullable<decimal> _TotalSize;
+		
+		private int _TotalJoint;
+		
+		private int _JointNum1;
+		
+		private System.Nullable<int> _JointPassNum1;
+		
+		private int _RepairJoint1;
+		
+		private int _RepairJoint2;
+		
+		private int _RepairJoint3;
+		
+		private System.Nullable<decimal> _JointPassRate;
+		
+		private int _Totalfilm;
+		
+		private System.Nullable<int> _TotalPassfilm;
+		
+		private int _RepairFilm1;
+		
+		private int _RepairFilm2;
+		
+		private int _RepairFilm3;
+		
+		private System.Nullable<decimal> _JointFilmPassRate;
+		
+		public View_UnitPerformance()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="UniqueIdentifier")]
+		public System.Nullable<System.Guid> Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this._Id = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectCode", DbType="VarChar(1) NOT NULL", CanBeNull=false)]
+		public string ProjectCode
+		{
+			get
+			{
+				return this._ProjectCode;
+			}
+			set
+			{
+				if ((this._ProjectCode != value))
+				{
+					this._ProjectCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WED_Unit", DbType="NVarChar(50)")]
+		public string WED_Unit
+		{
+			get
+			{
+				return this._WED_Unit;
+			}
+			set
+			{
+				if ((this._WED_Unit != value))
+				{
+					this._WED_Unit = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitCode", DbType="NVarChar(20)")]
+		public string UnitCode
+		{
+			get
+			{
+				return this._UnitCode;
+			}
+			set
+			{
+				if ((this._UnitCode != value))
+				{
+					this._UnitCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(50)")]
+		public string UnitName
+		{
+			get
+			{
+				return this._UnitName;
+			}
+			set
+			{
+				if ((this._UnitName != value))
+				{
+					this._UnitName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalSize", Storage="_TotalSize", DbType="Decimal(19,2)")]
+		public System.Nullable<decimal> TotalSize
+		{
+			get
+			{
+				return this._TotalSize;
+			}
+			set
+			{
+				if ((this._TotalSize != value))
+				{
+					this._TotalSize = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalJoint", Storage="_TotalJoint", DbType="Int NOT NULL")]
+		public int TotalJoint
+		{
+			get
+			{
+				return this._TotalJoint;
+			}
+			set
+			{
+				if ((this._TotalJoint != value))
+				{
+					this._TotalJoint = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointNum1", DbType="Int NOT NULL")]
+		public int JointNum1
+		{
+			get
+			{
+				return this._JointNum1;
+			}
+			set
+			{
+				if ((this._JointNum1 != value))
+				{
+					this._JointNum1 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointPassNum1", DbType="Int")]
+		public System.Nullable<int> JointPassNum1
+		{
+			get
+			{
+				return this._JointPassNum1;
+			}
+			set
+			{
+				if ((this._JointPassNum1 != value))
+				{
+					this._JointPassNum1 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RepairJoint1", DbType="Int NOT NULL")]
+		public int RepairJoint1
+		{
+			get
+			{
+				return this._RepairJoint1;
+			}
+			set
+			{
+				if ((this._RepairJoint1 != value))
+				{
+					this._RepairJoint1 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RepairJoint2", DbType="Int NOT NULL")]
+		public int RepairJoint2
+		{
+			get
+			{
+				return this._RepairJoint2;
+			}
+			set
+			{
+				if ((this._RepairJoint2 != value))
+				{
+					this._RepairJoint2 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RepairJoint3", DbType="Int NOT NULL")]
+		public int RepairJoint3
+		{
+			get
+			{
+				return this._RepairJoint3;
+			}
+			set
+			{
+				if ((this._RepairJoint3 != value))
+				{
+					this._RepairJoint3 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointPassRate", DbType="Decimal(19,3)")]
+		public System.Nullable<decimal> JointPassRate
+		{
+			get
+			{
+				return this._JointPassRate;
+			}
+			set
+			{
+				if ((this._JointPassRate != value))
+				{
+					this._JointPassRate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalfilm", Storage="_Totalfilm", DbType="Int NOT NULL")]
+		public int Totalfilm
+		{
+			get
+			{
+				return this._Totalfilm;
+			}
+			set
+			{
+				if ((this._Totalfilm != value))
+				{
+					this._Totalfilm = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="totalPassfilm", Storage="_TotalPassfilm", DbType="Int")]
+		public System.Nullable<int> TotalPassfilm
+		{
+			get
+			{
+				return this._TotalPassfilm;
+			}
+			set
+			{
+				if ((this._TotalPassfilm != value))
+				{
+					this._TotalPassfilm = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="repairFilm1", Storage="_RepairFilm1", DbType="Int NOT NULL")]
+		public int RepairFilm1
+		{
+			get
+			{
+				return this._RepairFilm1;
+			}
+			set
+			{
+				if ((this._RepairFilm1 != value))
+				{
+					this._RepairFilm1 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="repairFilm2", Storage="_RepairFilm2", DbType="Int NOT NULL")]
+		public int RepairFilm2
+		{
+			get
+			{
+				return this._RepairFilm2;
+			}
+			set
+			{
+				if ((this._RepairFilm2 != value))
+				{
+					this._RepairFilm2 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="repairFilm3", Storage="_RepairFilm3", DbType="Int NOT NULL")]
+		public int RepairFilm3
+		{
+			get
+			{
+				return this._RepairFilm3;
+			}
+			set
+			{
+				if ((this._RepairFilm3 != value))
+				{
+					this._RepairFilm3 = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointFilmPassRate", DbType="Decimal(19,3)")]
+		public System.Nullable<decimal> JointFilmPassRate
+		{
+			get
+			{
+				return this._JointFilmPassRate;
+			}
+			set
+			{
+				if ((this._JointFilmPassRate != value))
+				{
+					this._JointFilmPassRate = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_UsePosition")]
 	public partial class View_UsePosition
 	{
@@ -108987,6 +109850,188 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_QualityCertificate")]
+	public partial class Weld_QualityCertificate : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _QualityCertificateId;
+		
+		private string _WeldId;
+		
+		private string _HeartNo;
+		
+		private string _Warrantybook;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnQualityCertificateIdChanging(string value);
+    partial void OnQualityCertificateIdChanged();
+    partial void OnWeldIdChanging(string value);
+    partial void OnWeldIdChanged();
+    partial void OnHeartNoChanging(string value);
+    partial void OnHeartNoChanged();
+    partial void OnWarrantybookChanging(string value);
+    partial void OnWarrantybookChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    #endregion
+		
+		public Weld_QualityCertificate()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualityCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string QualityCertificateId
+		{
+			get
+			{
+				return this._QualityCertificateId;
+			}
+			set
+			{
+				if ((this._QualityCertificateId != value))
+				{
+					this.OnQualityCertificateIdChanging(value);
+					this.SendPropertyChanging();
+					this._QualityCertificateId = value;
+					this.SendPropertyChanged("QualityCertificateId");
+					this.OnQualityCertificateIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldId", DbType="NVarChar(50)")]
+		public string WeldId
+		{
+			get
+			{
+				return this._WeldId;
+			}
+			set
+			{
+				if ((this._WeldId != value))
+				{
+					this.OnWeldIdChanging(value);
+					this.SendPropertyChanging();
+					this._WeldId = value;
+					this.SendPropertyChanged("WeldId");
+					this.OnWeldIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeartNo", DbType="NVarChar(50)")]
+		public string HeartNo
+		{
+			get
+			{
+				return this._HeartNo;
+			}
+			set
+			{
+				if ((this._HeartNo != value))
+				{
+					this.OnHeartNoChanging(value);
+					this.SendPropertyChanging();
+					this._HeartNo = value;
+					this.SendPropertyChanged("HeartNo");
+					this.OnHeartNoChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Warrantybook", DbType="NVarChar(50)")]
+		public string Warrantybook
+		{
+			get
+			{
+				return this._Warrantybook;
+			}
+			set
+			{
+				if ((this._Warrantybook != value))
+				{
+					this.OnWarrantybookChanging(value);
+					this.SendPropertyChanging();
+					this._Warrantybook = value;
+					this.SendPropertyChanged("Warrantybook");
+					this.OnWarrantybookChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					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<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		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.Weld_RecycleMat")]
 	public partial class Weld_RecycleMat : INotifyPropertyChanging, INotifyPropertyChanged
 	{
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 28be9c4..a48b337 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />