From ff055d1756e366510606dab4f629089b3dfad2bc Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Sat, 27 Jun 2026 10:31:20 +0800 Subject: [PATCH] =?UTF-8?q?20260627=20=E8=BF=94=E4=BF=AE=E6=89=A9=E6=8B=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../版本日志/HJGLDB_DS_2026-06-27_bwj.sql | 35 ++ HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json | 2 +- HJGL_DS/BLL/Common/FastReportService.cs | 204 +++------- HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 348 ++++++++++-------- .../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- HJGL_DS/FineUIPro.Web/Global.asax.cs | 2 +- .../RepairItemRecordTrust.aspx.cs | 10 +- .../RepairItemRecordTrustExtend.aspx.cs | 247 +++++++------ HJGL_DS/FineUIPro.Web/Web.config | 2 +- .../WeldMat/UsingSentMat/UsingMatCheck.aspx | 55 +-- .../UsingSentMat/UsingMatCheck.aspx.cs | 10 +- HJGL_DS/Model/.vs/Model.csproj.dtbcache.json | 2 +- HJGL_DS/Model/Model.cs | 72 +++- HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +- 15 files changed, 503 insertions(+), 491 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-06-27_bwj.sql diff --git a/.gitignore b/.gitignore index 5aa11bb..1198dea 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ bin-release/ *.xls /HJGL_DS/FineUIPro.Web/File/PDF/Pipe /HJGL_DS/FineUIPro.Web/File/Fastreport/Temp +/HJGL_DS/FineUIPro.Web/ReportPrint diff --git a/DataBase/版本日志/HJGLDB_DS_2026-06-27_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-06-27_bwj.sql new file mode 100644 index 0000000..56daba5 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-06-27_bwj.sql @@ -0,0 +1,35 @@ + + +--ίϸѯб +ALTER VIEW [dbo].[HJGL_View_CH_TrustItem] +/*ίϸѯб*/ +AS +SELECT TrustItem.CH_TrustItemID, --ίϸid + TrustItem.CH_TrustID, -- ίid + JointInfo.JOT_ID, --id + IsoInfo.BAW_ID, ---ʩid + JointInfo.InstallationId, --װid + Installation.InstallationName, + Trust.CH_TrustType, + Trust.CH_TrustDate, + IsoInfo.ISO_IsoNo, + JointInfo.JOT_JointNo, + TrustItem.CH_Remark, + CAST(JointInfo.JOT_Dia AS DECIMAL(18,2)) AS JOT_Dia, + JointInfo.JOT_Sch, + JointInfo.WLO_Code, + WeldMethod.WME_Name, + JointInfo.ProjectId, + JointInfo.WME_ID, + JointInfo.JOT_JointStatus, + TrustItem.FeedbackDate +FROM dbo.HJGL_PW_JointInfo AS JointInfo +LEFT JOIN dbo.HJGL_CH_TrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID +LEFT JOIN dbo.HJGL_CH_Trust AS Trust ON Trust.CH_TrustID=TrustItem.CH_TrustID +LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID +LEFT JOIN dbo.Project_Installation AS Installation ON JointInfo.InstallationId = Installation.InstallationId +LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID + +GO + + diff --git a/HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json b/HJGL_DS/BLL/.vs/BLL.csproj.dtbcache.json index 4f49498..9ece247 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":[],"References":[],"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":"E:\\鼎盛\\HJGL_DS_20260627\\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":"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\\CacheHelper.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\\OpenAIhelper.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\\Sys_DataInTempService.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\\ArchivalTransferService.cs"},{"SourceFile":"JGZL\\DocumentDescriptionService.cs"},{"SourceFile":"JGZL\\FileDirectoryService.cs"},{"SourceFile":"JGZL\\InsulationAcceptanceRecordItemService.cs"},{"SourceFile":"JGZL\\InsulationAcceptanceRecordService.cs"},{"SourceFile":"JGZL\\LeakTestOfPipelineSystemRecordItemService.cs"},{"SourceFile":"JGZL\\PressureTestOfPipelineSystemRecordItemService.cs"},{"SourceFile":"JGZL\\AnticorrosionEngineeringInspectionRecordItemService.cs"},{"SourceFile":"JGZL\\LeakTestOfPipelineSystemRecordService.cs"},{"SourceFile":"JGZL\\PressureTestOfPipelineSystemConfirmationRecordService.cs"},{"SourceFile":"JGZL\\PressureTestOfPipelineSystemRecordService.cs"},{"SourceFile":"JGZL\\AnticorrosionEngineeringInspectionRecordService.cs"},{"SourceFile":"JGZL\\BlowingCleaningItemService.cs"},{"SourceFile":"JGZL\\BlowingCleaningService.cs"},{"SourceFile":"JGZL\\CommencementReportService.cs"},{"SourceFile":"JGZL\\ConcealedWorksInspectionRecordService.cs"},{"SourceFile":"JGZL\\ConDrawingVerificationService.cs"},{"SourceFile":"JGZL\\ContactService.cs"},{"SourceFile":"JGZL\\ElectrostaticGroundingService.cs"},{"SourceFile":"JGZL\\HandoverCertificateService.cs"},{"SourceFile":"JGZL\\IndustrialPipelineInstallationQualityCertificateService.cs"},{"SourceFile":"JGZL\\IndustrialPipelineInstallationSummaryService.cs"},{"SourceFile":"JGZL\\MaterialIdentificationInspectionRecordService.cs"},{"SourceFile":"JGZL\\MaterialQualityCertificateDocService.cs"},{"SourceFile":"JGZL\\MeasuringInstrumentsService.cs"},{"SourceFile":"JGZL\\NDTPersonService.cs"},{"SourceFile":"JGZL\\PipeFittingInspectionRecordService.cs"},{"SourceFile":"JGZL\\PipelineInstallationInspectionRecordService.cs"},{"SourceFile":"JGZL\\PipelinePrefabricationConstructionInspectionRecordService.cs"},{"SourceFile":"JGZL\\ProcessHandoverRecordService.cs"},{"SourceFile":"JGZL\\QualityControlPointInspectionService.cs"},{"SourceFile":"JGZL\\SpecialEquipmentMaintenanceService.cs"},{"SourceFile":"JGZL\\SteelPipeCheckRecordItem1Service.cs"},{"SourceFile":"JGZL\\SteelPipeCheckRecordItem2Service.cs"},{"SourceFile":"JGZL\\SteelPipeCheckRecordService.cs"},{"SourceFile":"JGZL\\TeamWeldingInspectionItemService.cs"},{"SourceFile":"JGZL\\TeamWeldingInspectionService.cs"},{"SourceFile":"JGZL\\ValveInspectionTestRecordService.cs"},{"SourceFile":"JGZL\\ValveTestConfirmationFormService.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":"SYBData\\ApplicationFormService.cs"},{"SourceFile":"SYBData\\BlindFlangeInstallationAndRemovalService.cs"},{"SourceFile":"SYBData\\CoverService.cs"},{"SourceFile":"SYBData\\FinalitemListService.cs"},{"SourceFile":"SYBData\\PressureTestPackageListService.cs"},{"SourceFile":"SYBData\\SlidingFixedService.cs"},{"SourceFile":"SYBData\\SpringSupportHangBracketService.cs"},{"SourceFile":"SYBData\\SYBData_FileDirectoryService.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":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\BLL\\bin\\Release\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\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_20260627\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Bars.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Compat.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Editor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\FineUIPro\\Reference BLL\\FastReport.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\鼎盛\\HJGL_DS_20260627\\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_20260627\\HJGL_DS\\HJGL_DS\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\鼎盛\\HJGL_DS_20260627\\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":"E:\\鼎盛\\HJGL_DS_20260627\\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_20260627\\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_20260627\\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_20260627\\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_20260627\\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.Net.Http.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.Caching.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_20260627\\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/Common/FastReportService.cs b/HJGL_DS/BLL/Common/FastReportService.cs index 8bd5b05..8256bba 100644 --- a/HJGL_DS/BLL/Common/FastReportService.cs +++ b/HJGL_DS/BLL/Common/FastReportService.cs @@ -8,195 +8,78 @@ using System.Text; using System.Threading.Tasks; using System.Web; using System.Web.Security; -using System.Timers; -using System; -using FastReport.Export.Pdf; -using System.IO; namespace BLL.Common { public static class FastReportService { - private static Timer tempReportCleanupTimer; // 缓存过期时间：30分钟 private static readonly int CacheExpirationMinutes = 5; /// - /// 重置数据 + /// 重置数据 - 清理缓存和Session /// public static void ResetData() { - HttpContext.Current.Session["ReportDataTables"] = null; - HttpContext.Current.Session["ReportParameterValues"] = null; - } - public static void AddFastreportTable(DataTable dataTable) - { - List dataTables = (List)HttpContext.Current.Session["ReportDataTables"]; - if (dataTables == null) + if (HttpContext.Current?.Session == null) { - dataTables = new List(); - } - dataTables.Add(dataTable); - - HttpContext.Current.Session["ReportDataTables"] = dataTables; - } - public static void AddFastreportParameter(Dictionary Dicparames) - { - HttpContext.Current.Session["ReportParameterValues"] = Dicparames; - - } - - /// - /// 启动临时报表清理定时器，定期删除超过 1 小时的 PDF。 - /// - public static void StartTempReportCleanupMonitor() - { - if (tempReportCleanupTimer != null) - { - tempReportCleanupTimer.Stop(); - tempReportCleanupTimer.Dispose(); - tempReportCleanupTimer = null; + return; } - CleanExpiredTempReports(); - tempReportCleanupTimer = new Timer + // 清理Session中的缓存键引用 + var cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List; + if (cacheKeys != null) { - AutoReset = true, - Interval = 1000 * 60 * 30 - }; - tempReportCleanupTimer.Elapsed += TempReportCleanupTimer_Elapsed; - tempReportCleanupTimer.Start(); - } - - private static void TempReportCleanupTimer_Elapsed(object sender, ElapsedEventArgs e) - { - CleanExpiredTempReports(); - } - - /// - /// 删除 File/Fastreport/Temp 下创建时间超过 1 小时的 PDF 临时文件。 - /// - public static void CleanExpiredTempReports() - { - try - { - string tempDirectory = Path.Combine(Funs.RootPath, @"File\Fastreport\Temp\"); - if (!Directory.Exists(tempDirectory)) + foreach (var key in cacheKeys) { - return; - } - - DateTime expiredTime = DateTime.Now.AddHours(-1); - foreach (string file in Directory.GetFiles(tempDirectory, "*.pdf", SearchOption.TopDirectoryOnly)) - { - FileInfo fileInfo = new FileInfo(file); - if (fileInfo.CreationTime < expiredTime) + try { - fileInfo.Attributes = FileAttributes.Normal; - fileInfo.Delete(); + CacheHelper.Remove(key); + } + catch + { + // 忽略缓存删除异常 } } } - catch (Exception ex) - { - ErrLogInfo.WriteLog(ex, "FastReport临时报表清理", "FastReportService.CleanExpiredTempReports"); - } + HttpContext.Current.Session["ReportDataCacheKeys"] = null; + HttpContext.Current.Session["ReportParameterCacheKey"] = null; } /// - /// 导出报表 PDF 到临时目录，并返回可访问的相对 URL。 + /// 添加报表数据表到缓存 /// - /// 报表模板路径，支持绝对路径或相对 Funs.RootPath 的路径。 - public static string ExportReport(string reportPath) + public static void AddFastreportTable(DataTable dataTable) { - List dataTables = (List)HttpContext.Current.Session["ReportDataTables"]; - Dictionary parameterValues = (Dictionary)HttpContext.Current.Session["ReportParameterValues"]; - return ExportReport(reportPath, dataTables, parameterValues); + + // 生成唯一缓存键 + 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) + { + cacheKeys = new List(); + } + cacheKeys.Add(cacheKey); + HttpContext.Current.Session["ReportDataCacheKeys"] = cacheKeys; } /// - /// 导出报表 PDF 到临时目录，并返回可访问的相对 URL。 + /// 添加报表参数到缓存 /// - /// 报表模板路径，支持绝对路径或相对 Funs.RootPath 的路径。 - /// 报表数据源集合。 - /// 报表参数集合。 - public static string ExportReport(string reportPath, List dataTables, Dictionary parameterValues) - { - string fullReportPath = GetReportFullPath(reportPath); - if (string.IsNullOrEmpty(fullReportPath) || !File.Exists(fullReportPath)) - { - throw new FileNotFoundException("打印模板不存在！", reportPath); - } + public static void AddFastreportParameter(Dictionary Dicparames) + { + // 生成唯一缓存键 + string cacheKey = $"ReportParam_{Guid.NewGuid()}_{DateTime.Now.Ticks}"; - string relativeDirectory = @"File\Fastreport\Temp\"; - string tempDirectory = Path.Combine(Funs.RootPath, relativeDirectory); - if (!Directory.Exists(tempDirectory)) - { - Directory.CreateDirectory(tempDirectory); - } + // 将参数存储到缓存中，设置5分钟过期 + CacheHelper.Add(cacheKey, Dicparames, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes)); - string fileName = "report_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "_" + Guid.NewGuid().ToString("N") + ".pdf"; - string filePath = Path.Combine(tempDirectory, fileName); - using (Report report = BuildPreparedReport(fullReportPath, dataTables, parameterValues)) - using (PDFExport pdfExport = new PDFExport()) - { - // Web 打印先导出 PDF，前端用 iframe 装载后调用浏览器打印。 - pdfExport.PrintScaling = false; - pdfExport.ShowPrintDialog = true; - report.Export(pdfExport, filePath); - } - - return "~/" + relativeDirectory.Replace("\\", "/") + fileName; - } - - private static Report BuildPreparedReport(string reportPath, List dataTables, Dictionary parameterValues) - { - FastReport.Utils.Config.WebMode = true; - Report report = new Report(); - report.Load(reportPath); - if (report.Dictionary.Connections.Count > 0) - { - var reportConnection = report.Dictionary.Connections[0]; - if (reportConnection.ConnectionString != Funs.ConnString) - { - // 打印时只替换本次报表连接，避免把运行环境连接串写回模板文件。 - reportConnection.ConnectionString = Funs.ConnString; - } - } - - if (dataTables != null && dataTables.Count > 0) - { - for (int i = 0; i < dataTables.Count; i++) - { - report.RegisterData(dataTables[i], dataTables[i].TableName); - } - } - - if (parameterValues != null && parameterValues.Count > 0) - { - foreach (KeyValuePair kvp in parameterValues) - { - report.SetParameterValue(kvp.Key, kvp.Value); - } - } - - report.Prepare(); - return report; - } - - private static string GetReportFullPath(string reportPath) - { - if (string.IsNullOrEmpty(reportPath)) - { - return reportPath; - } - - if (Path.IsPathRooted(reportPath)) - { - return reportPath; - } - - return Path.Combine(Funs.RootPath, reportPath.TrimStart('\\', '/')); + // Session只存储缓存键的引用（轻量级） + HttpContext.Current.Session["ReportParameterCacheKey"] = cacheKey; } /// @@ -222,21 +105,26 @@ namespace BLL.Common { report.RegisterData(dataTables[j], dataTables[j].TableName);//绑定数据源 } + } if (ParameterValues.Count > 0) { foreach (KeyValuePair kvp in ParameterValues) { - report.SetParameterValue(kvp.Key, kvp.Value);//绑定参数 + report.SetParameterValue(kvp.Key, kvp.Value);//绑定参数 + } + } if (i == 0) { report.Prepare(); + } else { report.Prepare(true); + } } if (printType == "1") diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 2f6d20f..67d3094 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -362,7 +362,6 @@ - @@ -401,88 +400,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1562,6 +1480,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1738,32 +1739,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1818,6 +1793,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4591,13 +4624,6 @@ UnitEdit.aspx - - Fastreport.aspx - ASPXCodeBehind - - - Fastreport.aspx - EditOffice.aspx ASPXCodeBehind @@ -4857,27 +4883,6 @@ WorkAreaEdit.aspx - - CalculateChinaEx.aspx - ASPXCodeBehind - - - CalculateChinaEx.aspx - - - ExPrintSet.aspx - ASPXCodeBehind - - - ExPrintSet.aspx - - - ExReportPrint.aspx - ASPXCodeBehind - - - ExReportPrint.aspx - mainGdaz.aspx ASPXCodeBehind @@ -4885,27 +4890,6 @@ mainGdaz.aspx - - PrintDesigner.aspx - ASPXCodeBehind - - - PrintDesigner.aspx - - - ReadExReportFile.aspx - ASPXCodeBehind - - - ReadExReportFile.aspx - - - SaveTabFile.aspx - ASPXCodeBehind - - - SaveTabFile.aspx - EditLawRegulation.aspx ASPXCodeBehind @@ -7566,6 +7550,55 @@ ASPXCodeBehind + + CalculateChinaEx.aspx + ASPXCodeBehind + + + CalculateChinaEx.aspx + + + ExPrintSet.aspx + ASPXCodeBehind + + + ExPrintSet.aspx + + + ExReportPrint.aspx + ASPXCodeBehind + + + ExReportPrint.aspx + + + Fastreport.aspx + ASPXCodeBehind + + + Fastreport.aspx + + + PrintDesigner.aspx + ASPXCodeBehind + + + PrintDesigner.aspx + + + ReadExReportFile.aspx + ASPXCodeBehind + + + ReadExReportFile.aspx + + + SaveTabFile.aspx + ASPXCodeBehind + + + SaveTabFile.aspx + ApplicationForm.aspx ASPXCodeBehind @@ -8565,7 +8598,6 @@ - diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 80f7761..e3436b8 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,4 +1,4 @@ - + true diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index edd3b97..82dc829 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -37,7 +37,7 @@ Funs.APPUrl = ConfigurationManager.AppSettings["APPUrl"]; Funs.SystemCode = ConfigurationManager.AppSettings["SystemCode"]; Funs.HJGLUrl = ConfigurationManager.AppSettings["HJGLUrl"]; - BLL.Common.FastReportService.StartTempReportCleanupMonitor(); + //BLL.Common.FastReportService.StartTempReportCleanupMonitor(); } catch (Exception ex) { diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs index 26f3cba..17cce64 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs @@ -455,11 +455,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage { if (ndtInfo.NDT_Code == "RT") { - newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_Level).Value; + if (!string.IsNullOrEmpty(weldControl.Joty_Level)) + { + newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_Level).Value; + } } else { - newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_C_Level).Value; + if (!string.IsNullOrEmpty(weldControl.Joty_C_Level)) + { + newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_C_Level).Value; + } } } BLL.HJGL_RepairService.AddCH_Repair(newRepair); diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs index ae281b3..fd11bc7 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs @@ -128,6 +128,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage ViewState["WelderId2"] = value; } } + // 页面类内新增私有字段 + private Dictionary _dicBD; + private Dictionary _dicBatch; + private List _trustItemAll; + private List _hotResultAll; + private List _hardResultAll; + private List _hardTestItemAll; + private Model.HJGL_BS_NDTType _ndtTypeGlobal; #endregion #region 加载页面 @@ -201,17 +209,79 @@ namespace FineUIPro.Web.HJGL.WeldingManage // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); Grid1.RecordCount = tb.Rows.Count; - tb = GetFilteredTable(Grid1.FilteredData, tb); + //tb = GetFilteredTable(Grid1.FilteredData, tb); var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; Grid1.DataBind(); for (int i = 0; i < this.Grid1.Rows.Count; i++) { + Model.HJGL_BS_NDTType ndtType = BLL.HJGL_TestingService.GetTestingByTestingId(NDT_ID); + if (ndtType != null) + { + this.Grid1.Rows[i].Values[8] = ndtType.NDT_Code; + } System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[i].FindControl("hdBatchDetailId")); var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value); - if (batchDetail != null && !string.IsNullOrEmpty(batchDetail.ToRepairId)) + if (batchDetail != null) { - this.Grid1.Rows[i].Values[6] = BLL.Const._True; + if (!string.IsNullOrEmpty(batchDetail.ToRepairId)) + { + this.Grid1.Rows[i].Values[6] = BLL.Const._True; + } + if (!string.IsNullOrEmpty(batchDetail.JOT_ID)) + { + var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId); + if (batch != null) + { + //委托日期 + var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId); + if (trustItem != null) + { + var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID); + if (trust != null) + { + if (trust.CH_TrustDate.HasValue) + { + this.Grid1.Rows[i].Values[10] = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate); + } + } + if (trustItem.FeedbackDate.HasValue) + { + this.Grid1.Rows[i].Values[11] = string.Format("{0:yyyy-MM-dd}", trustItem.FeedbackDate); + } + } + + //热处理合格 + var hotPass = Funs.DB.HJGL_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID); + if (hotPass != null) + { + if (hotPass.IsOK == true) + { + this.Grid1.Rows[i].Values[15] = true; + } + } + //硬度合格 + var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); + if (hardPass != null) + { + if (hardPass.IsOK == true) + { + this.Grid1.Rows[i].Values[16] = true; + } + } + var hotProessTrustItem = Funs.DB.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.TrustDate != null); + if (hotProessTrustItem != null) + { + this.Grid1.Rows[i].Values[17] = true; + } + //硬度委托 + var hotHard = from x in Funs.DB.HJGL_CH_HardTestReportItem where x.JOT_ID == batchDetail.JOT_ID select x; + if (hotHard.Count() > 0) + { + this.Grid1.Rows[i].Values[18] = true; + } + } + } } } } @@ -225,110 +295,77 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) { - //System.Web.UI.WebControls.CheckBoxList cblNDT = (System.Web.UI.WebControls.CheckBoxList)(this.Grid1.Rows[e.RowIndex].FindControl("cblNDT")); - System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[e.RowIndex].FindControl("hdBatchDetailId")); - System.Web.UI.WebControls.Label lblTrustDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblTrustDate"));//委托日期 - System.Web.UI.WebControls.Label lblCheckDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblCheckDate"));//检测时间 - System.Web.UI.WebControls.CheckBox cbHotPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotPass"));//热处理合格 - System.Web.UI.WebControls.CheckBox cbHardPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHardPass"));//硬度合格 - System.Web.UI.WebControls.CheckBox cbHotTrust = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotTrust"));//热处理委托 - System.Web.UI.WebControls.CheckBox cbHotHard = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotHard"));//硬度委托 + //System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[e.RowIndex].FindControl("hdBatchDetailId")); + //System.Web.UI.WebControls.Label lblTrustDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblTrustDate"));//委托日期 + //System.Web.UI.WebControls.Label lblCheckDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblCheckDate"));//检测时间 + //System.Web.UI.WebControls.CheckBox cbHotPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotPass"));//热处理合格 + //System.Web.UI.WebControls.CheckBox cbHardPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHardPass"));//硬度合格 + //System.Web.UI.WebControls.CheckBox cbHotTrust = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotTrust"));//热处理委托 + //System.Web.UI.WebControls.CheckBox cbHotHard = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotHard"));//硬度委托 - //cblNDT.DataTextField = "NDT_Code"; - //cblNDT.DataValueField = "NDT_ID"; - //cblNDT.DataSource = BLL.HJGL_TestingService.GetNDTTypeNameList(); - //cblNDT.DataBind(); + //var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value); - var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value); - - if (batchDetail != null) - { - var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId); - //if (!string.IsNullOrEmpty(batchDetail.NDT)) - //{ - // List ndtIds = batchDetail.NDT.Split(',').ToList(); - // foreach (var ndtId in ndtIds) - // { - // for (int i = 0; i < cblNDT.Items.Count; i++) - // { - // if (cblNDT.Items[i].Value == ndtId) - // { - // cblNDT.Items[i].Selected = true; - // } - // } - // } - //} - Model.HJGL_BS_NDTType ndtType = BLL.HJGL_TestingService.GetTestingByTestingId(NDT_ID); - if (ndtType != null) - { - this.Grid1.Rows[e.RowIndex].Values[8] = ndtType.NDT_Code; - } - if (!string.IsNullOrEmpty(batchDetail.JOT_ID)) - { - //委托日期 - var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId); - if (trustItem != null) - { - var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID); - if (trust != null) - { - if (trust.CH_TrustDate != null) - { - lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate); - } - } - } - //检验时间（有问题） - //var checkItem = BLL.HJGL_CheckItemManageService.GetCheckItemByJotId(batchDetail.JOT_ID); - //if (checkItem != null) - //{ - // var check = Funs.DB.HJGL_CH_Check.FirstOrDefault(x => x.CHT_CheckID == checkItem.CHT_CheckID && x.ProjectId == batch.ProjectId); - // if (check != null) - // { - // if (check.CHT_CheckDate != null) - // { - // lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", check.CHT_CheckDate); - // } - // } - //} - var trustItem1 = Funs.DB.HJGL_CH_TrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID); - if (trustItem1 != null && trustItem1.FeedbackDate != null) - { - lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", trustItem1.FeedbackDate); - } - //热处理合格 - var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); - if (hotPass != null) - { - if (hotPass.IsOK == true) - { - cbHotPass.Checked = true; - } - } - //硬度合格 - var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); - if (hardPass != null) - { - if (hardPass.IsOK == true) - { - cbHardPass.Checked = true; - } - } - //是否热处理 - var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null); - if (hotProessTrustItem != null) - { - cbHotTrust.Checked = true; - } - //硬度委托 - var hotHard = from x in Funs.DB.HJGL_CH_HardTestReportItem where x.JOT_ID == batchDetail.JOT_ID select x; - //var hotHard = Funs.DB.HJGL_View_HotHardItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); - if (hotHard.Count() > 0) - { - cbHotHard.Checked = true; - } - } - } + //if (batchDetail != null) + //{ + // var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId); + // //Model.HJGL_BS_NDTType ndtType = BLL.HJGL_TestingService.GetTestingByTestingId(NDT_ID); + // //if (ndtType != null) + // //{ + // // this.Grid1.Rows[e.RowIndex].Values[8] = ndtType.NDT_Code; + // //} + // if (!string.IsNullOrEmpty(batchDetail.JOT_ID)) + // { + // //委托日期 + // var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId); + // if (trustItem != null) + // { + // var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID); + // if (trust != null) + // { + // if (trust.CH_TrustDate != null) + // { + // lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate); + // } + // } + // } + // var trustItem1 = Funs.DB.HJGL_CH_TrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID); + // if (trustItem1 != null && trustItem1.FeedbackDate != null) + // { + // lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", trustItem1.FeedbackDate); + // } + // //热处理合格 + // var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); + // if (hotPass != null) + // { + // if (hotPass.IsOK == true) + // { + // cbHotPass.Checked = true; + // } + // } + // //硬度合格 + // var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); + // if (hardPass != null) + // { + // if (hardPass.IsOK == true) + // { + // cbHardPass.Checked = true; + // } + // } + // //是否热处理 + // var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null); + // if (hotProessTrustItem != null) + // { + // cbHotTrust.Checked = true; + // } + // //硬度委托 + // var hotHard = from x in Funs.DB.HJGL_CH_HardTestReportItem where x.JOT_ID == batchDetail.JOT_ID select x; + // //var hotHard = Funs.DB.HJGL_View_HotHardItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); + // if (hotHard.Count() > 0) + // { + // cbHotHard.Checked = true; + // } + // } + //} } #endregion diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 070a5f8..3c98f31 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/UsingSentMat/UsingMatCheck.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx index 45873cd..002c995 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx @@ -80,64 +80,15 @@ var result = window.showModalDialog("LC700.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=600px;dialogHeight=280px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no"); } - //function ReportPrint(reportId, replaceParameter, varValue) { - // var result = window.showModalDialog("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&projectId=0&reportId=" + reportId + "&replaceParameter=" + replaceParameter + "&varValue=" + varValue, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no"); - //} + function ReportPrint(reportId, replaceParameter, varValue) { + var result = window.showModalDialog("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&projectId=0&reportId=" + reportId + "&replaceParameter=" + replaceParameter + "&varValue=" + varValue, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no"); + } function backData(data) { //debugger //alert(data); alert("焊工已确认领料!"); } - - function printByHiddenFrame(url) { - var frameId = 'fastreport-print-frame-' + new Date().getTime(); - var frame = document.createElement('iframe'); - frame.id = frameId; - frame.name = frameId; - frame.style.position = 'fixed'; - frame.style.left = '-10000px'; - frame.style.top = '-10000px'; - frame.style.width = '1px'; - frame.style.height = '1px'; - frame.style.border = '0'; - frame.style.opacity = '0'; - frame.onload = function () { - setTimeout(function () { - try { - frame.contentWindow.onafterprint = cleanupPrintFrame; - frame.contentWindow.focus(); - frame.contentWindow.print(); - } catch (e) { - window.print(); - } - }, 500); - }; - frame.src = url; - document.body.appendChild(frame); - var cleaned = false; - function cleanupPrintFrame() { - if (cleaned) { - return; - } - cleaned = true; - if (frame && frame.parentNode) { - frame.parentNode.removeChild(frame); - } - window.removeEventListener('afterprint', cleanupPrintFrame); - } - window.addEventListener('afterprint', cleanupPrintFrame); - setTimeout(cleanupPrintFrame, 300000); - } - window.addEventListener('message', function (event) { - if (!event.data || event.data.type !== 'fastreport-print-finished') { - return; - } - var frame = document.getElementById(event.data.frameId); - if (frame && frame.parentNode) { - frame.parentNode.removeChild(frame); - } - }); diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs index fb6889b..cf65eb1 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs @@ -238,6 +238,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat #region 打印 protected void btnPrinter_Click(object sender, EventArgs e) { + BLL.Common.FastReportService.ResetData(); //string reportId = BLL.Const.CLGL_MaterialLabelReportId; //ClientScript.RegisterStartupScript(ClientScript.GetType(), "", ""); string keyId = Request.Params["keyId"]; @@ -305,8 +306,6 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat keyValuePairs.Add("Number", number); keyValuePairs.Add("StoreName", storeName); keyValuePairs.Add("UsingDate", usingDate); - - BLL.Common.FastReportService.ResetData(); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); string initTemplatePath = ""; @@ -316,11 +315,8 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat if (File.Exists(rootPath + initTemplatePath)) { - //PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); - string printUrl = ResolveUrl(BLL.Common.FastReportService.ExportReport(rootPath + initTemplatePath)); - PageContext.RegisterStartupScript(String.Format("printByHiddenFrame('{0}');", printUrl)); - Window2.Hidden = true; - Window2.IFrameUrl = ""; + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } } } diff --git a/HJGL_DS/Model/.vs/Model.csproj.dtbcache.json b/HJGL_DS/Model/.vs/Model.csproj.dtbcache.json index 00f3492..e81df4b 100644 --- a/HJGL_DS/Model/.vs/Model.csproj.dtbcache.json +++ b/HJGL_DS/Model/.vs/Model.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"G:\\公司项目\\鼎盛\\HJGL_DS\\Model","ProjectFileName":"Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIItem\\BaseProjectItem.cs"},{"SourceFile":"APIItem\\BaseTeamgroupItem.cs"},{"SourceFile":"APIItem\\BaseUnitItem.cs"},{"SourceFile":"APIItem\\BSteelItem.cs"},{"SourceFile":"APIItem\\IsoInfoItem.cs"},{"SourceFile":"APIItem\\LocationItem.cs"},{"SourceFile":"APIItem\\ParmItem.cs"},{"SourceFile":"APIItem\\UsepositionItem.cs"},{"SourceFile":"APIItem\\UserItem.cs"},{"SourceFile":"APIItem\\UsingPlanItem.cs"},{"SourceFile":"APIItem\\WelderItem.cs"},{"SourceFile":"APIItem\\WeldInfoItem.cs"},{"SourceFile":"APIItem\\WeldingSynItem.cs"},{"SourceFile":"APIItem\\JointInfoItem.cs"},{"SourceFile":"APIItem\\ResponeData.cs"},{"SourceFile":"APIItem\\UnitInfoItem.cs"},{"SourceFile":"BlowingCleaningItem.cs"},{"SourceFile":"Chart\\DataSourceChart.cs"},{"SourceFile":"Chart\\DataSourcePoint.cs"},{"SourceFile":"Chart\\DataSourceTeam.cs"},{"SourceFile":"CQMS\\CQMS_Incentive_IncentiveNewPerson.cs"},{"SourceFile":"CQMS\\CQMS_ProjectCheckItem.cs"},{"SourceFile":"CQMS_CheckControl.cs"},{"SourceFile":"ErrorInfo.cs"},{"SourceFile":"FastReportItem.cs"},{"SourceFile":"GJSX\\SpGetInfoCount.cs"},{"SourceFile":"HandleStep.cs"},{"SourceFile":"HJGL\\HJGL_SpRptBawZlfx.cs"},{"SourceFile":"HJGL\\HJGL_SpRptIsoAnalyze.cs"},{"SourceFile":"HJGL\\HJGL_SpRptIsoYzazjd.cs"},{"SourceFile":"HJGL\\HJGL_SpRptndtReport.cs"},{"SourceFile":"HJGL\\HJGL_SpRptService.cs"},{"SourceFile":"HJGL\\HJGL_SpRptUnitBawAnalyze.cs"},{"SourceFile":"HJGL\\HJGL_SpRpWelderPerformance.cs"},{"SourceFile":"HJGL\\HJGL_SpRpWeldReportExport.cs"},{"SourceFile":"HJGL\\HJGL_SpRpWeldReportItem.cs"},{"SourceFile":"HSSE\\HSSE_DayReportDetail.cs"},{"SourceFile":"HSSE\\HSSE_HazardTemplate.cs"},{"SourceFile":"HSSE\\HSSE_IncentiveNewPerson.cs"},{"SourceFile":"HSSE\\HSSE_ProjectCheckItem.cs"},{"SourceFile":"Model.cs"},{"SourceFile":"ModelProc.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"QualityRatingItem.cs"},{"SourceFile":"SpCheckNonFilmingItem.cs"},{"SourceFile":"SpSysMenuItem.cs"},{"SourceFile":"SpSysUserItem.cs"},{"SourceFile":"SpTDesktopItem.cs"},{"SourceFile":"ToDoItem.cs"},{"SourceFile":"WBSDetailItem.cs"},{"SourceFile":"WBSSetInitItem.cs"},{"SourceFile":"WBSSetItem.cs"},{"SourceFile":"Welder.cs"},{"SourceFile":"YLRQ\\PV_QualityRatingItem.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.CSharp\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\鼎盛\\HJGL_DS\\packages\\Newtonsoft.Json.12.0.1\\lib\\net40\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.DataSetExtensions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_64\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Web.DataVisualization\\v4.0_4.0.0.0__31bf3856ad364e35\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"G:\\公司项目\\鼎盛\\HJGL_DS\\Model\\bin\\Debug\\Model.dll","OutputItemRelativePath":"Model.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"E:\\鼎盛\\HJGL_DS_20260627\\HJGL_DS\\HJGL_DS\\Model","ProjectFileName":"Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIItem\\BaseProjectItem.cs"},{"SourceFile":"APIItem\\BaseTeamgroupItem.cs"},{"SourceFile":"APIItem\\BaseUnitItem.cs"},{"SourceFile":"APIItem\\BSteelItem.cs"},{"SourceFile":"APIItem\\IsoInfoItem.cs"},{"SourceFile":"APIItem\\LocationItem.cs"},{"SourceFile":"APIItem\\ParmItem.cs"},{"SourceFile":"APIItem\\UsepositionItem.cs"},{"SourceFile":"APIItem\\UserItem.cs"},{"SourceFile":"APIItem\\UsingPlanItem.cs"},{"SourceFile":"APIItem\\WelderItem.cs"},{"SourceFile":"APIItem\\WeldInfoItem.cs"},{"SourceFile":"APIItem\\WeldingSynItem.cs"},{"SourceFile":"APIItem\\JointInfoItem.cs"},{"SourceFile":"APIItem\\ResponeData.cs"},{"SourceFile":"APIItem\\UnitInfoItem.cs"},{"SourceFile":"BlowingCleaningItem.cs"},{"SourceFile":"Chart\\DataSourceChart.cs"},{"SourceFile":"Chart\\DataSourcePoint.cs"},{"SourceFile":"Chart\\DataSourceTeam.cs"},{"SourceFile":"CQMS\\CQMS_Incentive_IncentiveNewPerson.cs"},{"SourceFile":"CQMS\\CQMS_ProjectCheckItem.cs"},{"SourceFile":"CQMS_CheckControl.cs"},{"SourceFile":"ErrorInfo.cs"},{"SourceFile":"FastReportItem.cs"},{"SourceFile":"GJSX\\SpGetInfoCount.cs"},{"SourceFile":"HandleStep.cs"},{"SourceFile":"HJGL\\HJGL_SpRptBawZlfx.cs"},{"SourceFile":"HJGL\\HJGL_SpRptIsoAnalyze.cs"},{"SourceFile":"HJGL\\HJGL_SpRptIsoYzazjd.cs"},{"SourceFile":"HJGL\\HJGL_SpRptndtReport.cs"},{"SourceFile":"HJGL\\HJGL_SpRptService.cs"},{"SourceFile":"HJGL\\HJGL_SpRptUnitBawAnalyze.cs"},{"SourceFile":"HJGL\\HJGL_SpRpWelderPerformance.cs"},{"SourceFile":"HJGL\\HJGL_SpRpWeldReportExport.cs"},{"SourceFile":"HJGL\\HJGL_SpRpWeldReportItem.cs"},{"SourceFile":"HJGL\\JGZL_CheckResultsSummary.cs"},{"SourceFile":"HSSE\\HSSE_DayReportDetail.cs"},{"SourceFile":"HSSE\\HSSE_HazardTemplate.cs"},{"SourceFile":"HSSE\\HSSE_IncentiveNewPerson.cs"},{"SourceFile":"HSSE\\HSSE_ProjectCheckItem.cs"},{"SourceFile":"Model.cs"},{"SourceFile":"ModelProc.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"QualityRatingItem.cs"},{"SourceFile":"SpCheckNonFilmingItem.cs"},{"SourceFile":"SpSysMenuItem.cs"},{"SourceFile":"SpSysUserItem.cs"},{"SourceFile":"SpTDesktopItem.cs"},{"SourceFile":"ToDoItem.cs"},{"SourceFile":"WBSDetailItem.cs"},{"SourceFile":"WBSSetInitItem.cs"},{"SourceFile":"WBSSetItem.cs"},{"SourceFile":"Welder.cs"},{"SourceFile":"YLRQ\\PV_QualityRatingItem.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"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:\\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_20260627\\HJGL_DS\\HJGL_DS\\Model\\bin\\Debug\\Newtonsoft.Json.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.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.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_20260627\\HJGL_DS\\HJGL_DS\\Model\\bin\\Debug\\Model.dll","OutputItemRelativePath":"Model.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 8bc48bc..d10e837 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -4794,6 +4794,10 @@ namespace Model private string _BodyMaterial; + private string _MapCoordinates; + + private string _ProjectAddress; + private EntitySet _Base_Organization; private EntitySet _Base_PrintFileCode; @@ -5036,6 +5040,10 @@ namespace Model partial void OnProductNumChanged(); partial void OnBodyMaterialChanging(string value); partial void OnBodyMaterialChanged(); + partial void OnMapCoordinatesChanging(string value); + partial void OnMapCoordinatesChanged(); + partial void OnProjectAddressChanging(string value); + partial void OnProjectAddressChanged(); #endregion public Base_Project() @@ -5626,6 +5634,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MapCoordinates", DbType="NVarChar(50)")] + public string MapCoordinates + { + get + { + return this._MapCoordinates; + } + set + { + if ((this._MapCoordinates != value)) + { + this.OnMapCoordinatesChanging(value); + this.SendPropertyChanging(); + this._MapCoordinates = value; + this.SendPropertyChanged("MapCoordinates"); + this.OnMapCoordinatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectAddress", DbType="NVarChar(100)")] + public string ProjectAddress + { + get + { + return this._ProjectAddress; + } + set + { + if ((this._ProjectAddress != value)) + { + this.OnProjectAddressChanging(value); + this.SendPropertyChanging(); + this._ProjectAddress = value; + this.SendPropertyChanged("ProjectAddress"); + this.OnProjectAddressChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Organization_Base_Project", Storage="_Base_Organization", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Base_Organization { @@ -62949,6 +62997,8 @@ namespace Model private string _JOT_JointStatus; + private System.Nullable _FeedbackDate; + public HJGL_View_CH_TrustItem() { } @@ -63240,6 +63290,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FeedbackDate", DbType="DateTime")] + public System.Nullable FeedbackDate + { + get + { + return this._FeedbackDate; + } + set + { + if ((this._FeedbackDate != value)) + { + this._FeedbackDate = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_View_CheckResult")] @@ -64675,7 +64741,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatName", DbType="VarChar(101) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatName", DbType="NVarChar(101) NOT NULL", CanBeNull=false)] public string WMT_MatName { get @@ -66548,7 +66614,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMat", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMat", DbType="NVarChar(50)")] public string WeldMat { get @@ -66564,7 +66630,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilk", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilk", DbType="NVarChar(50)")] public string WeldSilk { get diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,4 +1,4 @@ - + Release|Any CPU