diff --git a/.gitignore b/.gitignore index 7dd8ef6..d21323e 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ bin-release/ /HJGL_DS/WebAPI/.vs /HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/StockIn /HJGL_DS/FineUIPro.Web/FileUpload/Common/WelderManage +/CreateModel2017 - 副本.bat diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..75b31f2 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\SGGL.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/DataBase/版本日志/HJGLDB_DS_2026-01-05_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-01-05_gf.sql new file mode 100644 index 0000000..4813d21 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-01-05_gf.sql @@ -0,0 +1,106 @@ + +ALTER PROC [dbo].[HJGL_sp_rpt_iso_analyze] + @unitNo VARCHAR(400) = NULL, + @isono VARCHAR(100) = NULL, + @steel varchar(50) = NULL, + @projectId NVARCHAR(50) = NULL, + @StartDate datetime =null, + @EndDate datetime =null +AS +/*ӹͳ ܴ޸2020.03.06*/ +SELECT iso.ProjectId,iso.ISO_IsoNo,iso.PressureTestPackageNo,Unit.UnitCode AS bsu_unitcode, --λ + Unit.UnitName AS bsu_unitname, --λ + Project.ProjectCode as projectCode, --ʩ + ''+cast(cast(ISO_Dia as FLOAT) as nvarchar(50))+''+cast(cast(ISO_Sch as FLOAT) as nvarchar(50)) as IsoDesc, -- + v.ISO_ID,v.total_jot,v.total_din, + ISNULL(v1.finished_total_jot,0) AS finished_total_jot, + ISNULL(v1.finished_total_din,0) AS finished_total_din,v1.maxdate, + ISNULL(v1.total_film,0) AS total_film, + ISNULL(v1.pass_film,0) AS pass_film, + CAST(CASE ISNULL(v1.total_film ,0) WHEN 0 THEN 0 + ELSE 1.0*ISNULL(v1.pass_film,0) / (1.0 * v1.total_film) END AS DECIMAL(19,3)) + AS passrate, --ںϸ + ISNULL(v2.point_jot,0) AS point_jot, + ISNULL(v2.point_total_film,0) AS point_total_film, + ISNULL(v2.point_pass_film,0) AS point_pass_film, + CAST(CASE ISNULL(v2.point_total_film ,0) WHEN 0 THEN 0 + ELSE 1.0*ISNULL(v2.point_pass_film,0) / (1.0 * v2.point_total_film) END AS DECIMAL(19,3)) + AS point_passrate, --ںϸ + + ISNULL(v3.ext_jot,0) AS ext_jot, + ISNULL(v3.ext_total_film,0) AS ext_total_film, + ISNULL(v3.ext_pass_film,0) AS ext_pass_film, + CAST(CASE ISNULL(v3.ext_total_film ,0) WHEN 0 THEN 0 + ELSE 1.0*ISNULL(v3.ext_pass_film,0) / (1.0 * v3.ext_total_film) END AS DECIMAL(19,3)) + AS point_passrate, --͸ϸ + (ISNULL(v2.point_jot,0)+ISNULL(v3.ext_jot,0)) AS check_total_jot, + ISNULL(v4.total_repairjot,0) AS total_repairjot, + ISNULL(v5.trust_total_jot,0) AS trust_total_jot, + CAST(CASE ISNULL(v.total_jot,0) WHEN 0 THEN 0 + ELSE 1.0*ISNULL(v2.point_jot,0) / (1.0 * v.total_jot) END AS DECIMAL(19,3)) + AS trustrate, --ίб + CAST(CASE ISNULL(v.total_jot,0) WHEN 0 THEN 0 + ELSE 1.0*(ISNULL(v3.ext_jot,0) + ISNULL(v2.point_jot,0)) / (1.0 * v.total_jot) + END AS DECIMAL(19,3)) + AS checkrate --̽ +FROM + (SELECT ISO_ID, COUNT(JOT_ID) AS total_jot,SUM(ISNULL(JOT_Size,0)) AS total_din + FROM dbo.HJGL_PW_JointInfo + GROUP BY ISO_ID) v + LEFT JOIN + (SELECT ISO_ID, COUNT(JOT_ID) AS finished_total_jot,SUM(ISNULL(JOT_Size,0)) AS finished_total_din, + max(weldreport.JOT_WeldDate) AS maxdate, SUM(ISNULL(jot.RT_FilmNum,0)) AS total_film, + SUM(ISNULL(jot.RT_FilmNum,0)-ISNULL(jot.RT1_RepairFilmNum,0)) AS pass_film + FROM dbo.HJGL_PW_JointInfo jot + LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID + WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) + AND jot.DReportID is not null + GROUP BY ISO_ID) v1 ON v1.ISO_ID=v.ISO_ID + LEFT JOIN + (SELECT ISO_ID, COUNT(jot.JOT_ID) AS point_jot,SUM(ISNULL(jot.RT_FilmNum,0)) AS point_total_film, + SUM(ISNULL(jot.RT_FilmNum,0)-ISNULL(jot.RT1_RepairFilmNum,0)) AS point_pass_film + FROM dbo.HJGL_PW_JointInfo jot + LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID + WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) + AND jot.DReportID is not NULL AND jot.PointType='' or ((select top 1 CH_TrustItemID from HJGL_CH_TrustItem ti where ti.JOT_ID=jot.JOT_ID) is not null and jot.PointType is null) + GROUP BY ISO_ID) v2 ON v2.ISO_ID=v.ISO_ID + LEFT JOIN + (SELECT ISO_ID, COUNT(jot.JOT_ID) AS ext_jot,SUM(ISNULL(jot.RT_FilmNum,0)) AS ext_total_film, + SUM(ISNULL(jot.RT_FilmNum,0)-ISNULL(jot.RT1_RepairFilmNum,0)) AS ext_pass_film + FROM dbo.HJGL_PW_JointInfo jot + LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID + WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) + AND jot.DReportID is not NULL AND jot.PointType='͸' + GROUP BY ISO_ID) v3 ON v3.ISO_ID=v.ISO_ID + LEFT JOIN + (SELECT jot.ISO_ID, COUNT(distinct trust.JOT_ID) AS trust_total_jot --trust.CH_TrustItemID + FROM dbo.HJGL_CH_TrustItem trust + LEFT join dbo.HJGL_PW_JointInfo AS jot on jot.JOT_ID=trust.JOT_ID + LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID + WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) + AND jot.DReportID is not NULL + GROUP BY jot.ISO_ID) v5 ON v5.ISO_ID=v.ISO_ID + LEFT JOIN + (SELECT ISO_ID,COUNT(DISTINCT(jot.JOT_ID)) AS total_repairjot + FROM dbo.HJGL_PW_JointInfo jot + LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID + WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) + AND jot.DReportID is not NULL + AND(jot.RT1_RepairFilmNum IS NOT NULL OR jot.PTIsRepair1=1 OR jot.MTIsRepair1=1 OR jot.UTIsRepair1=1) + GROUP BY ISO_ID) v4 ON v4.ISO_ID=v.ISO_ID + + LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = v.ISO_ID + LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = iso.BSU_ID + LEFT JOIN Base_Project AS Project ON Project.ProjectId = iso.ProjectId + WHERE (iso.ProjectId = @projectId OR @projectId IS NULL) + AND (iso.BSU_ID=@unitno OR @unitno IS NULL) + AND (iso.STE_ID=@steel OR @steel IS NULL) + AND (iso.ISO_IsoNo = @isono OR @isono IS NULL) + + + + + +GO + + diff --git a/HJGL_DS/.claude/settings.local.json b/HJGL_DS/.claude/settings.local.json new file mode 100644 index 0000000..aa97e98 --- /dev/null +++ b/HJGL_DS/.claude/settings.local.json @@ -0,0 +1,8 @@ +{ + "permissions": { + "allow": [ + "Bash(cat:*)", + "Bash(find:*)" + ] + } +} diff --git a/HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json b/HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json index cc42367..9bc9de5 100644 --- a/HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json +++ b/HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"API\\APIBaseServices.cs"},{"SourceFile":"API\\APIIsoInfoServicecs.cs"},{"SourceFile":"API\\APILoginServices.cs"},{"SourceFile":"API\\APIWeldingSynServic.cs"},{"SourceFile":"API\\APIJointInfoService.cs"},{"SourceFile":"API\\APIUnitInfoService.cs"},{"SourceFile":"API\\APIWeldServices.cs"},{"SourceFile":"AttachFile\\AttachFileService.cs"},{"SourceFile":"CacheHelper.cs"},{"SourceFile":"Common\\ADomainService.cs"},{"SourceFile":"Common\\BaseInfo\\AudiFlowService.cs"},{"SourceFile":"Common\\BaseInfo\\AuditFlowApproveService.cs.cs"},{"SourceFile":"Common\\BaseInfo\\Base_DepartService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_OrganizationService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_PrintFileCodeService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_ProjectService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_TeamGroupService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_UnitService.cs"},{"SourceFile":"Common\\BaseInfo\\ProjectPlanService.cs"},{"SourceFile":"Common\\ChartControlService.cs"},{"SourceFile":"Common\\ConstValue.cs"},{"SourceFile":"Common\\FastReportService.cs"},{"SourceFile":"Common\\FileManage\\Common_FileManageService.cs"},{"SourceFile":"Common\\JsonHelper.cs"},{"SourceFile":"Common\\Migrated\\GetKey.cs"},{"SourceFile":"Common\\Migrated\\RSACrypto.cs"},{"SourceFile":"Common\\Migrated\\StringHelper.cs"},{"SourceFile":"Common\\Notice\\Attach_ImageService.cs"},{"SourceFile":"Common\\Notice\\Common_NoticeService.cs"},{"SourceFile":"Common\\Notice\\Common_NoticeSignService.cs"},{"SourceFile":"Common\\NPOIHelper.cs"},{"SourceFile":"Common\\ProjectSet\\Project_InstallationService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_RoleButtonPowerrService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_RolePowerService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_SysSetService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UnitService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserButtonPowerrService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserPowerService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_WelderService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_WorkAreaService.cs"},{"SourceFile":"Common\\ReportPrint\\Common_ReportPrintService.cs"},{"SourceFile":"Common\\Resource\\Common_ConstructionStandardService.cs"},{"SourceFile":"Common\\Resource\\Common_LawRegulationService.cs"},{"SourceFile":"Common\\SysManage\\Sys_ButtonPowerService.cs"},{"SourceFile":"Common\\SysManage\\Sys_LogService.cs"},{"SourceFile":"Common\\SysManage\\Sys_RolePowerService.cs"},{"SourceFile":"Common\\SysManage\\Sys_RoleService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserSettingsService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserShowColumnsService.cs"},{"SourceFile":"Common\\UploadAttachmentService.cs"},{"SourceFile":"Common\\CommonService.cs"},{"SourceFile":"Common\\Const.cs"},{"SourceFile":"ConvertObject.cs"},{"SourceFile":"DropListService.cs"},{"SourceFile":"DynamicTHeaderHepler.cs"},{"SourceFile":"ErrLogInfo.cs"},{"SourceFile":"FriendlyException.cs"},{"SourceFile":"Funs.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ComponentsService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ConsumablesService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ControlService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_DetectionService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_EquipmentService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ExecStandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_GrooveService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_HotProcessCardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_JointImageItemService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_JointImageService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialClassService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialCompareService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialGroupService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialStandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MediumService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_PipingClassService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_StandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_TestingService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_TestStandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_WeldControlService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_WeldingMethodService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_WeldService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_CompanyStandardsService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_DomesticLawsRegulationsService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_DomesticStandardsService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_ForeignStandardsService.cs"},{"SourceFile":"HJGLServer\\WeldingManage\\HJGL_WeldingManage_WeldingProcedureService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_BatchService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_BatchDetailService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_QualityRatingRepairService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_QualityRatingService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_RepairNoticeService.cs"},{"SourceFile":"HJGL\\CheckManage\\HJGL_RemakeReasonService.cs"},{"SourceFile":"HJGL\\CheckManage\\HJGL_TestingReportPrintService.cs"},{"SourceFile":"HJGL\\DataIn\\DataInTempService.cs"},{"SourceFile":"HJGL\\HotHardManage\\HJGL_CH_HardTestReportService.cs"},{"SourceFile":"HJGL\\HotHardManage\\HJGL_CH_HardTestResultService.cs"},{"SourceFile":"HJGL\\HotProessManage\\HJGL_CH_HotProessResultService.cs"},{"SourceFile":"HJGL\\HotProessManage\\HJGL_CH_HotProessTrustService.cs"},{"SourceFile":"HJGL\\HotProessManage\\HJGL_HotProessManageEditService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_InStorageItemService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_InStorageService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_MaterialService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_PipeMaterialService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_StorageService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_BakeRecordsProjectService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_ElectrodeBakeService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_ElectrodeRecoveryService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_EMaterialRegistService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_EMInventoryRecordsService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_EWeldRHRecordService.cs"},{"SourceFile":"HJGL\\MaterialManage\\TemperatureAndHumidityProjectService.cs"},{"SourceFile":"HJGL\\PersonManage\\HJGL_PersonManageService.cs"},{"SourceFile":"HJGL\\PersonManage\\HJGL_WelderQualifiedProjectService.cs"},{"SourceFile":"HJGL\\PersonManage\\HJGL_WelderScoreService.cs"},{"SourceFile":"HJGL\\RepairManage\\HJGL_RepairItemService.cs"},{"SourceFile":"HJGL\\RepairManage\\HJGL_RepairService.cs"},{"SourceFile":"HJGL\\TestPackageManage\\HJGL_TestPackageManageEditService.cs"},{"SourceFile":"HJGL\\TrustManage\\HJGL_CH_TrustItemService.cs"},{"SourceFile":"HJGL\\TrustManage\\HJGL_TrustManageEditService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_BO_PreWeldReportMainService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_CH_RepairItemRecordService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_MatchedProcedureMaterialService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_ProcedureImageService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_PW_IsoInfoService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_PW_JointInfoService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_TestingParametersService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_UserShowColumnsService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldHotProcessCardService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldingProcedureJotService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldingProcedureService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldingProcessCardService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldRepairCardService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldReportService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WelderOKRateService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WelderOKRateStatisticsService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldRecordInService.cs"},{"SourceFile":"JsonHelper.cs"},{"SourceFile":"libFace.cs"},{"SourceFile":"libOpenCV.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"MethodRefelect.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"RefComm.cs"},{"SourceFile":"ReportPrint\\ReportPrintService.cs"},{"SourceFile":"SendEmailService.cs"},{"SourceFile":"SessionName.cs"},{"SourceFile":"SoftRegeditService.cs"},{"SourceFile":"SQLHelper.cs"},{"SourceFile":"Common\\UploadFileService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\SpecificationsService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\StoremanInfoService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\SupplierService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\UnitStoreService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\WeldInfoService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\WeldTypeService.cs"},{"SourceFile":"WeldMat\\MatBake\\ElectrodeBakeService.cs"},{"SourceFile":"WeldMat\\Recycle\\RecycleMatService.cs"},{"SourceFile":"WeldMat\\Recycle\\RecycleMatTopService.cs"},{"SourceFile":"WeldMat\\Stock\\StockInitService.cs"},{"SourceFile":"WeldMat\\Stock\\StockInService.cs"},{"SourceFile":"WeldMat\\UsingPlan\\UsingPlanService.cs"},{"SourceFile":"WeldMat\\UsingSentMat\\UsingMatService.cs"},{"SourceFile":"WeldMat\\WeldMatDataBase\\BakeRecordsService.cs"},{"SourceFile":"WeldMat\\WeldMatDataBase\\TemperatureAndHumidityService.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\Portable.BouncyCastle.1.8.9\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Bars.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Compat.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Editor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\SharpZipLib.1.3.2\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.SQLServer.ManagedDTS\\v4.0_16.0.0.0__89845dcd8080cc91\\Microsoft.SQLServer.ManagedDTS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\Model\\bin\\Release\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\Model\\bin\\Release\\Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\Newtonsoft.Json.12.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.DirectoryServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\鼎盛\\HJGL_DS\\HJGL_DS\\BLL\\bin\\Release\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"API\\APIBaseServices.cs"},{"SourceFile":"API\\APIIsoInfoServicecs.cs"},{"SourceFile":"API\\APILoginServices.cs"},{"SourceFile":"API\\APIWeldingSynServic.cs"},{"SourceFile":"API\\APIJointInfoService.cs"},{"SourceFile":"API\\APIUnitInfoService.cs"},{"SourceFile":"API\\APIWeldServices.cs"},{"SourceFile":"AttachFile\\AttachFileService.cs"},{"SourceFile":"CacheHelper.cs"},{"SourceFile":"Common\\ADomainService.cs"},{"SourceFile":"Common\\BaseInfo\\AudiFlowService.cs"},{"SourceFile":"Common\\BaseInfo\\AuditFlowApproveService.cs.cs"},{"SourceFile":"Common\\BaseInfo\\Base_DepartService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_OrganizationService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_PrintFileCodeService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_ProjectService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_TeamGroupService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_UnitService.cs"},{"SourceFile":"Common\\BaseInfo\\ProjectPlanService.cs"},{"SourceFile":"Common\\ChartControlService.cs"},{"SourceFile":"Common\\ConstValue.cs"},{"SourceFile":"Common\\FastReportService.cs"},{"SourceFile":"Common\\FileManage\\Common_FileManageService.cs"},{"SourceFile":"Common\\JsonHelper.cs"},{"SourceFile":"Common\\Migrated\\GetKey.cs"},{"SourceFile":"Common\\Migrated\\RSACrypto.cs"},{"SourceFile":"Common\\Migrated\\StringHelper.cs"},{"SourceFile":"Common\\Notice\\Attach_ImageService.cs"},{"SourceFile":"Common\\Notice\\Common_NoticeService.cs"},{"SourceFile":"Common\\Notice\\Common_NoticeSignService.cs"},{"SourceFile":"Common\\NPOIHelper.cs"},{"SourceFile":"Common\\ProjectSet\\Project_InstallationService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_RoleButtonPowerrService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_RolePowerService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_SysSetService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UnitService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserButtonPowerrService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserPowerService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_WelderService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_WorkAreaService.cs"},{"SourceFile":"Common\\ReportPrint\\Common_ReportPrintService.cs"},{"SourceFile":"Common\\Resource\\Common_ConstructionStandardService.cs"},{"SourceFile":"Common\\Resource\\Common_LawRegulationService.cs"},{"SourceFile":"Common\\SysManage\\Sys_ButtonPowerService.cs"},{"SourceFile":"Common\\SysManage\\Sys_LogService.cs"},{"SourceFile":"Common\\SysManage\\Sys_RolePowerService.cs"},{"SourceFile":"Common\\SysManage\\Sys_RoleService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserSettingsService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserShowColumnsService.cs"},{"SourceFile":"Common\\UploadAttachmentService.cs"},{"SourceFile":"Common\\CommonService.cs"},{"SourceFile":"Common\\Const.cs"},{"SourceFile":"ConvertObject.cs"},{"SourceFile":"DropListService.cs"},{"SourceFile":"DynamicTHeaderHepler.cs"},{"SourceFile":"ErrLogInfo.cs"},{"SourceFile":"FriendlyException.cs"},{"SourceFile":"Funs.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ComponentsService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ConsumablesService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ControlService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_DetectionService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_EquipmentService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_ExecStandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_GrooveService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_HotProcessCardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_JointImageItemService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_JointImageService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialClassService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialCompareService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialGroupService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MaterialStandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_MediumService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_PipingClassService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_StandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_TestingService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_TestStandardService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_WeldControlService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_WeldingMethodService.cs"},{"SourceFile":"HJGLServer\\BaseInfo\\HJGL_WeldService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_CompanyStandardsService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_DomesticLawsRegulationsService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_DomesticStandardsService.cs"},{"SourceFile":"HJGLServer\\FileControl\\HJGL_FileControl_ForeignStandardsService.cs"},{"SourceFile":"HJGLServer\\WeldingManage\\HJGL_WeldingManage_WeldingProcedureService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_BatchService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_BatchDetailService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_QualityRatingRepairService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_QualityRatingService.cs"},{"SourceFile":"HJGL\\Batch\\HJGL_BO_RepairNoticeService.cs"},{"SourceFile":"HJGL\\CheckManage\\HJGL_RemakeReasonService.cs"},{"SourceFile":"HJGL\\CheckManage\\HJGL_TestingReportPrintService.cs"},{"SourceFile":"HJGL\\DataIn\\DataInTempService.cs"},{"SourceFile":"HJGL\\HotHardManage\\HJGL_CH_HardTestReportService.cs"},{"SourceFile":"HJGL\\HotHardManage\\HJGL_CH_HardTestResultService.cs"},{"SourceFile":"HJGL\\HotProessManage\\HJGL_CH_HotProessResultService.cs"},{"SourceFile":"HJGL\\HotProessManage\\HJGL_CH_HotProessTrustService.cs"},{"SourceFile":"HJGL\\HotProessManage\\HJGL_HotProessManageEditService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_InStorageItemService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_InStorageService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_MaterialService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_PipeMaterialService.cs"},{"SourceFile":"HJGL\\Match\\HJGL_Match_StorageService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_BakeRecordsProjectService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_ElectrodeBakeService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_ElectrodeRecoveryService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_EMaterialRegistService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_EMInventoryRecordsService.cs"},{"SourceFile":"HJGL\\MaterialManage\\HJGL_EWeldRHRecordService.cs"},{"SourceFile":"HJGL\\MaterialManage\\QualityCertificateService.cs"},{"SourceFile":"HJGL\\MaterialManage\\TemperatureAndHumidityProjectService.cs"},{"SourceFile":"HJGL\\PersonManage\\HJGL_PersonManageService.cs"},{"SourceFile":"HJGL\\PersonManage\\HJGL_WelderQualifiedProjectService.cs"},{"SourceFile":"HJGL\\PersonManage\\HJGL_WelderScoreService.cs"},{"SourceFile":"HJGL\\RepairManage\\HJGL_RepairItemService.cs"},{"SourceFile":"HJGL\\RepairManage\\HJGL_RepairService.cs"},{"SourceFile":"HJGL\\TestPackageManage\\HJGL_TestPackageManageEditService.cs"},{"SourceFile":"HJGL\\TrustManage\\HJGL_CH_TrustItemService.cs"},{"SourceFile":"HJGL\\TrustManage\\HJGL_TrustManageEditService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_BO_PreWeldReportMainService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_CH_RepairItemRecordService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_MatchedProcedureMaterialService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_ProcedureImageService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_PW_IsoInfoService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_PW_JointInfoService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_TestingParametersService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_UserShowColumnsService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldHotProcessCardService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldingProcedureJotService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldingProcedureService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldingProcessCardService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldRepairCardService.cs"},{"SourceFile":"HJGL\\WeldingManage\\HJGL_WeldReportService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WelderOKRateService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WelderOKRateStatisticsService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldRecordInService.cs"},{"SourceFile":"JGZL\\AcceptanceCertificateService.cs"},{"SourceFile":"JGZL\\CommencementReportService.cs"},{"SourceFile":"JGZL\\ConDrawingVerificationService.cs"},{"SourceFile":"JGZL\\ContactService.cs"},{"SourceFile":"JGZL\\HandoverCertificateService.cs"},{"SourceFile":"JGZL\\NDTPersonService.cs"},{"SourceFile":"JGZL\\SpecialEquipmentMaintenanceService.cs"},{"SourceFile":"JsonHelper.cs"},{"SourceFile":"libFace.cs"},{"SourceFile":"libOpenCV.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"MethodRefelect.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"RefComm.cs"},{"SourceFile":"ReportPrint\\ReportPrintService.cs"},{"SourceFile":"SendEmailService.cs"},{"SourceFile":"SessionName.cs"},{"SourceFile":"SoftRegeditService.cs"},{"SourceFile":"SQLHelper.cs"},{"SourceFile":"Common\\UploadFileService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\SpecificationsService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\StoremanInfoService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\SupplierService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\UnitStoreService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\WeldInfoService.cs"},{"SourceFile":"WeldMat\\BaseInfo\\WeldTypeService.cs"},{"SourceFile":"WeldMat\\MatBake\\ElectrodeBakeService.cs"},{"SourceFile":"WeldMat\\Recycle\\RecycleMatService.cs"},{"SourceFile":"WeldMat\\Recycle\\RecycleMatTopService.cs"},{"SourceFile":"WeldMat\\Stock\\StockInitService.cs"},{"SourceFile":"WeldMat\\Stock\\StockInService.cs"},{"SourceFile":"WeldMat\\UsingPlan\\UsingPlanService.cs"},{"SourceFile":"WeldMat\\UsingSentMat\\UsingMatService.cs"},{"SourceFile":"WeldMat\\WeldMatDataBase\\BakeRecordsService.cs"},{"SourceFile":"WeldMat\\WeldMatDataBase\\TemperatureAndHumidityService.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\Portable.BouncyCastle.1.8.9\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Bars.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Compat.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Editor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\SharpZipLib.1.3.2\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\SQL2012 x86\\110\\SDK\\Assemblies\\Microsoft.SQLServer.ManagedDTS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\Model\\bin\\Debug\\Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\Newtonsoft.Json.12.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.DirectoryServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\数据\\诺必达\\鼎盛\\HJGL_DS\\HJGL_DS\\BLL\\bin\\Debug\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 77582ac..01966b1 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -95,6 +95,7 @@ + @@ -114,7 +115,6 @@ - @@ -125,6 +125,7 @@ + diff --git a/HJGL_DS/BLL/CacheHelper.cs b/HJGL_DS/BLL/CacheHelper.cs deleted file mode 100644 index 0447b9b..0000000 --- a/HJGL_DS/BLL/CacheHelper.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Web; -using System.Collections; - -public class CacheHelper -{ - /// - /// 获取数据缓存 - /// - /// 键 - /// - public static object GetCache(string CacheKey) - { - System.Web.Caching.Cache objCache = HttpRuntime.Cache; - return objCache[CacheKey]; - - } - - /// - /// 设置数据缓存 - /// - /// - /// - public static void SetCache(string CacheKey, object objObject) - { - System.Web.Caching.Cache objCache = HttpRuntime.Cache; - objCache.Insert(CacheKey, objObject); - - } - - /// - /// 设置数据缓存 - /// - /// - /// - /// - public static void SetCache(string CacheKey, object objObject, TimeSpan Timeout) - { - System.Web.Caching.Cache objCache = HttpRuntime.Cache; - objCache.Insert(CacheKey, objObject, null, DateTime.MaxValue, Timeout, System.Web.Caching.CacheItemPriority.NotRemovable, null); - } - - /// - /// 设置数据缓存 - /// - /// - /// - /// - /// - public static void SetCache(string CacheKey, object objObject, DateTime absoluteExpiration, TimeSpan slidingExpiration) - { - System.Web.Caching.Cache objCache = HttpRuntime.Cache; - objCache.Insert(CacheKey, objObject, null, absoluteExpiration, slidingExpiration); - } - - /// - /// 移除指定数据缓存 - /// - /// - public static void RemoveAllCache(string CacheKey) - { - - System.Web.Caching.Cache _cache = HttpRuntime.Cache; - _cache.Remove(CacheKey); - } - - /// - /// 移除全部缓存 - /// - public static void RemoveAllCache() - { - System.Web.Caching.Cache _cache = HttpRuntime.Cache; - IDictionaryEnumerator CacheEnum = _cache.GetEnumerator(); - while (CacheEnum.MoveNext()) - { - _cache.Remove(CacheEnum.Key.ToString()); - - } - - } - - /// - /// 获取缓存 - /// - private static object GetPrivate(string key) - { - return string.IsNullOrEmpty(key) ? null : HttpRuntime.Cache.Get(key); - } -} diff --git a/HJGL_DS/BLL/Common/CacheHelper.cs b/HJGL_DS/BLL/Common/CacheHelper.cs new file mode 100644 index 0000000..c01de8a --- /dev/null +++ b/HJGL_DS/BLL/Common/CacheHelper.cs @@ -0,0 +1,102 @@ +using System; +using System.Runtime.Caching; + +namespace BLL +{ + public static class CacheHelper + { + private static readonly ObjectCache Cache = MemoryCache.Default; + + /// + /// 添加缓存项 + /// + /// 缓存键 + /// 缓存值 + /// 绝对过期时间 + public static void Add(string key, object value, DateTimeOffset absoluteExpiration) + { + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException(nameof(key)); + } + + Cache.Set(key, value, absoluteExpiration); + } + + /// + /// 获取缓存项（泛型） + /// + /// 返回类型 + /// 缓存键 + /// 缓存值 + public static T Get(string key) + { + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException(nameof(key)); + } + + object value = Cache[key]; + if (value is T tValue) + { + return tValue; + } + return default(T); + } + + /// + /// 获取缓存项 + /// + /// 缓存键 + /// 缓存值 + public static object Get(string key) + { + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException(nameof(key)); + } + + return Cache[key]; + } + + /// + /// 移除缓存项 + /// + /// 缓存键 + public static void Remove(string key) + { + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException(nameof(key)); + } + + Cache.Remove(key); + } + + /// + /// 清空所有缓存 + /// + public static void Clear() + { + foreach (var item in Cache) + { + Cache.Remove(item.Key); + } + } + + /// + /// 检查缓存项是否存在 + /// + /// 缓存键 + /// 是否存在 + public static bool Exists(string key) + { + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException(nameof(key)); + } + + return Cache.Contains(key); + } + } +} diff --git a/HJGL_DS/BLL/Common/FastReportService.cs b/HJGL_DS/BLL/Common/FastReportService.cs index b8b0474..586a7ac 100644 --- a/HJGL_DS/BLL/Common/FastReportService.cs +++ b/HJGL_DS/BLL/Common/FastReportService.cs @@ -1,40 +1,85 @@ -using System.Web; -using System.Web.Security; +using FastReport; +using NPOI.POIFS.Crypt; +using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Data; -using FastReport; +using System.Web; +using System.Web.Security; namespace BLL.Common { public static class FastReportService { - + // 缓存过期时间：30分钟 + private static readonly int CacheExpirationMinutes = 5; + /// - /// 重置数据 + /// 重置数据 - 清理缓存和Session /// public static void ResetData() { - HttpContext.Current.Session["ReportDataTables"] = null; - HttpContext.Current.Session["ReportParameterValues"] = null; + if (HttpContext.Current?.Session == null) + { + return; + } + + // 清理Session中的缓存键引用 + var cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List; + if (cacheKeys != null) + { + foreach (var key in cacheKeys) + { + try + { + CacheHelper.Remove(key); + } + catch + { + // 忽略缓存删除异常 + } + } + } + HttpContext.Current.Session["ReportDataCacheKeys"] = null; + HttpContext.Current.Session["ReportParameterCacheKey"] = null; } + + /// + /// 添加报表数据表到缓存 + /// public static void AddFastreportTable(DataTable dataTable) { - List dataTables = (List)HttpContext.Current.Session["ReportDataTables"]; - if (dataTables == null) + + // 生成唯一缓存键 + string cacheKey = $"ReportData_{Guid.NewGuid()}_{DateTime.Now.Ticks}"; + + // 将数据表存储到缓存中，设置5分钟过期 + CacheHelper.Add(cacheKey, dataTable, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes)); + + List cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List; + if (cacheKeys==null) { - dataTables = new List(); + cacheKeys = new List(); } - dataTables.Add(dataTable); - - HttpContext.Current.Session["ReportDataTables"] = dataTables; + cacheKeys.Add(cacheKey); + HttpContext.Current.Session["ReportDataCacheKeys"] = cacheKeys; } - public static void AddFastreportParameter(Dictionary Dicparames) - { - HttpContext.Current.Session["ReportParameterValues"] = Dicparames; + /// + /// 添加报表参数到缓存 + /// + public static void AddFastreportParameter(Dictionary Dicparames) + { + // 生成唯一缓存键 + string cacheKey = $"ReportParam_{Guid.NewGuid()}_{DateTime.Now.Ticks}"; + + // 将参数存储到缓存中，设置5分钟过期 + CacheHelper.Add(cacheKey, Dicparames, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes)); + + // Session只存储缓存键的引用（轻量级） + HttpContext.Current.Session["ReportParameterCacheKey"] = cacheKey; } /// @@ -82,16 +127,8 @@ namespace BLL.Common } } - if (printType == "1") - { - FastReport.Export.Pdf.PDFExport exp = new FastReport.Export.Pdf.PDFExport(); - report.Export(exp, path); - } - else if (printType == "2") - { - FastReport.Export.OoXML.Word2007Export exportBase = new FastReport.Export.OoXML.Word2007Export(); - report.Export(export: exportBase, fileName: path.Replace(oldValue: "pdf", newValue: "docx")); - } + FastReport.Export.Pdf.PDFExport exp = new FastReport.Export.Pdf.PDFExport(); + report.Export(exp, path); } } } diff --git a/HJGL_DS/BLL/app.config b/HJGL_DS/BLL/app.config index 3e98c00..739e9c9 100644 --- a/HJGL_DS/BLL/app.config +++ b/HJGL_DS/BLL/app.config @@ -1,11 +1,11 @@ - + - - + + - + diff --git a/HJGL_DS/BLL/packages.config b/HJGL_DS/BLL/packages.config index 70c9fa9..3816bf3 100644 --- a/HJGL_DS/BLL/packages.config +++ b/HJGL_DS/BLL/packages.config @@ -4,4 +4,5 @@ + \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx index 516521b..d9e3b76 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx @@ -82,6 +82,9 @@ + + diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 6bfb6c8..6ef1abe 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs index 1ed337d..7543a84 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs @@ -171,17 +171,15 @@ namespace FineUIPro.Web.WeldMat.Stock protected void btnMoveStore_Click(object sender, EventArgs e) { //if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockMoveRecordsMenuId, BLL.Const.BtnMoveStore)) - if (this.CurrUser.UserId == "95eae1e8-ddb9-4b76-99f4-78a3636a398b") //焊材移库功能只能赵瑞霞操作 + if (this.CurrUser.UserId == "95eae1e8-ddb9-4b76-99f4-78a3636a398b" || this.CurrUser.Account == Const.Gly) //焊材移库功能只能赵瑞霞操作 { - if (CurrUser.Account != Const.Gly) - { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockMove.aspx", "移库 - "))); - } - else - { - Alert.ShowInTop("管理员不能操作！", MessageBoxIcon.Warning); - return; - } + //} + //else + //{ + // Alert.ShowInTop("管理员不能操作！", MessageBoxIcon.Warning); + // return; + //} } else { diff --git a/HJGL_DS/FineUIPro.Web/common/ReportPrint/Fastreport.aspx.cs b/HJGL_DS/FineUIPro.Web/common/ReportPrint/Fastreport.aspx.cs index a51e4a2..09ecb15 100644 --- a/HJGL_DS/FineUIPro.Web/common/ReportPrint/Fastreport.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/common/ReportPrint/Fastreport.aspx.cs @@ -29,14 +29,35 @@ namespace FineUIPro.Web.common.ReportPrint { get { - return (List)Session["ReportDataTables"]; + List dataTables = new List(); + var cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List; + if (cacheKeys != null) + { + foreach (var key in cacheKeys) + { + + var dataTable = CacheHelper.Get(key); + if (dataTable != null) + { + dataTables.Add(dataTable); + } + } + + } + return dataTables; } } public Dictionary ParameterValues { get { - return (Dictionary)Session["ReportParameterValues"]; + var cacheKey = Session["ReportParameterCacheKey"] as string; + if (!string.IsNullOrEmpty(cacheKey)) + { + return CacheHelper.Get>(cacheKey); + + } + return null; } } protected void Page_Load(object sender, EventArgs e) @@ -58,7 +79,10 @@ namespace FineUIPro.Web.common.ReportPrint WebReport1.Report.Save(ReportPath); } WebReport1.ReportFile = ReportPath; - WebReport1.Prepare(); + System.Threading.Tasks.Task.Run(() => + { + WebReport1.Prepare(); + }); // WebReport1.ExportPdf(); } private void demo() diff --git a/HJGL_DS/WebAPI/Web.config b/HJGL_DS/WebAPI/Web.config index 3df6799..593334c 100644 --- a/HJGL_DS/WebAPI/Web.config +++ b/HJGL_DS/WebAPI/Web.config @@ -1,79 +1,79 @@ - + - - - - + + + + - + - + - + - + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file