Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

DataBase/版本日志/HJGLDB_DS_2026-05-14_bwj.sql

@@ -0,0 +1,50 @@
+CREATE TABLE [dbo].[Sys_DataInTemp](
+	[TempId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UserId] [nvarchar](50) NULL,
+	[Time] [datetime] NULL,
+	[RowNo] [int] NULL,
+	[ToopValue] [nvarchar](2000) NULL,
+	[Type] [nvarchar](50) NULL,
+	[Value1] [nvarchar](100) NULL,
+	[Value2] [nvarchar](100) NULL,
+	[Value3] [nvarchar](100) NULL,
+	[Value4] [nvarchar](100) NULL,
+	[Value5] [nvarchar](100) NULL,
+	[Value6] [nvarchar](100) NULL,
+	[Value7] [nvarchar](100) NULL,
+	[Value8] [nvarchar](100) NULL,
+	[Value9] [nvarchar](100) NULL,
+	[Value10] [nvarchar](100) NULL,
+	[Value11] [nvarchar](100) NULL,
+	[Value12] [nvarchar](100) NULL,
+	[Value13] [nvarchar](100) NULL,
+	[Value14] [nvarchar](100) NULL,
+	[Value15] [nvarchar](100) NULL,
+	[Value16] [nvarchar](100) NULL,
+	[Value17] [nvarchar](100) NULL,
+	[Value18] [nvarchar](100) NULL,
+	[Value19] [nvarchar](100) NULL,
+	[Value20] [nvarchar](100) NULL,
+ CONSTRAINT [PK_Sys_DataInTemp] PRIMARY KEY CLUSTERED 
+(
+	[TempId] 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].[Sys_DataInTemp]  WITH CHECK ADD  CONSTRAINT [FK_Sys_DataInTemp_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[Sys_DataInTemp] CHECK CONSTRAINT [FK_Sys_DataInTemp_Base_Project]
+GO
+
+ALTER TABLE [dbo].[Sys_DataInTemp]  WITH CHECK ADD  CONSTRAINT [FK_Sys_DataInTemp_Sys_User] FOREIGN KEY([UserId])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[Sys_DataInTemp] CHECK CONSTRAINT [FK_Sys_DataInTemp_Sys_User]
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2026-05-18_bwj.sql

@@ -0,0 +1,67 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('142E6B0B-530E-448B-84C5-1A93E0316E3B','뼝쏜（툭庫）보왯꼼醴섟쇱꿎횅훰깊','HJGL/WeldingReport/GoldMouthLedger.aspx',240,'F3B157B7-9BEE-4150-6666-087828F1C51D','3')
+go
+
+
+
+CREATE PROCEDURE [dbo].[HJGL_rpt_GoldMouthLedger]
+(
+   @projectId NVARCHAR(50) =null
+)
+AS
+/**********뼝쏜（툭庫）보왯꼼醴섟쇱꿎횅훰깊***************/
+SELECT jointInfo.JOT_ID,
+jointInfo.ProjectId,
+jointInfo.ISO_ID,
+isoInfo.ISO_IsoNo,
+jointInfo.JOT_JointNo,
+(case when Steel.STE_Code is not null 
+	then (case when Steel2.STE_Code is not null and Steel.STE_Code<>Steel2.STE_Code 
+				then Steel.STE_Code+'/'+Steel2.STE_Code 
+				else Steel.STE_Code end) 
+	else Steel2.STE_Code end) as SteelCode,--꼼醴
+null as OldIsoNo,--툭庫(일)밗돛밗窟긍뵀
+null as OldSteelCode,--툭庫(일)밗돛꼼醴
+(case when Welder.WED_Code is not null
+	then (case when FloorWelder.WED_Code is not null and Welder.WED_Code<>FloorWelder.WED_Code
+				then Welder.WED_Code+'/'+FloorWelder.WED_Code
+				else Welder.WED_Code end)
+	else FloorWelder.WED_Code end) as WelderCode, --보묏뵀
+(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate
+	ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, --보쌈휑퍅
+ndt.NDT_Code,--쇱꿎렘랬
+(case when jointInfo.RT_States is not null and jointInfo.RT_States!='덤路쇱' then jointInfo.RT_States
+else (case when jointInfo.UT_States is not null and jointInfo.UT_States!='덤路쇱' then jointInfo.UT_States 
+else (case when jointInfo.MT_States is not null and jointInfo.MT_States!='덤路쇱' then jointInfo.MT_States
+else (case when jointInfo.PT_States is not null and jointInfo.PT_States!='덤路쇱' then jointInfo.PT_States
+else (case when jointInfo.PAUT_States is not null and jointInfo.PAUT_States!='덤路쇱' then jointInfo.PAUT_States
+else null end) end)end) end) end) as TestStates,--쇱꿎榴檄
+(case when jointInfo.RT_States is not null and jointInfo.RT_States='쇱꿎북목' then jointInfo.RT_TrustDate
+else (case when jointInfo.UT_States is not null and jointInfo.UT_States='쇱꿎북목' then jointInfo.UT_TrustDate 
+else (case when jointInfo.MT_States is not null and jointInfo.MT_States='쇱꿎북목' then jointInfo.MT_TrustDate
+else (case when jointInfo.PT_States is not null and jointInfo.PT_States='쇱꿎북목' then jointInfo.PT_TrustDate
+else (case when jointInfo.PAUT_States is not null and jointInfo.PAUT_States='쇱꿎북목' then jointInfo.PAUT_TrustDate
+else null end) end)end) end) end) as TestDate,--쇱꿎휑퍅
+null as ConfirmMan,--횅훰훙
+jointType.JOTY_Group,
+jointInfo.Sort1,
+jointInfo.Sort2,
+jointInfo.Sort3,
+jointInfo.Sort4,
+jointInfo.Sort5,
+jointInfo.JOT_Remark
+FROM HJGL_PW_JointInfo AS jointInfo
+LEFT JOIN HJGL_PW_IsoInfo AS isoInfo ON isoInfo.ISO_ID = jointInfo.ISO_ID
+LEFT JOIN HJGL_BS_JointType AS jointType ON jointType.JOTY_ID=jointInfo.JOTY_ID
+LEFT JOIN HJGL_BS_Steel AS Steel ON Steel.STE_ID=jointInfo.STE_ID
+LEFT JOIN HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=jointInfo.STE_ID2
+LEFT JOIN HJGL_BS_Welder AS Welder ON Welder.WED_ID= jointInfo.JOT_CellWelder
+LEFT JOIN HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=jointInfo.JOT_FloorWelder
+LEFT JOIN HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID=jointInfo.DReportID
+LEFT JOIN HJGL_BO_BatchDetail AS batchDetail on batchDetail.JOT_ID = jointInfo.JOT_ID
+LEFT JOIN HJGL_BS_NDTType AS ndt ON ndt.NDT_ID = batchDetail.NDT
+WHERE IsGold=1 
+and (jointInfo.ProjectId=@projectId or @projectId is null)
+order by isoInfo.ISO_IsoNo,jointType.JOTY_Group,jointInfo.Sort1,jointInfo.Sort2,jointInfo.Sort3,jointInfo.Sort4,jointInfo.Sort5
+GO

DataBase/版本日志/HJGLDB_DS_2026-05-20_bwj.sql

@@ -0,0 +1,102 @@
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('C2D55C90-59BE-4400-9BCD-D0A8B72B3F2B','焊缝返修台账','HJGL/WeldingReport/WeldRepairLists.aspx',250,'F3B157B7-9BEE-4150-6666-087828F1C51D','3')
+go
+
+CREATE PROCEDURE [dbo].[HJGL_rpt_RepairLists]
+(
+   @projectId NVARCHAR(50) =null
+)
+AS
+/************返修台账************/
+select distinct jointInfo.JOT_ID,jointInfo.ISO_ID,isoInfo.ISO_IsoNo,jointInfo.JOT_JointNo,jointInfo.JOT_JointDesc,
+(case when Steel.STE_Code is not null 
+	then (case when Steel2.STE_Code is not null and Steel.STE_Code<>Steel2.STE_Code 
+				then Steel.STE_Code+'/'+Steel2.STE_Code 
+				else Steel.STE_Code end) 
+	else Steel2.STE_Code end) as SteelCode,--材质
+rate.NDTR_Name,
+----------初次焊接--------------
+(case when Welder.WED_Code is not null
+	then (case when FloorWelder.WED_Code is not null and Welder.WED_Code<>FloorWelder.WED_Code
+				then Welder.WED_Code+'/'+FloorWelder.WED_Code
+				else Welder.WED_Code end)
+	else FloorWelder.WED_Code end) as WelderCode, --焊工号
+(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate
+	ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, --焊接日期
+(SELECT TOP 1 PostHeatingDate FROM dbo.HJGL_HotProessItem HotProessItem WHERE HotProessItem.JOT_ID=jointInfo.JOT_ID) as PostHeatingDate,--后热日期	
+null as PostHeatingCode,--后热曲线编号	
+(SELECT TOP 1 HotProessDate FROM dbo.HJGL_HotProessItem HotProessItem WHERE HotProessItem.JOT_ID=jointInfo.JOT_ID) as HotProessDate,--热处理日期	
+(SELECT TOP 1 RecordChartNo FROM dbo.HJGL_HotProessItem HotProessItem WHERE HotProessItem.JOT_ID=jointInfo.JOT_ID  and RecordChartNo is not null and RecordChartNo!='') AS RecordChartNo,--热处理曲线编号	
+CONVERT(VARCHAR,(case when jointInfo.RT_States is not null and jointInfo.RT_States='检测合格' then jointInfo.RT_TrustDate
+else (case when jointInfo.UT_States is not null and jointInfo.UT_States='检测合格' then jointInfo.UT_TrustDate 
+else (case when jointInfo.MT_States is not null and jointInfo.MT_States='检测合格' then jointInfo.MT_TrustDate
+else (case when jointInfo.PT_States is not null and jointInfo.PT_States='检测合格' then jointInfo.PT_TrustDate
+else (case when jointInfo.PAUT_States is not null and jointInfo.PAUT_States='检测合格' then jointInfo.PAUT_TrustDate
+else null end) end)end) end) end),23) as TestDate,--检测日期
+---------------------------------
+------------一返------------
+repairItemRecord.RepairWelderCode1,--焊工号	
+repairItemRecord.WeldDate as RepairWeldDate1,--焊接日期	
+null as RepairPostHeatingDate1,--后热日期	
+null as RepairPostHeatingCode1,--后热曲线编号	
+CONVERT(VARCHAR,repairItemRecord.TrustDate,23) as RepairHotDate1,--热处理日期	
+null as RepairRecordChartNo1,--热处理曲线编号	
+null as RepairTestDate1,--检测日期
+---------------------------------
+------------二返------------
+repairItemRecord2.RepairWelderCode2,--焊工号	
+repairItemRecord2.WeldDate as RepairWeldDate2,--焊接日期	
+null as RepairPostHeatingDate2,--后热日期	
+null as RepairPostHeatingCode2,--后热曲线编号	
+CONVERT(VARCHAR,repairItemRecord2.TrustDate,23) as RepairHotDate2,--热处理日期	
+null as RepairRecordChartNo2,---热处理曲线编号	
+null as RepairTestDate2,--检测日期
+---------------------------------
+------------硬度------------
+--第一次时间	
+--第一次时间	
+--第一次时间
+---------------------------------
+jointType.JOTY_Group,
+jointInfo.Sort1,
+jointInfo.Sort2,
+jointInfo.Sort3,
+jointInfo.Sort4,
+jointInfo.Sort5
+from HJGL_PW_JointInfo jointInfo
+left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID = jointInfo.ISO_ID
+LEFT JOIN HJGL_BS_Steel AS Steel ON Steel.STE_ID=jointInfo.STE_ID
+LEFT JOIN HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=jointInfo.STE_ID2 
+LEFT JOIN HJGL_BS_JointType AS jointType ON jointType.JOTY_ID=jointInfo.JOTY_ID
+left join HJGL_BS_NDTRate as rate on rate.NDTR_ID = jointInfo.NDTR_ID
+LEFT JOIN HJGL_BS_Welder AS Welder ON Welder.WED_ID= jointInfo.JOT_CellWelder
+LEFT JOIN HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=jointInfo.JOT_FloorWelder
+LEFT JOIN HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID=jointInfo.DReportID
+--一返
+--一返
+left join (select distinct HJGL_CH_RepairItemRecord.JOT_ID,(case when Welder.WED_Code is not null
+	then (case when FloorWelder.WED_Code is not null and Welder.WED_Code<>FloorWelder.WED_Code
+				then Welder.WED_Code+'/'+FloorWelder.WED_Code
+				else Welder.WED_Code end)
+	else FloorWelder.WED_Code end) as RepairWelderCode1,CONVERT(VARCHAR, WeldDate, 23) as WeldDate,hotProessTrustItem.TrustDate
+	from HJGL_CH_RepairItemRecord 
+			LEFT JOIN HJGL_BS_Welder AS Welder ON Welder.WED_ID= HJGL_CH_RepairItemRecord.JOT_CellWelder
+			LEFT JOIN HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=HJGL_CH_RepairItemRecord.JOT_FloorWelder
+			left join HJGL_CH_HotProessTrustItem as hotProessTrustItem on hotProessTrustItem.TrustItemID = HJGL_CH_RepairItemRecord.RepairItemRecordId
+			where RepairMark='R1') as repairItemRecord on repairItemRecord.JOT_ID = jointInfo.JOT_ID
+----二返			
+left join (select distinct HJGL_CH_RepairItemRecord.JOT_ID,(case when Welder.WED_Code is not null
+	then (case when FloorWelder.WED_Code is not null and Welder.WED_Code<>FloorWelder.WED_Code
+				then Welder.WED_Code+'/'+FloorWelder.WED_Code
+				else Welder.WED_Code end)
+	else FloorWelder.WED_Code end) as RepairWelderCode2,CONVERT(VARCHAR, WeldDate, 23) as WeldDate,hotProessTrustItem.TrustDate
+	from HJGL_CH_RepairItemRecord 
+			LEFT JOIN HJGL_BS_Welder AS Welder ON Welder.WED_ID= HJGL_CH_RepairItemRecord.JOT_CellWelder
+			LEFT JOIN HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=HJGL_CH_RepairItemRecord.JOT_FloorWelder
+			left join HJGL_CH_HotProessTrustItem as hotProessTrustItem on hotProessTrustItem.TrustItemID = HJGL_CH_RepairItemRecord.RepairItemRecordId
+			where RepairMark='R2') as repairItemRecord2 on repairItemRecord2.JOT_ID = jointInfo.JOT_ID
+
+where jointInfo.JOT_ID in (select JOT_ID from HJGL_CH_RepairItem)
+and (jointInfo.ProjectId=@projectId or @projectId is null)
+order by isoInfo.ISO_IsoNo,jointType.JOTY_Group,jointInfo.Sort1,jointInfo.Sort2,jointInfo.Sort3,jointInfo.Sort4,jointInfo.Sort5
+go

HJGL_DS/BLL/BLL.csproj

@@ -21,8 +21,6 @@
     <SccProvider>
     </SccProvider>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,39 +74,6 @@
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.6.0.0\lib\net461\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Http, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Http.6.0.0\lib\net461\Microsoft.Extensions.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.6.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.6.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.6.0.0\lib\net461\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.SQLServer.ManagedDTS, Version=10.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
@@ -129,47 +94,17 @@
       <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Net.Http.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.Json.8.0.0\lib\netstandard2.0\System.Net.Http.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Net.Http">
+      <HintPath>E:\工作\集团子公司\CNCEC_SUBQHSE\SUBQHSE\BLL\bin\Debug\System.Net.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.0\lib\netstandard2.0\System.Text.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
@@ -231,6 +166,7 @@
     <Compile Include="Common\SysManage\Sys_UserService.cs" />
     <Compile Include="Common\SysManage\Sys_UserSettingsService.cs" />
     <Compile Include="Common\SysManage\Sys_UserShowColumnsService.cs" />
+    <Compile Include="Common\Sys_DataInTempService.cs" />
     <Compile Include="Common\UploadAttachmentService.cs" />
     <Compile Include="Common\CommonService.cs" />
     <Compile Include="Common\Const.cs" />
@@ -408,13 +344,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\build\Microsoft.Extensions.Logging.Abstractions.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

HJGL_DS/BLL/Common/Const.cs

@@ -633,6 +633,11 @@ namespace BLL
         /// </summary>
         public const string WeldingProcedureTemplateUrl = "File\\Excel\\HJGL_DataIn\\焊接工艺评定台账导入模板.xls";
 
+        /// <summary>
+        /// 硬度值导入模板
+        /// </summary>
+        public const string HardReportSetTemplateUrl = "File\\Excel\\HJGL_DataIn\\硬度值导入模板.xls";
+
         /// <summary>
         /// 通用附件上传路径
         /// </summary>
@@ -2589,6 +2594,17 @@ namespace BLL
         /// 档案资料移交表导出模板
         /// </summary>
         public const string JGZL_ArchivalTransferUrl = "File\\Word\\JGZL\\档案资料移交表导出模板.docx";
+
         #endregion
+
+        /// <summary>
+        /// 黄金（碰头）焊口材质及检测确认表导出模板
+        /// </summary>
+        public const string HJGL_GoldMouthLedgerUrl = "File\\Excel\\黄金（碰头）焊口材质及检测确认表导出模板.xlsx";
+
+        /// <summary>
+        /// 焊缝返修台账导出模板
+        /// </summary>
+        public const string HJGL_WeldRepairListsUrl = "File\\Excel\\焊缝返修台账导出模板.xlsx";
     }
 }

HJGL_DS/BLL/Common/NPOIHelper.cs

@@ -101,8 +101,8 @@ namespace BLL.Common
                 {
                     // 2007版本
                     XSSFWorkbook workbook = new XSSFWorkbook(fs);
-                    sheetNumber = workbook.NumberOfSheets;
-                    for (int i = 0; i < sheetNumber; i++)
+                    //sheetNumber = workbook.NumberOfSheets;
+                    for (int i = 0; i < sheetNumber + 1; i++)
                     {
                         string sheetName = workbook.GetSheetName(i);
                         sheet = workbook.GetSheet(sheetName);
@@ -125,8 +125,8 @@ namespace BLL.Common
                 {
                     // 2003版本
                     HSSFWorkbook workbook = new HSSFWorkbook(fs);
-                    sheetNumber = workbook.NumberOfSheets;
-                    for (int i = 0; i < sheetNumber; i++)
+                    //sheetNumber = workbook.NumberOfSheets;
+                    for (int i = 0; i < sheetNumber + 1; i++)
                     {
                         string sheetName = workbook.GetSheetName(i);
                         sheet = workbook.GetSheet(sheetName);

HJGL_DS/BLL/Common/Sys_DataInTempService.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 导入临时表
+    /// </summary>
+    public class Sys_DataInTempService
+    {
+        /// <summary>
+        /// 根据主键获取导入临时表信息
+        /// </summary>
+        /// <param name="tempId">Id</param>
+        /// <returns></returns>
+        public static Model.Sys_DataInTemp GetDataInTempByTempId(string tempId)
+        {
+            return Funs.DB.Sys_DataInTemp.FirstOrDefault(x => x.TempId == tempId);
+        }
+
+        /// <summary>
+        /// 增加导入临时表记录
+        /// </summary>
+        /// <param name="dataInTemp">委托实体</param>
+        public static void AddDataInTemp(Model.Sys_DataInTemp dataInTemp)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp();
+            newDataInTemp.TempId = dataInTemp.TempId;
+            newDataInTemp.ProjectId = dataInTemp.ProjectId;
+            newDataInTemp.UserId = dataInTemp.UserId;
+            newDataInTemp.Time = dataInTemp.Time;
+            newDataInTemp.RowNo = dataInTemp.RowNo;
+            newDataInTemp.Type = dataInTemp.Type;
+            newDataInTemp.Value1 = dataInTemp.Value1;
+            newDataInTemp.Value2 = dataInTemp.Value2;
+            newDataInTemp.Value3 = dataInTemp.Value3;
+            newDataInTemp.Value4 = dataInTemp.Value4;
+            newDataInTemp.Value5 = dataInTemp.Value5;
+            newDataInTemp.Value6 = dataInTemp.Value6;
+            newDataInTemp.Value7 = dataInTemp.Value7;
+            newDataInTemp.Value8 = dataInTemp.Value8;
+            newDataInTemp.Value9 = dataInTemp.Value9;
+            newDataInTemp.Value10 = dataInTemp.Value10;
+            newDataInTemp.Value11 = dataInTemp.Value11;
+            newDataInTemp.Value12 = dataInTemp.Value12;
+            newDataInTemp.Value13 = dataInTemp.Value13;
+            newDataInTemp.Value14 = dataInTemp.Value14;
+            newDataInTemp.Value15 = dataInTemp.Value15;
+            newDataInTemp.Value16 = dataInTemp.Value16;
+            newDataInTemp.Value17 = dataInTemp.Value17;
+            newDataInTemp.Value18 = dataInTemp.Value18;
+            newDataInTemp.Value19 = dataInTemp.Value19;
+            newDataInTemp.Value20 = dataInTemp.Value20;
+
+            newDataInTemp.ToopValue = dataInTemp.ToopValue;
+            db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp);
+            db.SubmitChanges();
+        }
+
+
+        public static void AddDataInTemp(List<Model.Sys_DataInTemp> dataInTemps)
+        {
+            Model.SGGLDB db = Funs.DB;
+            foreach (var dataInTemp in dataInTemps)
+            {
+                Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp();
+                newDataInTemp.TempId = dataInTemp.TempId;
+                newDataInTemp.ProjectId = dataInTemp.ProjectId;
+                newDataInTemp.UserId = dataInTemp.UserId;
+                newDataInTemp.Time = dataInTemp.Time;
+                newDataInTemp.RowNo = dataInTemp.RowNo;
+                newDataInTemp.Type = dataInTemp.Type;
+                newDataInTemp.Value1 = dataInTemp.Value1;
+                newDataInTemp.Value2 = dataInTemp.Value2;
+                newDataInTemp.Value3 = dataInTemp.Value3;
+                newDataInTemp.Value4 = dataInTemp.Value4;
+                newDataInTemp.Value5 = dataInTemp.Value5;
+                newDataInTemp.Value6 = dataInTemp.Value6;
+                newDataInTemp.Value7 = dataInTemp.Value7;
+                newDataInTemp.Value8 = dataInTemp.Value8;
+                newDataInTemp.Value9 = dataInTemp.Value9;
+                newDataInTemp.Value10 = dataInTemp.Value10;
+                newDataInTemp.Value11 = dataInTemp.Value11;
+                newDataInTemp.Value12 = dataInTemp.Value12;
+                newDataInTemp.Value13 = dataInTemp.Value13;
+                newDataInTemp.Value14 = dataInTemp.Value14;
+                newDataInTemp.Value15 = dataInTemp.Value15;
+                newDataInTemp.Value16 = dataInTemp.Value16;
+                newDataInTemp.Value17 = dataInTemp.Value17;
+                newDataInTemp.Value18 = dataInTemp.Value18;
+                newDataInTemp.Value19 = dataInTemp.Value19;
+                newDataInTemp.Value20 = dataInTemp.Value20;
+
+                newDataInTemp.ToopValue = dataInTemp.ToopValue;
+                db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp);
+            }
+            db.SubmitChanges();
+        }
+
+
+
+        /// <summary>
+        /// 修改导入临时表记录
+        /// </summary>
+        /// <param name="weldReport">焊接实体</param>
+        public static void UpdateDataInTemp(Model.Sys_DataInTemp dataInTemp)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Sys_DataInTemp newDataInTemp = db.Sys_DataInTemp.FirstOrDefault(e => e.TempId == dataInTemp.TempId);
+            if (newDataInTemp != null)
+            {
+                newDataInTemp.UserId = dataInTemp.UserId;
+                newDataInTemp.Time = dataInTemp.Time;
+                newDataInTemp.Value1 = dataInTemp.Value1;
+                newDataInTemp.Value2 = dataInTemp.Value2;
+                newDataInTemp.Value3 = dataInTemp.Value3;
+                newDataInTemp.Value4 = dataInTemp.Value4;
+                newDataInTemp.Value5 = dataInTemp.Value5;
+                newDataInTemp.Value6 = dataInTemp.Value6;
+                newDataInTemp.Value7 = dataInTemp.Value7;
+                newDataInTemp.Value8 = dataInTemp.Value8;
+                newDataInTemp.Value9 = dataInTemp.Value9;
+                newDataInTemp.Value10 = dataInTemp.Value10;
+                newDataInTemp.Value11 = dataInTemp.Value11;
+                newDataInTemp.Value12 = dataInTemp.Value12;
+                newDataInTemp.Value13 = dataInTemp.Value13;
+                newDataInTemp.Value14 = dataInTemp.Value14;
+                newDataInTemp.Value15 = dataInTemp.Value15;
+                newDataInTemp.Value16 = dataInTemp.Value16;
+                newDataInTemp.Value17 = dataInTemp.Value17;
+                newDataInTemp.Value18 = dataInTemp.Value18;
+                newDataInTemp.Value19 = dataInTemp.Value19;
+                newDataInTemp.Value20 = dataInTemp.Value20;
+                newDataInTemp.ToopValue = dataInTemp.ToopValue;
+                newDataInTemp.Type = dataInTemp.Type;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除导入临时表记录
+        /// </summary>
+        /// <param name="tempId">委托主键</param>
+        public static void DeleteDataInTempByDataInTempID(string tempId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Sys_DataInTemp dataInTemp = db.Sys_DataInTemp.FirstOrDefault(e => e.TempId == tempId);
+            if (dataInTemp != null)
+            {
+                db.Sys_DataInTemp.DeleteOnSubmit(dataInTemp);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据项目用户主键删除导入临时表记录
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="userId"></param>
+        public static void DeleteDataInTempByProjectIdUserId(string projectId, string userId, string type)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var dataInTemp = from x in db.Sys_DataInTemp where x.ProjectId == projectId && x.UserId == userId && x.Type == type select x;
+            if (dataInTemp.Count() > 0)
+            {
+                db.Sys_DataInTemp.DeleteAllOnSubmit(dataInTemp);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx

@@ -79,7 +79,8 @@
                                     <Items>
                                         <f:Button ID="btnWeldingRecord" BoxConfigAlign="Center" Icon="Printer" runat="server" EnableAjax="false" DisableControlBeforePostBack="false" Text="焊接接头报检检查记录打印" ToolTip="焊接接头报检检查记录打印" OnClick="btnWeldingRecord_Click"></f:Button>                                        
                                         <f:DropDownList ID="drpIsoId" runat="server" Label="管线号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="txtWeldingDate_TextChanged" EnableEdit="true"></f:DropDownList>
-                                        <f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="txtWeldingDate_TextChanged" Width="220px"></f:DatePicker>
+                                        <%--<f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="txtWeldingDate_TextChanged" Width="220px"></f:DatePicker>--%>
+                                        <f:DropDownList ID="drpWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="txtWeldingDate_TextChanged" Width="220px" EnableEdit="true"></f:DropDownList>
                                     </Items>
                                 </f:Toolbar>
                             </Toolbars>

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs

@@ -1,4 +1,7 @@
 using BLL;
+using FineUIPro.Web.common.BaseInfo;
+using Model;
+using NPOI.SS.Formula.Functions;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
@@ -96,10 +99,10 @@ namespace FineUIPro.Web.ContinuousPrint
                 strSql += " AND isoInfo.ISO_ID=@isoId";
                 listStr.Add(new SqlParameter("@isoId", this.drpIsoId.SelectedValue));
             }
-            if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim()))
+            if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue))
             {
                 strSql += " AND weldReport.JOT_WeldDate=@weldingDate";
-                listStr.Add(new SqlParameter("@weldingDate", this.txtWeldingDate.Text.Trim()));
+                listStr.Add(new SqlParameter("@weldingDate", this.drpWeldingDate.SelectedValue));
             }
             SqlParameter[] parameter = listStr.ToArray();
             Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -159,6 +162,19 @@ namespace FineUIPro.Web.ContinuousPrint
             this.drpIsoId.SelectedValue = BLL.Const._Null;
 
             BindGrid1(this.Grid1.SelectedRowID);
+
+            //焊接日期
+            this.drpWeldingDate.Items.Clear();
+            this.drpWeldingDate.DataTextField = "Date";
+            this.drpWeldingDate.DataValueField = "Date";
+            List<string> dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail
+                                      join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
+                                      join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID
+                                      join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID
+                                      where y.ProjectId== this.Grid1.SelectedRowID
+                                        select w.JOT_WeldDate.ToShortDateString()).Distinct().ToList();
+            this.drpWeldingDate.DataSource = dateLists;
+            this.drpWeldingDate.DataBind();
         }
         #endregion
 
@@ -304,6 +320,8 @@ namespace FineUIPro.Web.ContinuousPrint
                         {
                             keyValuePairs.Add("NDTType", "PT");
                         }
+                        string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.hidJOT_WeldDate.Value));
+                        keyValuePairs.Add("WeldingDate", weldingDate);
                         BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                         initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx";

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ContinuousPrint {
-    
-    
-    public partial class WeldingJointInspection {
-        
+namespace FineUIPro.Web.ContinuousPrint
+{
+
+
+    public partial class WeldingJointInspection
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// panelTopRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelTopRegion;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// panelBottomRegion 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelBottomRegion;
-        
+
         /// <summary>
         /// Grid2 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid2;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// btnWeldingRecord 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnWeldingRecord;
-        
+
         /// <summary>
         /// drpIsoId 控件。
         /// </summary>
@@ -164,16 +166,16 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsoId;
-        
+
         /// <summary>
-        /// txtWeldingDate 控件。
+        /// drpWeldingDate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtWeldingDate;
-        
+        protected global::FineUIPro.DropDownList drpWeldingDate;
+
         /// <summary>
         /// labNumber 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labNumber;
-        
+
         /// <summary>
         /// hidProjectId 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidProjectId;
-        
+
         /// <summary>
         /// hidNDTR_ID 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidNDTR_ID;
-        
+
         /// <summary>
         /// hidJOTY_Group 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidJOTY_Group;
-        
+
         /// <summary>
         /// hidJOT_WeldDate 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidJOT_WeldDate;
-        
+
         /// <summary>
         /// hidProjectName 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidProjectName;
-        
+
         /// <summary>
         /// hidISO_ID 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.ContinuousPrint {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hidISO_ID;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/22/2024 15:19:04" ReportInfo.Modified="06/16/2025 14:40:10" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/22/2024 15:19:04" ReportInfo.Modified="05/13/2026 09:16:16" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFIivhvgFLiGeh14nMUOBc7Q==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFT94lOQCMExBld9V82++hQA==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="WED_Code" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="02/12/2026 14:38:54" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="05/13/2026 09:16:24" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFlh0iipmnrFgvcAIjLfOHvg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF9BIAyY5+UaR+KsNHv+fwLw==">
       <TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>
@@ -63,6 +63,7 @@ namespace FastReport
     <Parameter Name="InspectionCount" DataType="System.String"/>
     <Parameter Name="NDTRName" DataType="System.String"/>
     <Parameter Name="NDTType" DataType="System.String"/>
+    <Parameter Name="WeldingDate" DataType="System.String"/>
   </Dictionary>
   <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,970.7,236.25,94.5,56.7,47.25,718.2,66.15,37.8,75.6,85.05,838.4,914,132.3,330.75,434.7,633.15,781.7,189,500.85,557.55,63.5,970.33,481.4">
     <PageHeaderBand Name="PageHeader1" Width="971.46" Height="179.55" Guides="0,179.55,94.5,18.9,47.25,66.15,28.35,122.85,151.2">
@@ -269,8 +270,8 @@ namespace FastReport
           <TableCell Name="Cell205" Border.Lines="Left, Right, Top" Text="质量检查员：" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row15" Height="25.14">
-          <TableCell Name="Cell209" Border.Lines="Left, Right, Bottom" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell210" Border.Lines="Left, Right, Bottom" Text="日期：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell209" Border.Lines="Left, Right, Bottom" Text="日期：[WeldingDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell210" Border.Lines="Left, Right, Bottom" Text="日期：[WeldingDate]" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </PageFooterBand>

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj

@@ -46,6 +46,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -178,6 +179,173 @@
     <Content Include="AttachFile\res\webuploader\webuploader.nolog.min.js" />
     <Content Include="AttachFile\webuploader2.aspx" />
     <Content Include="AttachFile\webuploader.aspx" />
+    <Content Include="bin\AipSdk.dll" />
+    <Content Include="bin\AOP.Common.dll" />
+    <Content Include="bin\Aspose.Words.dll" />
+    <Content Include="bin\Aspose.Words.xml" />
+    <Content Include="bin\BLL.pdb" />
+    <Content Include="bin\BouncyCastle.Crypto.dll" />
+    <Content Include="bin\BouncyCastle.Crypto.xml" />
+    <Content Include="bin\FastReport.Bars.dll" />
+    <Content Include="bin\FastReport.Compat.dll" />
+    <Content Include="bin\FastReport.dll" />
+    <Content Include="bin\FastReport.Editor.dll" />
+    <Content Include="bin\FastReport.Web.dll" />
+    <Content Include="bin\FineUIPro.dll" />
+    <Content Include="bin\FineUIPro.Web.dll" />
+    <Content Include="bin\FineUIPro.Web.pdb" />
+    <Content Include="bin\FineUIPro.xml" />
+    <Content Include="bin\ICSharpCode.SharpZipLib.dll" />
+    <Content Include="bin\ICSharpCode.SharpZipLib.pdb" />
+    <Content Include="bin\ICSharpCode.SharpZipLib.xml" />
+    <Content Include="bin\Microsoft.Bcl.HashCode.dll" />
+    <Content Include="bin\Microsoft.Bcl.HashCode.xml" />
+    <Content Include="bin\Microsoft.mshtml.dll" />
+    <Content Include="bin\Microsoft.Win32.Primitives.dll" />
+    <Content Include="bin\Model.dll" />
+    <Content Include="bin\Model.pdb" />
+    <Content Include="bin\netstandard.dll" />
+    <Content Include="bin\Newtonsoft.Json.dll" />
+    <Content Include="bin\Newtonsoft.Json.pdb" />
+    <Content Include="bin\Newtonsoft.Json.xml" />
+    <Content Include="bin\NPOI.dll" />
+    <Content Include="bin\NPOI.OOXML.dll" />
+    <Content Include="bin\NPOI.OOXML.pdb" />
+    <Content Include="bin\NPOI.OOXML.xml" />
+    <Content Include="bin\NPOI.OpenXml4Net.dll" />
+    <Content Include="bin\NPOI.OpenXml4Net.pdb" />
+    <Content Include="bin\NPOI.OpenXmlFormats.dll" />
+    <Content Include="bin\NPOI.OpenXmlFormats.pdb" />
+    <Content Include="bin\NPOI.pdb" />
+    <Content Include="bin\NPOI.xml" />
+    <Content Include="bin\SgManager.AI.dll" />
+    <Content Include="bin\SgManager.AI.pdb" />
+    <Content Include="bin\Spire.Pdf.dll" />
+    <Content Include="bin\Spire.Pdf.xml" />
+    <Content Include="bin\System.AppContext.dll" />
+    <Content Include="bin\System.Buffers.dll" />
+    <Content Include="bin\System.Buffers.xml" />
+    <Content Include="bin\System.Collections.Concurrent.dll" />
+    <Content Include="bin\System.Collections.dll" />
+    <Content Include="bin\System.Collections.NonGeneric.dll" />
+    <Content Include="bin\System.Collections.Specialized.dll" />
+    <Content Include="bin\System.ComponentModel.dll" />
+    <Content Include="bin\System.ComponentModel.EventBasedAsync.dll" />
+    <Content Include="bin\System.ComponentModel.Primitives.dll" />
+    <Content Include="bin\System.ComponentModel.TypeConverter.dll" />
+    <Content Include="bin\System.Console.dll" />
+    <Content Include="bin\System.Data.Common.dll" />
+    <Content Include="bin\System.Diagnostics.Contracts.dll" />
+    <Content Include="bin\System.Diagnostics.Debug.dll" />
+    <Content Include="bin\System.Diagnostics.FileVersionInfo.dll" />
+    <Content Include="bin\System.Diagnostics.Process.dll" />
+    <Content Include="bin\System.Diagnostics.StackTrace.dll" />
+    <Content Include="bin\System.Diagnostics.TextWriterTraceListener.dll" />
+    <Content Include="bin\System.Diagnostics.Tools.dll" />
+    <Content Include="bin\System.Diagnostics.TraceSource.dll" />
+    <Content Include="bin\System.Diagnostics.Tracing.dll" />
+    <Content Include="bin\System.Drawing.Primitives.dll" />
+    <Content Include="bin\System.Dynamic.Runtime.dll" />
+    <Content Include="bin\System.Globalization.Calendars.dll" />
+    <Content Include="bin\System.Globalization.dll" />
+    <Content Include="bin\System.Globalization.Extensions.dll" />
+    <Content Include="bin\System.IO.Compression.dll" />
+    <Content Include="bin\System.IO.Compression.ZipFile.dll" />
+    <Content Include="bin\System.IO.dll" />
+    <Content Include="bin\System.IO.FileSystem.dll" />
+    <Content Include="bin\System.IO.FileSystem.DriveInfo.dll" />
+    <Content Include="bin\System.IO.FileSystem.Primitives.dll" />
+    <Content Include="bin\System.IO.FileSystem.Watcher.dll" />
+    <Content Include="bin\System.IO.IsolatedStorage.dll" />
+    <Content Include="bin\System.IO.MemoryMappedFiles.dll" />
+    <Content Include="bin\System.IO.Pipes.dll" />
+    <Content Include="bin\System.IO.UnmanagedMemoryStream.dll" />
+    <Content Include="bin\System.Linq.dll" />
+    <Content Include="bin\System.Linq.Expressions.dll" />
+    <Content Include="bin\System.Linq.Parallel.dll" />
+    <Content Include="bin\System.Linq.Queryable.dll" />
+    <Content Include="bin\System.Memory.dll" />
+    <Content Include="bin\System.Memory.xml" />
+    <Content Include="bin\System.Net.Http.dll" />
+    <Content Include="bin\System.Net.NameResolution.dll" />
+    <Content Include="bin\System.Net.NetworkInformation.dll" />
+    <Content Include="bin\System.Net.Ping.dll" />
+    <Content Include="bin\System.Net.Primitives.dll" />
+    <Content Include="bin\System.Net.Requests.dll" />
+    <Content Include="bin\System.Net.Security.dll" />
+    <Content Include="bin\System.Net.Sockets.dll" />
+    <Content Include="bin\System.Net.WebHeaderCollection.dll" />
+    <Content Include="bin\System.Net.WebSockets.Client.dll" />
+    <Content Include="bin\System.Net.WebSockets.dll" />
+    <Content Include="bin\System.Numerics.Vectors.dll" />
+    <Content Include="bin\System.Numerics.Vectors.xml" />
+    <Content Include="bin\System.ObjectModel.dll" />
+    <Content Include="bin\System.Reflection.dll" />
+    <Content Include="bin\System.Reflection.Extensions.dll" />
+    <Content Include="bin\System.Reflection.Primitives.dll" />
+    <Content Include="bin\System.Resources.Reader.dll" />
+    <Content Include="bin\System.Resources.ResourceManager.dll" />
+    <Content Include="bin\System.Resources.Writer.dll" />
+    <Content Include="bin\System.Runtime.CompilerServices.Unsafe.dll" />
+    <Content Include="bin\System.Runtime.CompilerServices.Unsafe.xml" />
+    <Content Include="bin\System.Runtime.CompilerServices.VisualC.dll" />
+    <Content Include="bin\System.Runtime.dll" />
+    <Content Include="bin\System.Runtime.Extensions.dll" />
+    <Content Include="bin\System.Runtime.Handles.dll" />
+    <Content Include="bin\System.Runtime.InteropServices.dll" />
+    <Content Include="bin\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <Content Include="bin\System.Runtime.Numerics.dll" />
+    <Content Include="bin\System.Runtime.Serialization.Formatters.dll" />
+    <Content Include="bin\System.Runtime.Serialization.Json.dll" />
+    <Content Include="bin\System.Runtime.Serialization.Primitives.dll" />
+    <Content Include="bin\System.Runtime.Serialization.Xml.dll" />
+    <Content Include="bin\System.Security.Claims.dll" />
+    <Content Include="bin\System.Security.Cryptography.Algorithms.dll" />
+    <Content Include="bin\System.Security.Cryptography.Csp.dll" />
+    <Content Include="bin\System.Security.Cryptography.Encoding.dll" />
+    <Content Include="bin\System.Security.Cryptography.Primitives.dll" />
+    <Content Include="bin\System.Security.Cryptography.X509Certificates.dll" />
+    <Content Include="bin\System.Security.Principal.dll" />
+    <Content Include="bin\System.Security.SecureString.dll" />
+    <Content Include="bin\System.Text.Encoding.dll" />
+    <Content Include="bin\System.Text.Encoding.Extensions.dll" />
+    <Content Include="bin\System.Text.RegularExpressions.dll" />
+    <Content Include="bin\System.Threading.dll" />
+    <Content Include="bin\System.Threading.Overlapped.dll" />
+    <Content Include="bin\System.Threading.Tasks.dll" />
+    <Content Include="bin\System.Threading.Tasks.Parallel.dll" />
+    <Content Include="bin\System.Threading.Thread.dll" />
+    <Content Include="bin\System.Threading.ThreadPool.dll" />
+    <Content Include="bin\System.Threading.Timer.dll" />
+    <Content Include="bin\System.ValueTuple.dll" />
+    <Content Include="bin\System.Xml.ReaderWriter.dll" />
+    <Content Include="bin\System.Xml.XDocument.dll" />
+    <Content Include="bin\System.Xml.XmlDocument.dll" />
+    <Content Include="bin\System.Xml.XmlSerializer.dll" />
+    <Content Include="bin\System.Xml.XPath.dll" />
+    <Content Include="bin\System.Xml.XPath.XDocument.dll" />
+    <Content Include="bin\ThoughtWorks.QRCode.dll" />
+    <Content Include="bin\UglyToad.PdfPig.Core.dll" />
+    <Content Include="bin\UglyToad.PdfPig.Core.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.Core.xml" />
+    <Content Include="bin\UglyToad.PdfPig.dll" />
+    <Content Include="bin\UglyToad.PdfPig.DocumentLayoutAnalysis.dll" />
+    <Content Include="bin\UglyToad.PdfPig.DocumentLayoutAnalysis.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.DocumentLayoutAnalysis.xml" />
+    <Content Include="bin\UglyToad.PdfPig.Fonts.dll" />
+    <Content Include="bin\UglyToad.PdfPig.Fonts.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.Fonts.xml" />
+    <Content Include="bin\UglyToad.PdfPig.Package.dll" />
+    <Content Include="bin\UglyToad.PdfPig.Package.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.Package.xml" />
+    <Content Include="bin\UglyToad.PdfPig.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.Tokenization.dll" />
+    <Content Include="bin\UglyToad.PdfPig.Tokenization.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.Tokenization.xml" />
+    <Content Include="bin\UglyToad.PdfPig.Tokens.dll" />
+    <Content Include="bin\UglyToad.PdfPig.Tokens.pdb" />
+    <Content Include="bin\UglyToad.PdfPig.Tokens.xml" />
+    <Content Include="bin\UglyToad.PdfPig.xml" />
     <Content Include="common\BaseInfo\AudiFlowEdit.aspx" />
     <Content Include="common\BaseInfo\AudiFlowSet.aspx" />
     <Content Include="common\BaseInfo\DepartEdit.aspx" />
@@ -1139,6 +1307,8 @@
     <Content Include="HJGL\FileControl\ForeignStandardsView.aspx" />
     <Content Include="HJGL\FileControl\ForeignStandardsViewEdit.aspx" />
     <Content Include="HJGL\HotHardManage\HardReportSet.aspx" />
+    <Content Include="HJGL\HotHardManage\HardReportSetDataIn.aspx" />
+    <Content Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx" />
     <Content Include="HJGL\HotHardManage\HardTestReport.aspx" />
     <Content Include="HJGL\HotHardManage\HardTestReportEdit.aspx" />
     <Content Include="HJGL\HotHardManage\HardTestResult.aspx" />
@@ -1258,6 +1428,7 @@
     <Content Include="HJGL\WeldingManage\WeldReportOut.aspx" />
     <Content Include="HJGL\WeldingReport\FeedbackResultSelect.aspx" />
     <Content Include="HJGL\WeldingReport\FeedbackResultShowColumn.aspx" />
+    <Content Include="HJGL\WeldingReport\GoldMouthLedger.aspx" />
     <Content Include="HJGL\WeldingReport\HardTestReportRecord.aspx" />
     <Content Include="HJGL\WeldingReport\HardTestReportRecordStatistics.aspx" />
     <Content Include="HJGL\WeldingReport\HeatTreatmentEstimateRecord.aspx" />
@@ -1281,6 +1452,7 @@
     <Content Include="HJGL\WeldingReport\WelderPerformancePAUT.aspx" />
     <Content Include="HJGL\WeldingReport\WeldInspectionCheckRecord.aspx" />
     <Content Include="HJGL\WeldingReport\WeldInspectionCheckRecordItem.aspx" />
+    <Content Include="HJGL\WeldingReport\WeldRepairLists.aspx" />
     <Content Include="Images\dlu.gif" />
     <Content Include="Images\dlu1.gif" />
     <Content Include="Images\focus.swf" />
@@ -1383,6 +1555,7 @@
     <Content Include="OfficeControl\OfficeControl.ocx" />
     <Content Include="OfficeControl\signtoolcontrol.js" />
     <Content Include="OfficeControl\手工卸载安装NTKO OFFICE文档控件.txt" />
+    <Content Include="res\DataInTable.js" />
     <Content Include="SYBData\ApplicationForm.aspx" />
     <Content Include="SYBData\BlindFlangeInstallationAndRemoval.aspx" />
     <Content Include="SYBData\Cover.aspx" />
@@ -1553,6 +1726,10 @@
     <Content Include="YLRQ\WeldingReport\FeedbackResultShowColumn.aspx" />
     <Content Include="YLRQ\WeldingReport\StatisticsSampleTable.aspx" />
     <Content Include="YLRQ\WeldingReport\WelderPerformance.aspx" />
+    <Content Include="bin\BLL.dll.config" />
+    <Content Include="bin\FineUIPro.lic.dev.config" />
+    <None Include="bin\FineUIPro.Web.dll.config" />
+    <Content Include="bin\SgManager.AI.dll.config" />
     <None Include="ceuser\ceuser.dat" />
     <None Include="common\ReportPrint\ReportTabFile\射线检测结果确认表.tab" />
     <None Include="common\ReportPrint\ReportTabFile\焊接系统_合格焊工登记表.tab" />
@@ -5768,6 +5945,20 @@
     <Compile Include="HJGL\HotHardManage\HardReportSet.aspx.designer.cs">
       <DependentUpon>HardReportSet.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\HotHardManage\HardReportSetDataIn.aspx.cs">
+      <DependentUpon>HardReportSetDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\HotHardManage\HardReportSetDataIn.aspx.designer.cs">
+      <DependentUpon>HardReportSetDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx.cs">
+      <DependentUpon>HardReportSetDataInEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\HotHardManage\HardReportSetDataInEdit.aspx.designer.cs">
+      <DependentUpon>HardReportSetDataInEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\HotHardManage\HardTestReport.aspx.cs">
       <DependentUpon>HardTestReport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -6601,6 +6792,13 @@
     <Compile Include="HJGL\WeldingReport\FeedbackResultShowColumn.aspx.designer.cs">
       <DependentUpon>FeedbackResultShowColumn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\WeldingReport\GoldMouthLedger.aspx.cs">
+      <DependentUpon>GoldMouthLedger.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\WeldingReport\GoldMouthLedger.aspx.designer.cs">
+      <DependentUpon>GoldMouthLedger.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\WeldingReport\HardTestReportRecord.aspx.cs">
       <DependentUpon>HardTestReportRecord.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -6762,6 +6960,13 @@
     <Compile Include="HJGL\WeldingReport\WeldInspectionCheckRecordItem.aspx.designer.cs">
       <DependentUpon>WeldInspectionCheckRecordItem.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\WeldingReport\WeldRepairLists.aspx.cs">
+      <DependentUpon>WeldRepairLists.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\WeldingReport\WeldRepairLists.aspx.designer.cs">
+      <DependentUpon>WeldRepairLists.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JGZL\AcceptanceCertificate.aspx.cs">
       <DependentUpon>AcceptanceCertificate.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs

@@ -177,7 +177,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                                 if (!isoInfo.ISO_Dia.HasValue || !isoInfo.ISO_Sch.HasValue || string.IsNullOrEmpty(isoInfo.MaterialStandardId))
                                 {
                                     string res = OpenAIhelper.ChatCompletion("请根据 " + description + ",识别外径，壁厚，材质标准(请严格按照国家标准返回)，结果仅以JSON格式返回，不要解释，不要多余文字，不要markdown，例如 {\r\n  \"外径\": \"33.4 mm\",\r\n  \"壁厚\": \"6.35 mm\",\r\n  \"材质标准\": \"GB/T 9948\"\r\n}");
-
+                                    ErrLogInfo.WriteLog(res);
                                     JObject jobject = JObject.Parse(res);
                                     string dia = jobject.Value<string>("外径");
                                     string sch = jobject.Value<string>("壁厚");

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx

@@ -60,6 +60,9 @@
                             <f:Button ID="btnSave" Text="提交" ToolTip="提交硬度值" Icon="SystemSave" ValidateForms="SimpleForm1" runat="server"
                                 OnClick="btnSave_Click">
                             </f:Button>
+                            <f:Button ID="btnImport" Text="导入" ToolTip="导入硬度值" Icon="PageExcel"  runat="server"
+                                OnClick="btnImport_Click">
+                            </f:Button>
                             <f:Button ID="btnGenerating" runat="server" Text="生成硬度检测报告" Icon="FolderTable"
                                 OnClick="btnGenerating_Click">
                             </f:Button>
@@ -186,6 +189,10 @@
             </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="1200px" Height="660px">
+ </f:Window>
     </form>
     <script type="text/javascript">
         var grid1ClientID = '<%= Grid1.ClientID %>';

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx.cs

@@ -1,12 +1,13 @@
-using System;
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
-using BLL;
 using System.Windows.Forms;
-using Newtonsoft.Json.Linq;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HJGL.HotHardManage
@@ -412,5 +413,17 @@ where Item.ProjectId=@ProjectId and HardTestReportId is null ";
             BindGrid();
         }
         #endregion
+
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            string window = String.Format("HardReportSetDataIn.aspx?projectId={0}", drpProjectId.SelectedValue, "导入 - ");
+            PageContext.RegisterStartupScript(Window1.GetSaveStateReference()
+              + Window1.GetShowReference(window));
+        }
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
     }
 }

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.HotHardManage {
-    
-    
-    public partial class HardReportSet {
-        
+namespace FineUIPro.Web.HJGL.HotHardManage
+{
+
+
+    public partial class HardReportSet
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelLeftRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelLeftRegion;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpProjectId 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectId;
-        
+
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree tvControlItem;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -110,7 +112,16 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// btnGenerating 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnGenerating;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// drpIsoNo 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsoNo;
-        
+
         /// <summary>
         /// ToolbarFill2 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
-        
+
         /// <summary>
         /// nbHardNessValue1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox nbHardNessValue1;
-        
+
         /// <summary>
         /// nbHardNessValue2 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox nbHardNessValue2;
-        
+
         /// <summary>
         /// nbHardNessValue3 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox nbHardNessValue3;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRemark;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -218,5 +229,14 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
     }
 }

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx

@@ -0,0 +1,163 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HardReportSetDataIn.aspx.cs" Inherits="FineUIPro.Web.HJGL.HotHardManage.HardReportSetDataIn" %>
+
+<!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>  
+    <style type="text/css">
+        .f-grid-row.red {
+            background-color: LightCoral;
+        }
+
+        .Label {
+            font-size: larger;
+            font-weight: bold;
+        }
+    </style>
+
+
+    <style type="text/css">
+        /*定义父容器*/
+        .content {
+            width: 550px;
+            height: 30px;
+            background: #E4F1FB;
+            margin: 0 auto;
+        }
+        /*定义进度条*/
+        .box {
+            width: 0px;
+            height: 30px;
+            line-height: 30px;
+            text-align: center;
+            background: #3BAAE3;
+            color: #fff;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:HiddenField ID="id" ClientIDMode="Static" runat="server"></f:HiddenField>
+        <f:Panel ID="Panel1" runat="server" Margin="2px" BodyPadding="2px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
+                    <Items>
+                        <f:HiddenField ID="hdfileName" runat="server"></f:HiddenField>
+                        <f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="350px" LabelWidth="90px" LabelAlign="Right"></f:FileUpload>
+                        <f:Button ID="imgbtnImport" runat="server" Text="上传" ToolTip="文件上传" OnClick="imgbtnImport_Click"></f:Button>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                        <%--<f:CheckBox ID="ckUpdate" runat="server" Text="更新导入"></f:CheckBox>--%>
+                        <f:Button ID="btnSave" runat="server" Text="保存" ToolTip="审核保存" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
+                        <f:Button ID="btnRefresh" runat="server" ClientIDMode="Static" Text="刷新" Icon="SystemSave" OnClick="btnRefresh_Click" Hidden="true"></f:Button>
+
+                        <f:Button ID="btnAllDelete" runat="server" Icon="Delete" Text="删除记录" ToolTip="删除当前人所有临时导入记录" ConfirmText="删除当前人所有临时导入记录？"
+                            ConfirmTarget="Top" OnClick="btnAllDelete_Click">
+                        </f:Button>
+                        <f:Button ID="imgbtnUpload" runat="server" Icon="DiskDownload" Text="模板下载" OnClick="imgbtnUpload_Click" EnableAjaxLoading="false"></f:Button>
+                        <%--<f:Button ID="lkAchievements" runat="server" Icon="DiskDownload" Text="导入说明" OnClick="lkAchievements_Click" EnableAjaxLoading="false"></f:Button>--%>
+                    </Items>
+                    <Items>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据导入" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TempId" AllowCellEditing="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true" ClicksToEdit="2" DataIDField="TempId" AllowSorting="true"
+                    SortField="RowNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField Width="70px" HeaderText="行号" ColumnID="RowNo" DataField="RowNo" SortField="RowNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="250px" HeaderText="管线号" ColumnID="Value1" DataField="Value1" SortField="Value1"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:WindowField ColumnID="Value2" HeaderTextAlign="Center" TextAlign="Left" Width="120px" WindowID="Window1" HeaderText="焊口号"
+                            DataTextField="Value2" DataIFrameUrlFields="TempId" DataIFrameUrlFormatString="HardReportSetDataInEdit.aspx?TempId={0}"
+                            Title="数据导入" DataToolTipField="ToopValue" SortField="Value2">
+                        </f:WindowField>
+                        <f:RenderField Width="130px" HeaderText="试验部位" ColumnID="Value3" DataField="Value3" SortField="Value3"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" HeaderText="硬度值1" ColumnID="Value4" DataField="Value4" SortField="Value4"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" HeaderText="硬度值2" ColumnID="Value5" DataField="Value5" SortField="Value5"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" HeaderText="硬度值3" ColumnID="Value6" DataField="Value6" SortField="Value6"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" HeaderText="备注" ColumnID="Value7" DataField="Value7" SortField="Value7"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </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" Selected="true" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                        </f:DropDownList>
+                        <f:Label Label="错误记录数" runat="server" ID="lbDataCout" CssClass="Label" LabelAlign="right" LabelWidth="120px"></f:Label>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="数据信息" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Top" EnableResize="true" runat="server"
+            IsModal="true" Width="1200px" Height="600px">
+        </f:Window>
+        <f:Window ID="Window2" Hidden="true" runat="server" MinHeight="30px"
+            Target="Parent" ShowHeader="false" BodyPadding="0" Margin="0"
+            IsModal="true" Width="550px" Height="32px">
+            <Items>
+                <f:ContentPanel ShowBorder="false" Height="30px" ShowHeader="false" ID="ContentPanel3" runat="server">
+                    <div class="content" id="content">
+                        <div class="box" id="box"></div>
+                    </div>
+                </f:ContentPanel>
+            </Items>
+        </f:Window>
+        <f:Menu ID="Menu1" ClientIDMode="Static" 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>
+        <asp:ScriptManager ID="ScriptManager2" runat="server" EnablePageMethods="true">
+            <Scripts>
+                <asp:ScriptReference Path="../../res/DataInTable.js" />
+            </Scripts>
+        </asp:ScriptManager>
+    </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>

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.cs

@@ -0,0 +1,536 @@
+using BLL;
+using BLL.Common;
+using Microsoft.JScript.Vsa;
+using Model;
+using Org.BouncyCastle.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+namespace FineUIPro.Web.HJGL.HotHardManage
+{
+    public partial class HardReportSetDataIn : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static string errorInfos = string.Empty;
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                if (percent == null)
+                {
+                    percent = new Dictionary<string, int>();
+                }
+                this.ProjectId = Request.Params["projectId"];
+                this.id.Text = this.CurrUser.UserId;
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                this.BindGrid();
+            }
+            else if (GetRequestEventArgument() == "reloadGrid")
+            {
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10"
+                + @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20"
+                + @",ToopValue,Type"
+                + @" FROM Sys_DataInTemp  "
+                + @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId));
+            listStr.Add(new SqlParameter("@Type", "HardValue"));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+            var dataInTempAll = from x in Funs.DB.Sys_DataInTemp
+                                where x.ProjectId == this.ProjectId && x.UserId == this.CurrUser.UserId && x.Type == "HardValue"
+                                select x;
+            for (int i = 0; i < Grid1.Rows.Count; i++)
+            {
+                var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString());
+                if (dataInTemp != null)
+                {
+                    if (!string.IsNullOrEmpty(dataInTemp.ToopValue))
+                    {
+                        Grid1.Rows[i].RowCssClass = "red";
+                    }
+                }
+            }
+            var errData = from x in dataInTempAll where x.ToopValue != null select x;
+            this.lbDataCout.Text = errData.Count().ToString();
+        }
+        #endregion
+
+        #region 双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HardReportSetDataInEdit.aspx?TempId={0}&&projectId={1}", Grid1.SelectedRowID, this.ProjectId, "维护 - ")));
+        }
+        #endregion
+
+        #region 导入信息 维护
+        /// <summary>
+        /// 导入信息编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HardReportSetDataInEdit.aspx?TempId={0}&&projectId={1}", Grid1.SelectedRowID, this.ProjectId, "维护 - ")));
+        }
+
+        /// <summary>
+        /// 删除按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                BLL.Sys_DataInTempService.DeleteDataInTempByDataInTempID(rowID);
+            }
+
+            ShowNotify("删除成功！", MessageBoxIcon.Success);
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 分页 排序
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <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();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 文件上传
+        /// <summary>
+        /// 文件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void imgbtnImport_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.FileExcel.HasFile == false)
+                {
+                    ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls" && IsXls != ".xlsx")
+                {
+                    ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
+                    return;
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + Const.ExcelUrl;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+                //指定上传文件名称
+                this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                //上传文件路径
+                string filePath = initFullPath + this.hdfileName.Text;
+                //文件上传服务器
+                this.FileExcel.PostedFile.SaveAs(filePath);
+                //文件上传服务器后的名称
+                string fileName = rootPath + Const.ExcelUrl + this.hdfileName.Text;
+                //读取Excel
+                DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
+                //验证Excel读取是否有误
+                if (!string.IsNullOrEmpty(errorInfos))
+                {
+                    ShowNotify(errorInfos, MessageBoxIcon.Warning);
+                    return;
+                }
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+                    {
+                        Sys_DataInTemp newDataInTemp = new Sys_DataInTemp();
+                        newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_DataInTemp));
+                        newDataInTemp.ProjectId = ProjectId;
+                        newDataInTemp.UserId = this.CurrUser.UserId;
+                        newDataInTemp.Time = DateTime.Now;
+                        newDataInTemp.Type = "HardValue";
+                        newDataInTemp.RowNo = i + 1;
+                        newDataInTemp.Value1 = ds.Tables[0].Rows[i][0].ToString();
+                        newDataInTemp.Value2 = ds.Tables[0].Rows[i][1].ToString();
+                        newDataInTemp.Value3 = ds.Tables[0].Rows[i][2].ToString();
+                        newDataInTemp.Value4 = ds.Tables[0].Rows[i][3].ToString();
+                        newDataInTemp.Value5 = ds.Tables[0].Rows[i][4].ToString();
+                        newDataInTemp.Value6 = ds.Tables[0].Rows[i][5].ToString();
+                        newDataInTemp.Value7 = ds.Tables[0].Rows[i][6].ToString();
+                        //newDataInTemp.Value8 = ds.Tables[0].Rows[i][7].ToString();
+                        //newDataInTemp.Value9 = ds.Tables[0].Rows[i][8].ToString();
+                        //newDataInTemp.Value10 = ds.Tables[0].Rows[i][9].ToString();
+                        //newDataInTemp.Value11 = ds.Tables[0].Rows[i][10].ToString();
+                        //newDataInTemp.Value12 = ds.Tables[0].Rows[i][11].ToString();
+                        //newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString();
+                        //newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString();
+                        //newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString();
+                        //newDataInTemp.Value16 = ds.Tables[0].Rows[i][15].ToString();
+                        //newDataInTemp.Value17 = ds.Tables[0].Rows[i][16].ToString();
+                        //newDataInTemp.Value18 = ds.Tables[0].Rows[i][17].ToString();
+                        //newDataInTemp.Value19 = ds.Tables[0].Rows[i][18].ToString();
+                        //newDataInTemp.Value20 = ds.Tables[0].Rows[i][19].ToString();
+
+                        BLL.Sys_DataInTempService.AddDataInTemp(newDataInTemp);
+                    }
+                    this.BindGrid();
+                    ShowNotify("数据已导入临时表！", MessageBoxIcon.Success);
+                    File.Delete(fileName);//删除上传的临时文件
+                }
+                else
+                {
+                    Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Success);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 保存审核事件
+        /// <summary>
+        /// 保存审核事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(ProjectId, this.CurrUser.UserId, "HardValue"); }));
+            t.Start();
+            if (percent.ContainsKey(this.CurrUser.UserId))
+            {
+                percent[CurrUser.UserId] = 0;
+            }
+            else
+            {
+                percent.Add(CurrUser.UserId, 0);
+
+            }
+            PageContext.RegisterStartupScript("printX()");
+        }
+        protected void btnRefresh_Click(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
+        protected void btnSaveMethod(string LoginProjectId, string UserId, string type)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var isoInfos = from x in db.HJGL_PW_IsoInfo where x.ProjectId == LoginProjectId select x;
+            var jointInfos = from x in db.HJGL_PW_JointInfo where x.ProjectId == LoginProjectId select x;
+            var hardTestReportItemSetView = from x in db.HJGL_View_CH_HardTestReportItemSet where x.ProjectId == LoginProjectId && x.HardTestReportId == null select x;
+
+            var dataInTemp = from x in Funs.DB.Sys_DataInTemp
+                             where x.ProjectId == ProjectId && x.UserId == UserId && x.Type == type
+                             select x;
+            int okCount = 0;
+            int i = 0;
+            int ir = dataInTemp.Count();
+            string erreMessage = "";
+            string isoId = string.Empty;
+            string jotId = string.Empty;
+            foreach (var tempData in dataInTemp)
+            {
+                if (tempData != null)
+                {
+                    i++;
+                    percent[UserId] = (int)(100 * i / ir);
+                    string errInfo = string.Empty;
+                    var isExitValue = hardTestReportItemSetView.FirstOrDefault(x => x.ISO_IsoNo == tempData.Value1.Trim() && x.JOT_JointNo == tempData.Value2.Trim() && x.TestPart == tempData.Value3.Trim());
+                    if (isExitValue != null)
+                    {
+                        if (!string.IsNullOrEmpty(tempData.Value1.Trim()))
+                        {
+                            var getIso = isoInfos.FirstOrDefault(x => x.ISO_IsoNo == tempData.Value1.Trim());
+                            if (getIso == null)
+                            {
+                                errInfo += "管线号[" + tempData.Value1.Trim() + "]不存在；";
+                            }
+                            else
+                            {
+                                isoId = getIso.ISO_ID;
+                            }
+                        }
+                        else
+                        {
+                            errInfo += "管线号为必填项；";
+                        }
+                        if (!string.IsNullOrEmpty(tempData.Value2.Trim()))
+                        {
+                            var getJoint = jointInfos.FirstOrDefault(x => x.ISO_ID == isoId && x.JOT_JointNo == tempData.Value2.Trim());
+                            if (getJoint == null)
+                            {
+                                errInfo += "焊口号[" + tempData.Value2.Trim() + "]不存在；";
+                            }
+                            else
+                            {
+                                jotId = getJoint.JOT_ID;
+                            }
+                        }
+                        else
+                        {
+                            errInfo += "焊口号为必填项；";
+                        }
+                        if (!string.IsNullOrEmpty(tempData.Value3.Trim()))
+                        {
+                            if (tempData.Value3.Trim() != "焊缝" && tempData.Value3.Trim() != "热影响区")
+                            {
+                                errInfo += "试验部位[" + tempData.Value3.Trim() + "]错误；";
+                            }
+                        }
+                        else
+                        {
+                            errInfo += "试验部位为必填项；";
+                        }
+                        if (!string.IsNullOrEmpty(tempData.Value4.Trim()))
+                        {
+                            try
+                            {
+                                int hardNessValue1 = Convert.ToInt32(tempData.Value4.Trim());
+                                if (hardNessValue1 > 999)
+                                {
+                                    errInfo += "硬度值1[" + tempData.Value4.Trim() + "]不能超过3位数；";
+                                }
+                            }
+                            catch (Exception)
+                            {
+
+                                errInfo += "硬度值1[" + tempData.Value4.Trim() + "]格式错误；";
+                            }
+                        }
+                        else
+                        {
+                            errInfo += "硬度值1为必填项；";
+                        }
+                        if (!string.IsNullOrEmpty(tempData.Value5.Trim()))
+                        {
+                            try
+                            {
+                                int hardNessValue2 = Convert.ToInt32(tempData.Value5.Trim());
+                                if (hardNessValue2 > 999)
+                                {
+                                    errInfo += "硬度值1[" + tempData.Value5.Trim() + "]不能超过3位数；";
+                                }
+                            }
+                            catch (Exception)
+                            {
+
+                                errInfo += "硬度值2[" + tempData.Value5.Trim() + "]格式错误；";
+                            }
+                        }
+                        else
+                        {
+                            errInfo += "硬度值2为必填项；";
+                        }
+                        if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
+                        {
+                            try
+                            {
+                                int hardNessValue3 = Convert.ToInt32(tempData.Value6.Trim());
+                                if (hardNessValue3 > 999)
+                                {
+                                    errInfo += "硬度值3[" + tempData.Value6.Trim() + "]不能超过3位数；";
+                                }
+                            }
+                            catch (Exception)
+                            {
+
+                                errInfo += "硬度值3[" + tempData.Value6.Trim() + "]格式错误；";
+                            }
+                        }
+                        else
+                        {
+                            errInfo += "硬度值3为必填项；";
+                        }
+                    }
+                    else
+                    {
+                        errInfo += "该记录不存在，请核对；";
+                    }
+                    if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 插入数据
+                    {
+                        var item1 = (from x in db.HJGL_CH_HardTestReportItem where x.HardTestReportItemId == isExitValue.HardTestReportItemId select x).FirstOrDefault();
+                        if (item1 != null)
+                        {
+                            item1.HardNessValue = Funs.GetNewInt(tempData.Value4.Trim());
+                            item1.Remark = tempData.Value7.Trim();
+                        }
+                        var item2 = (from x in db.HJGL_CH_HardTestReportItem where x.HardTestReportItemId == isExitValue.HardTestReportItemId2 select x).FirstOrDefault();
+                        if (item2 != null)
+                        {
+                            item2.HardNessValue = Funs.GetNewInt(tempData.Value5.Trim());
+                            item2.Remark = tempData.Value7.Trim();
+                        }
+                        var item3 = (from x in db.HJGL_CH_HardTestReportItem where x.HardTestReportItemId == isExitValue.HardTestReportItemId3 select x).FirstOrDefault();
+                        if (item3 != null)
+                        {
+                            item3.HardNessValue = Funs.GetNewInt(tempData.Value6.Trim());
+                            item3.Remark = tempData.Value7.Trim();
+                        }
+                        db.SubmitChanges();
+                        BLL.Sys_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
+                        okCount++;
+                    }
+                    if (!string.IsNullOrEmpty(errInfo))
+                    {
+                        tempData.ToopValue = errInfo;
+                        BLL.Sys_DataInTempService.UpdateDataInTemp(tempData);
+                        erreMessage += errInfo + ";";
+                    }
+                }
+            }            
+        }
+        #endregion
+
+        #region 删除所有数据事件
+        /// <summary>
+        /// 删除所有数据事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAllDelete_Click(object sender, EventArgs e)
+        {
+            //先删除临时表中 该人员以前导入的数据
+            BLL.Sys_DataInTempService.DeleteDataInTempByProjectIdUserId(ProjectId, this.CurrUser.UserId, "HardValue");
+            this.BindGrid();
+            ShowNotify("删除成功！", MessageBoxIcon.Success);
+            this.lbDataCout.Text = string.Empty;
+        }
+        #endregion
+
+        #region 下载模版
+        /// <summary>
+        /// 下载模版
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void imgbtnUpload_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string uploadfilepath = rootPath + Const.HardReportSetTemplateUrl;
+            string filePath = Const.HardReportSetTemplateUrl;
+            string fileName = Path.GetFileName(filePath);
+            FileInfo info = new FileInfo(uploadfilepath);
+            long fileSize = info.Length;
+            Response.ClearContent();
+            Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            Response.ContentType = "excel/plain";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+            Response.TransmitFile(uploadfilepath, 0, fileSize);
+            Response.End();
+        }
+        #endregion
+
+        public static Dictionary<string, int> percent { get; set; }
+        public static Dictionary<string, string> url { get; set; }
+
+        [System.Web.Services.WebMethod]
+        public static int getPercent(string id)
+        {
+            return percent[id];
+        }
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.designer.cs

@@ -0,0 +1,242 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.HotHardManage
+{
+
+
+    public partial class HardReportSetDataIn
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// id 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField id;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdfileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdfileName;
+
+        /// <summary>
+        /// FileExcel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload FileExcel;
+
+        /// <summary>
+        /// imgbtnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button imgbtnImport;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnRefresh 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRefresh;
+
+        /// <summary>
+        /// btnAllDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAllDelete;
+
+        /// <summary>
+        /// imgbtnUpload 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button imgbtnUpload;
+
+        /// <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>
+        /// lbDataCout 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbDataCout;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// ContentPanel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel3;
+
+        /// <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;
+
+        /// <summary>
+        /// ScriptManager2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.ScriptManager ScriptManager2;
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx

@@ -0,0 +1,67 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HardReportSetDataInEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.HotHardManage.HardReportSetDataInEdit" %>
+
+<!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="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Top" 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="txtValue1" Label="管线号" ShowRedStar="true" Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue2" Label="焊口号" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue3" Label="试验部位" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtValue4" Label="硬度值1" Required="true" ShowRedStar="true" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue5" Label="硬度值2" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtValue6" Label="硬度值3" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtValue7" Label="备注" runat="server" LabelWidth="120px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改" ShowEmptyLabel="true" LabelWidth="120px"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea runat="server" Label="错误信息" ID="lbErrCout" Readonly="true" LabelWidth="120px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
+

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.cs

@@ -0,0 +1,207 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.HotHardManage
+{
+    public partial class HardReportSetDataInEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 临时表主键
+        /// </summary>
+        public string TempId
+        {
+            get
+            {
+                return (string)ViewState["TempId"];
+            }
+            set
+            {
+                ViewState["TempId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 项目id
+        /// </summary>
+       public 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.TempId = Request.Params["TempId"];
+                this.ProjectId = Request.Params["projectId"];
+                this.txtValue1.Focus();
+                var dataInTemp = BLL.Sys_DataInTempService.GetDataInTempByTempId(this.TempId);
+                if (dataInTemp != null)
+                {
+                    this.txtValue1.Text = dataInTemp.Value1;
+                    this.txtValue2.Text = dataInTemp.Value2;
+                    this.txtValue3.Text = dataInTemp.Value3;
+                    this.txtValue4.Text = dataInTemp.Value4;
+                    this.txtValue5.Text = dataInTemp.Value5;
+                    this.txtValue6.Text = dataInTemp.Value6;
+                    this.txtValue7.Text = dataInTemp.Value7;
+
+                    this.lbErrCout.Text = dataInTemp.ToopValue;
+                }
+            }
+        }
+        #endregion
+
+        #region 保存按钮
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var dataInTemp = BLL.Sys_DataInTempService.GetDataInTempByTempId(this.TempId);
+            if (this.ckAll.Checked)
+            {
+                var allDataInTemp = from x in Funs.DB.Sys_DataInTemp where x.ProjectId == this.ProjectId && x.UserId == this.CurrUser.UserId && x.Type == "HardValue" select x;
+                if (dataInTemp.Value1 != this.txtValue1.Text.Trim())
+                {
+                    var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null));
+                    if (tempValue1 != null)
+                    {
+                        foreach (var item in tempValue1)
+                        {
+                            item.Value1 = this.txtValue1.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value2 != this.txtValue2.Text.Trim())
+                {
+                    var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null));
+                    if (tempValue2 != null)
+                    {
+                        foreach (var item in tempValue2)
+                        {
+                            item.Value2 = this.txtValue2.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value3 != this.txtValue3.Text.Trim())
+                {
+                    var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null));
+                    if (tempValue3 != null)
+                    {
+                        foreach (var item in tempValue3)
+                        {
+                            item.Value3 = this.txtValue3.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value4 != this.txtValue4.Text.Trim())
+                {
+                    var tempValue4 = allDataInTemp.Where(x => x.Value4 == dataInTemp.Value4 || (x.Value4 == null && dataInTemp.Value4 == null));
+                    if (tempValue4 != null)
+                    {
+                        foreach (var item in tempValue4)
+                        {
+                            item.Value4 = this.txtValue4.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value5 != this.txtValue5.Text.Trim())
+                {
+                    var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null));
+                    if (tempValue5 != null)
+                    {
+                        foreach (var item in tempValue5)
+                        {
+                            item.Value5 = this.txtValue5.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value6 != this.txtValue6.Text.Trim())
+                {
+                    var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null));
+                    if (tempValue6 != null)
+                    {
+                        foreach (var item in tempValue6)
+                        {
+                            item.Value6 = this.txtValue6.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                if (dataInTemp.Value7 != this.txtValue7.Text.Trim())
+                {
+                    var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null));
+                    if (tempValue7 != null)
+                    {
+                        foreach (var item in tempValue7)
+                        {
+                            item.Value7 = this.txtValue7.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+                var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
+                if (toopValue != null)
+                {
+                    foreach (var item in toopValue)
+                    {
+                        item.ToopValue = null;
+                        Funs.DB.SubmitChanges();
+                    }
+                }
+            }
+            else
+            {
+                Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp();
+                newDataInTemp.ProjectId = ProjectId;
+                newDataInTemp.UserId = this.CurrUser.UserId;
+                newDataInTemp.Time = DateTime.Now;
+                newDataInTemp.Type = "HardValue";
+                newDataInTemp.Value1 = this.txtValue1.Text.Trim();
+                newDataInTemp.Value2 = this.txtValue2.Text.Trim();
+                newDataInTemp.Value3 = this.txtValue3.Text.Trim();
+                newDataInTemp.Value4 = this.txtValue4.Text.Trim();
+                newDataInTemp.Value5 = this.txtValue5.Text.Trim();
+                newDataInTemp.Value6 = this.txtValue6.Text.Trim();
+                newDataInTemp.Value7 = this.txtValue7.Text.Trim();
+                if (!string.IsNullOrEmpty(this.TempId))
+                {
+                    newDataInTemp.TempId = this.TempId;
+                    newDataInTemp.ToopValue = null;
+                    BLL.Sys_DataInTempService.UpdateDataInTemp(newDataInTemp);
+                }
+            }
+            ShowNotify("信息修改完成！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+        #endregion
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.designer.cs

@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.HotHardManage
+{
+
+
+    public partial class HardReportSetDataInEdit
+    {
+
+        /// <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>
+        /// txtValue1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue1;
+
+        /// <summary>
+        /// txtValue2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue2;
+
+        /// <summary>
+        /// txtValue3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue3;
+
+        /// <summary>
+        /// txtValue4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue4;
+
+        /// <summary>
+        /// txtValue5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue5;
+
+        /// <summary>
+        /// txtValue6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue6;
+
+        /// <summary>
+        /// txtValue7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue7;
+
+        /// <summary>
+        /// ckAll 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckAll;
+
+        /// <summary>
+        /// lbErrCout 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea lbErrCout;
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/GoldMouthLedger.aspx

@@ -0,0 +1,110 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GoldMouthLedger.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.GoldMouthLedger" %>
+
+<!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>
+    <style>
+        .f-grid-colheader .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </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="JOT_ID" AllowCellEditing="true"
+                    EnableColumnLines="true" ClicksToEdit="2"
+                    AllowSorting="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">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Width="250px"
+                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" AutoSelectFirstItem="false">
+                                </f:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click" Hidden="true">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo" ToolTip="导出"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                            TextAlign="Center" />
+                        <f:RenderField HeaderText="黄金（碰头）焊口编号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" SortField="JOT_JointNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                        <f:GroupField HeaderText="新安装管道" HeaderTextAlign="Center" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="管线号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="材质" ColumnID="SteelCode" DataField="SteelCode" SortField="SteelCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="碰头(老)管道" HeaderTextAlign="Center" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="管线号" ColumnID="OldIsoNo" DataField="OldIsoNo" SortField="OldIsoNo"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="材质" ColumnID="OldSteelCode" DataField="OldSteelCode" SortField="OldSteelCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="焊工号" ColumnID="WelderCode" DataField="WelderCode" SortField="WelderCode"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊接完成日期" ColumnID="JOT_WeldDate" DataField="JOT_WeldDate"
+                            SortField="JOT_WeldDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center"
+                            TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="检测方式" ColumnID="NDT_Code" DataField="NDT_Code" SortField="NDT_Code"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="检测状态" ColumnID="TestStates" DataField="TestStates" SortField="TestStates"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="检测日期" ColumnID="TestDate" DataField="TestDate" SortField="TestDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="确认人" ColumnID="ConfirmMan" DataField="ConfirmMan" SortField="ConfirmMan"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="备注" ColumnID="JOT_Remark" DataField="JOT_Remark" SortField="JOT_Remark"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                    </Columns>
+                    <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="25" Value="25" />
+                            <f:ListItem Text="50" Value="50" />
+                            <f:ListItem Text="所有行" Value="10000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/GoldMouthLedger.aspx.cs

@@ -0,0 +1,277 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+    public partial class GoldMouthLedger : PageBase
+    {
+        #region 加载页面
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.drpProjectId.DataTextField = "ProjectCode";
+                this.drpProjectId.DataValueField = "ProjectId";
+                this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
+                this.drpProjectId.DataBind();
+                //Funs.FineUIPleaseSelect(drpProjectId);
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                }
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null && this.drpProjectId.SelectedValue != null)
+            {
+                listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@projectId", null));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_GoldMouthLedger", 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_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 项目下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 统计
+        /// <summary>
+        /// 统计
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 导出
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = Const.HJGL_GoldMouthLedgerUrl;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            uploadfilepath = rootPath + initTemplatePath;
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null && this.drpProjectId.SelectedValue != null)
+            {
+                listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@projectId", null));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_GoldMouthLedger", parameter);
+
+            if (tb.Rows.Count>0)
+            {
+                newUrl = uploadfilepath.Replace("黄金（碰头）焊口材质及检测确认表导出模板", "黄金（碰头）焊口材质及检测确认表");
+                if (File.Exists(newUrl))
+                {
+                    File.Delete(newUrl);
+                }
+                File.Copy(uploadfilepath, newUrl);
+                // 第一步：读取文件流
+                NPOI.SS.UserModel.IWorkbook workbook;
+                using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+                {
+                    workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);//2007版
+                    //workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); //2003版
+                }
+                //创建表头样式
+                NPOI.SS.UserModel.ICellStyle titleCellStyle = workbook.CreateCellStyle();
+                titleCellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                titleCellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                titleCellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                titleCellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                titleCellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                titleCellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                titleCellStyle.WrapText = true;//自动换行
+                var titleFont = workbook.CreateFont();
+                titleFont.FontHeightInPoints = 14;               
+                titleCellStyle.SetFont(titleFont);
+
+                // 创建单元格样式
+                NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+                cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                cellStyle.WrapText = true;//自动换行                
+                var font = workbook.CreateFont();
+                font.FontHeightInPoints = 11;
+                cellStyle.SetFont(font);
+                // 第二步：创建新数据行
+                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+                NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+                NPOI.SS.UserModel.ICell cell;
+                int i = 3;
+
+                row = sheet.CreateRow(0);
+                cell = row.CreateCell(0);
+                cell.CellStyle = titleCellStyle;
+                row.HeightInPoints = 35;
+                string projectName = string.Empty;
+                if (!string.IsNullOrEmpty(this.drpProjectId.SelectedValue)&&this.drpProjectId.SelectedValue!=BLL.Const._Null)
+                {
+                    projectName = BLL.Base_ProjectService.GetProjectByProjectId(this.drpProjectId.SelectedValue).ProjectName;
+                }
+                cell.SetCellValue(projectName + "项目黄金（碰头）焊口材质及检测确认表");
+
+                for (int j = 0; j < tb.Rows.Count; j++)
+                {
+                    // 第二步：创建新数据行
+                    row = sheet.CreateRow(i);
+                    // 添加数据
+                    cell = row.CreateCell(0);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue((j + 1).ToString());//序号
+
+                    cell = row.CreateCell(1);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["JOT_JointNo"].ToString());//黄金（碰头）焊口编号
+
+                    cell = row.CreateCell(2);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["ISO_IsoNo"].ToString());//管线号(新安装管道)
+
+                    cell = row.CreateCell(3);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["SteelCode"].ToString());//材质(新安装管道)
+
+                    cell = row.CreateCell(4);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["OldIsoNo"].ToString());//管线号(碰头(老)管道)
+
+                    cell = row.CreateCell(5);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["OldSteelCode"].ToString());//材质(碰头(老)管道)
+
+                    cell = row.CreateCell(6);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["WelderCode"].ToString());//焊工号
+
+                    cell = row.CreateCell(7);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["JOT_WeldDate"]));//焊接完成日期
+
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["NDT_Code"].ToString());//检测方式
+
+                    cell = row.CreateCell(9);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["TestStates"].ToString());//检测状态
+
+                    cell = row.CreateCell(10);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["TestDate"]));//检测日期
+
+                    cell = row.CreateCell(11);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["ConfirmMan"].ToString());//确认人
+
+                    cell = row.CreateCell(12);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["JOT_Remark"].ToString());//备注
+                    i++;
+                }
+                // 第三步：写入文件流
+                using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+                {
+                    workbook.Write(stream);
+                    workbook.Close();
+                }
+                string fileName = Path.GetFileName(newUrl);
+                FileInfo info = new FileInfo(newUrl);
+                long fileSize = info.Length;
+                Response.Clear();
+                Response.ContentType = "application/x-zip-compressed";
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.AddHeader("Content-Length", fileSize.ToString());
+                Response.TransmitFile(newUrl, 0, fileSize);
+                Response.Flush();
+                Response.Close();
+                File.Delete(newUrl);
+            }
+            else
+            {
+                Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/GoldMouthLedger.aspx.designer.cs

@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+
+
+    public partial class GoldMouthLedger
+    {
+
+        /// <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>
+        /// drpProjectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectId;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <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;
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs

@@ -576,6 +576,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 keyValuePairs.Add("NDTType", "PT");
             }
+            if (this.drpWeldingDate.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue))
+            {
+                string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.drpWeldingDate.SelectedValue));
+                keyValuePairs.Add("WeldingDate", weldingDate);
+            }
             BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
             initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx";

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldRepairLists.aspx

@@ -0,0 +1,168 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldRepairLists.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.WeldRepairLists" %>
+
+<!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>
+    <style>
+        .f-grid-colheader .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </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="JOT_ID" AllowCellEditing="true"
+                    EnableColumnLines="true" ClicksToEdit="2"
+                    AllowSorting="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">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Width="250px"
+                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" AutoSelectFirstItem="false">
+                                </f:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click" Hidden="true">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo" ToolTip="导出"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                            TextAlign="Center" />
+                        <f:RenderField HeaderText="管线号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊口号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" SortField="JOT_JointNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="规格" ColumnID="JOT_JointDesc" DataField="JOT_JointDesc" SortField="JOT_JointDesc"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="材质" ColumnID="SteelCode" DataField="SteelCode" SortField="SteelCode"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" SortField="NDTR_Name"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:GroupField HeaderText="初次焊接" HeaderTextAlign="Center" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="焊工号" ColumnID="WelderCode" DataField="WelderCode" SortField="WelderCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="焊接日期" ColumnID="JOT_WeldDate" DataField="JOT_WeldDate" SortField="JOT_WeldDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="后热日期" ColumnID="PostHeatingDate" DataField="PostHeatingDate" SortField="PostHeatingDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="后热曲线编号" ColumnID="PostHeatingCode" DataField="PostHeatingCode" SortField="PostHeatingCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="热处理日期" ColumnID="HotProessDate" DataField="HotProessDate" SortField="HotProessDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="热处理曲线编号" ColumnID="RecordChartNo" DataField="RecordChartNo" SortField="RecordChartNo"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检测日期" ColumnID="TestDate" DataField="TestDate" SortField="TestDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="一返" HeaderTextAlign="Center" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="焊工号" ColumnID="RepairWelderCode1" DataField="RepairWelderCode1" SortField="RepairWelderCode1"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="焊接日期" ColumnID="RepairWeldDate1" DataField="RepairWeldDate1" SortField="RepairWeldDate1"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="后热日期" ColumnID="RepairPostHeatingDate1" DataField="RepairPostHeatingDate1" SortField="RepairPostHeatingDate1"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="后热曲线编号" ColumnID="RepairPostHeatingCode1" DataField="RepairPostHeatingCode1" SortField="RepairPostHeatingCode1"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="热处理日期" ColumnID="RepairHotDate1" DataField="RepairHotDate1" SortField="RepairHotDate1"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="热处理曲线编号" ColumnID="RepairRecordChartNo1" DataField="RepairRecordChartNo1" SortField="RepairRecordChartNo1"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检测日期" ColumnID="RepairTestDate1" DataField="RepairTestDate1" SortField="RepairTestDate1"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="二返" HeaderTextAlign="Center" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="焊工号" ColumnID="RepairWelderCode2" DataField="RepairWelderCode2" SortField="RepairWelderCode2"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="焊接日期" ColumnID="RepairWeldDate2" DataField="RepairWeldDate2" SortField="RepairWeldDate2"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="后热日期" ColumnID="RepairPostHeatingDate2" DataField="RepairPostHeatingDate2" SortField="RepairPostHeatingDate2"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="后热曲线编号" ColumnID="RepairPostHeatingCode2" DataField="RepairPostHeatingCode2" SortField="RepairPostHeatingCode2"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="热处理日期" ColumnID="RepairHotDate2" DataField="RepairHotDate2" SortField="RepairHotDate2"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="热处理曲线编号" ColumnID="RepairRecordChartNo2" DataField="RepairRecordChartNo2" SortField="RepairRecordChartNo2"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检测日期" ColumnID="RepairTestDate2" DataField="RepairTestDate2" SortField="RepairTestDate2"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="硬度" HeaderTextAlign="Center" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="第一次时间" ColumnID="" DataField="" SortField=""
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="第一次时间" ColumnID="" DataField="" SortField=""
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="第一次时间" ColumnID="" DataField="" SortField=""
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                    </Columns>
+                    <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="25" Value="25" />
+                            <f:ListItem Text="50" Value="50" />
+                            <f:ListItem Text="所有行" Value="10000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldRepairLists.aspx.cs

@@ -0,0 +1,308 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+    public partial class WeldRepairLists : PageBase
+    {
+        #region 加载页面
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.drpProjectId.DataTextField = "ProjectCode";
+                this.drpProjectId.DataValueField = "ProjectId";
+                this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
+                this.drpProjectId.DataBind();
+                //Funs.FineUIPleaseSelect(drpProjectId);
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                }
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null && this.drpProjectId.SelectedValue != null)
+            {
+                listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@projectId", null));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_RepairLists", 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_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 项目下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 统计
+        /// <summary>
+        /// 统计
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 导出
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = Const.HJGL_WeldRepairListsUrl;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            uploadfilepath = rootPath + initTemplatePath;
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null && this.drpProjectId.SelectedValue != null)
+            {
+                listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@projectId", null));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_RepairLists", parameter);
+
+            if (tb.Rows.Count > 0)
+            {
+                newUrl = uploadfilepath.Replace("焊缝返修台账导出模板", "焊缝返修台账");
+                if (File.Exists(newUrl))
+                {
+                    File.Delete(newUrl);
+                }
+                File.Copy(uploadfilepath, newUrl);
+                // 第一步：读取文件流
+                NPOI.SS.UserModel.IWorkbook workbook;
+                using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+                {
+                    workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);//2007版
+                    //workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); //2003版
+                }
+                // 创建单元格样式
+                NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+                cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                cellStyle.WrapText = true;//自动换行                
+                var font = workbook.CreateFont();
+                font.FontHeightInPoints = 11;
+                cellStyle.SetFont(font);
+                // 第二步：创建新数据行
+                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+                NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+                NPOI.SS.UserModel.ICell cell;
+                int i = 3;
+              
+                for (int j = 0; j < tb.Rows.Count; j++)
+                {
+                    // 第二步：创建新数据行
+                    row = sheet.CreateRow(i);
+                    // 添加数据
+                    cell = row.CreateCell(0);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue((j + 1).ToString());//序号
+
+                    cell = row.CreateCell(1);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["ISO_IsoNo"].ToString());//管线号
+                    cell = row.CreateCell(2);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["JOT_JointNo"].ToString());//焊口号
+                    cell = row.CreateCell(3);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["JOT_JointDesc"].ToString());//规格
+                    cell = row.CreateCell(4);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["SteelCode"].ToString());//材质
+                    cell = row.CreateCell(5);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["NDTR_Name"].ToString());//检测比例
+                    cell = row.CreateCell(6);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["WelderCode"].ToString());//焊工号
+                    cell = row.CreateCell(7);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["JOT_WeldDate"]));//焊接日期
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["PostHeatingDate"].ToString()));//后热日期
+                    cell = row.CreateCell(9);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["PostHeatingCode"].ToString());//后热曲线编号
+                    cell = row.CreateCell(10);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["HotProessDate"]));//热处理日期
+                    cell = row.CreateCell(11);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RecordChartNo"].ToString());//热处理曲线编号
+                    cell = row.CreateCell(12);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["TestDate"].ToString()));//检测日期
+
+                    //一返
+                    cell = row.CreateCell(13);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RepairWelderCode1"].ToString());//焊工号
+                    cell = row.CreateCell(14);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairWeldDate1"].ToString()));//焊接日期
+                    cell = row.CreateCell(15);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairPostHeatingDate1"].ToString()));//后热日期
+                    cell = row.CreateCell(16);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RepairPostHeatingCode1"].ToString());//后热曲线编号
+                    cell = row.CreateCell(17);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairHotDate1"].ToString()));//热处理日期
+                    cell = row.CreateCell(18);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RepairRecordChartNo1"].ToString());//热处理曲线编号
+                    cell = row.CreateCell(19);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairTestDate1"].ToString()));//检测日期
+
+                    //二返
+                    cell = row.CreateCell(20);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RepairWelderCode2"].ToString());//焊工号
+                    cell = row.CreateCell(21);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairWeldDate2"].ToString()));//焊接日期
+                    cell = row.CreateCell(22);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairPostHeatingDate2"].ToString()));//后热日期
+                    cell = row.CreateCell(23);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RepairPostHeatingCode2"].ToString());//后热曲线编号
+                    cell = row.CreateCell(24);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairHotDate2"].ToString()));//热处理日期
+                    cell = row.CreateCell(25);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(tb.Rows[j]["RepairRecordChartNo2"].ToString());//热处理曲线编号
+                    cell = row.CreateCell(26);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(string.Format("{0:yyyy-MM-dd}", tb.Rows[j]["RepairTestDate2"].ToString()));//检测日期
+
+                    //硬度
+                    cell = row.CreateCell(27);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue("");//第一次时间
+                    cell = row.CreateCell(28);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue("");//第一次时间
+                    cell = row.CreateCell(29);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue("");//第一次时间
+
+                    //100%签字
+                    cell = row.CreateCell(30);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue("");//承包商项目经理
+                    cell = row.CreateCell(31);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue("");//总监
+                    cell = row.CreateCell(32);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue("");//业主项目经理
+                    i++;
+                }
+                // 第三步：写入文件流
+                using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+                {
+                    workbook.Write(stream);
+                    workbook.Close();
+                }
+                string fileName = Path.GetFileName(newUrl);
+                FileInfo info = new FileInfo(newUrl);
+                long fileSize = info.Length;
+                Response.Clear();
+                Response.ContentType = "application/x-zip-compressed";
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.AddHeader("Content-Length", fileSize.ToString());
+                Response.TransmitFile(newUrl, 0, fileSize);
+                Response.Flush();
+                Response.Close();
+                File.Delete(newUrl);
+            }
+            else
+            {
+                Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldRepairLists.aspx.designer.cs

@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+
+
+    public partial class WeldRepairLists
+    {
+
+        /// <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>
+        /// drpProjectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectId;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <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;
+    }
+}

HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs

@@ -346,6 +346,11 @@ namespace FineUIPro.Web.JGZL
                     {
                         keyValuePairs.Add("NDTType", "PT");
                     }
+                    if (this.drpWeldingDate.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue))
+                    {
+                        string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.drpWeldingDate.SelectedValue));
+                        keyValuePairs.Add("WeldingDate", weldingDate);
+                    }
                     BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                     initTemplatePath = "File\\Fastreport\\JGZL\\管道焊接接头报检检查记录.frx";

HJGL_DS/FineUIPro.Web/res/DataInTable.js

@@ -0,0 +1,54 @@
+var menuID = 'Menu1';
+// 返回false，来阻止浏览器右键菜单
+function onRowContextMenu(event, rowId) {
+    F(menuID).show();  //showAt(event.pageX, event.pageY);
+    return false;
+}
+function reloadGrid() {
+    __doPostBack(null, 'reloadGrid');
+}
+
+
+function parse(y) {
+    var box = document.getElementById("box");
+    //获取进度条div的宽度
+    var x = box.style.width;
+    x = parseInt(x) + 1;
+    y = y + 1;
+    //将y值加上百分号赋值给box的宽度。这样每次+1就可以实现进度条占父容器的100%;
+    box.style.width = y + "%";
+    //将y值加上百分号并赋值给显示下载百分比的div上
+    document.getElementById("box").innerHTML = y + "%";
+    //判断当y已经100的时候，也就是进度条的宽度和父容器的宽度一致的时候停止。
+    if (y >= 100) {
+
+        document.getElementById("box").innerHTML = "100%";
+    }
+}
+
+
+
+ 
+
+function printX() {
+    var userid = document.getElementById('id-inputEl').value;
+    F.ui.Window2.show();
+    parse(0);
+    var begin = setInterval(function () {
+        PageMethods.getPercent(userid,function (result) {
+            console.log(result);
+            parse(result);
+            if (result >= 100) {
+                F.ui.Window2.hide();
+                document.getElementById('btnRefresh').click();
+                 clearInterval(begin);
+            }
+        });
+    }, 1000);
+
+
+    y = 0;
+  
+
+
+} 

HJGL_DS/Model/Model.csproj

@@ -115,6 +115,18 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="bin\Debug\Model.dll" />
+    <Content Include="bin\Debug\Model.pdb" />
+    <Content Include="bin\Debug\Newtonsoft.Json.dll" />
+    <Content Include="bin\Debug\Newtonsoft.Json.pdb" />
+    <Content Include="bin\Debug\Newtonsoft.Json.xml" />
+    <Content Include="bin\Release\Model.dll" />
+    <Content Include="bin\Release\Model.pdb" />
+    <Content Include="bin\Release\Newtonsoft.Json.dll" />
+    <Content Include="bin\Release\Newtonsoft.Json.pdb" />
+    <Content Include="bin\Release\Newtonsoft.Json.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

HJGL_DS/SgManager.AI/SgManager.AI.csproj

@@ -76,6 +76,16 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BLL\BLL.csproj">
+      <Project>{bbc7282a-9e2b-4bd6-9c6d-333cefc6f332}</Project>
+      <Name>BLL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Model\Model.csproj">
+      <Project>{fd1e1931-1688-4b4a-bcd6-335a81465343}</Project>
+      <Name>Model</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />