diff --git a/.vs/Basf_TCC7/v17/.wsuo b/.vs/Basf_TCC7/v17/.wsuo new file mode 100644 index 0000000..60614da Binary files /dev/null and b/.vs/Basf_TCC7/v17/.wsuo differ diff --git a/.vs/Basf_TCC7/v17/DocumentLayout.json b/.vs/Basf_TCC7/v17/DocumentLayout.json new file mode 100644 index 0000000..10aa578 --- /dev/null +++ b/.vs/Basf_TCC7/v17/DocumentLayout.json @@ -0,0 +1,79 @@ +{ + "Version": 1, + "WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u6E5B\u6C5F\u5DF4\u65AF\u592B\\Basf_TCC7\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 1, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedHeight": 191, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}" + }, + { + "$type": "Bookmark", + "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}" + }, + { + "$type": "Bookmark", + "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..519f2fb --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\HJGL.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/CreateModel_lpf.bat b/CreateModel_lpf.bat new file mode 100644 index 0000000..e2180e4 --- /dev/null +++ b/CreateModel_lpf.bat @@ -0,0 +1,33 @@ +@echo off +REM --------------- +REM 发布包生成工具 +REM 执行此文件前请先用Release生成WebOA项目 +REM -------------- + + + +REM -------------- +REM 环境变量设置 Project_Src为如WebOA这样的分支 +REM -------------- +set PROJECT_SRC=%CD% +cd.. + +REM 源代码Model项目文件夹 +set Model_ROOT=%PROJECT_SRC%\HJGL\Model + + +REM -------------- +REM 发布程序包文件夹相关 +REM -------------- + + + + +@echo 设置.net控制台环境 +@echo. +@call "D:\Visual Studio 2022\Common7\Tools\VsDevCmd.bat" + +SqlMetal /views /server:.\MSSQLSERVER2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model + +@ECHO 完成 +pause diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 1963de0..c23448e 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,10 +250,10 @@ - + - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 6f6a2c4..374343b 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/.vs/BLL.csproj.dtbcache.json b/HJGL/BLL/.vs/BLL.csproj.dtbcache.json index 24dfe9a..d380fb1 100644 --- a/HJGL/BLL/.vs/BLL.csproj.dtbcache.json +++ b/HJGL/BLL/.vs/BLL.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIService\\APIBaseInfoService.cs"},{"SourceFile":"APIService\\APIPreWeldingDailyService.cs"},{"SourceFile":"APIService\\APIReportQueryService.cs"},{"SourceFile":"APIService\\APIWelderService.cs"},{"SourceFile":"APIService\\APIUserService.cs"},{"SourceFile":"APIService\\APICheckService.cs"},{"SourceFile":"APIService\\APIMessagePushService.cs"},{"SourceFile":"Common\\AttachFileService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_ProjectTypeService.cs"},{"SourceFile":"Common\\MailHelper.cs"},{"SourceFile":"Common\\ProjectSet\\Base_ProjectService.cs"},{"SourceFile":"Common\\ProjectSet\\Base_UnitService.cs"},{"SourceFile":"Common\\ChartControlService.cs"},{"SourceFile":"Common\\ConstValue.cs"},{"SourceFile":"Common\\ProjectSet\\Project_InstallationService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_ProjectPictureService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_WorkAreaService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UnitService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserService.cs"},{"SourceFile":"Common\\ProjectSet\\Sys_SetService.cs"},{"SourceFile":"Common\\ProjectSet\\Welder_ProjectWelderService.cs"},{"SourceFile":"Common\\ProjectSet\\Welder_TeamGroupService.cs"},{"SourceFile":"Common\\ReportPrint\\Common_ReportPrintService.cs"},{"SourceFile":"Common\\SysManage\\Sys_LogService.cs"},{"SourceFile":"Common\\SysManage\\Sys_RoleService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserService.cs"},{"SourceFile":"Common\\UploadAttachmentService.cs"},{"SourceFile":"Common\\CommonService.cs"},{"SourceFile":"Common\\Const.cs"},{"SourceFile":"NPOIHelper.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PIPClassService.cs"},{"SourceFile":"Schedule\\TaskScheduleService.cs"},{"SourceFile":"SendEmail\\Email_ParamsService.cs"},{"SourceFile":"SendEmail\\Email_PopService.cs"},{"SourceFile":"SendEmail\\Email_SendLogService.cs"},{"SourceFile":"SendEmail\\Email_SendTemplateService.cs"},{"SourceFile":"SendEmail\\Email_ToPeopleService.cs"},{"SourceFile":"WelderManage\\WelderQualifiedService.cs"},{"SourceFile":"WelderManage\\WelderService.cs"},{"SourceFile":"DropListService.cs"},{"SourceFile":"DynamicTHeaderHepler.cs"},{"SourceFile":"ErrLogInfo.cs"},{"SourceFile":"FriendlyException.cs"},{"SourceFile":"Funs.cs"},{"SourceFile":"HotProcessHard\\Hard_ReportService.cs"},{"SourceFile":"HotProcessHard\\Hard_TrustItemService.cs"},{"SourceFile":"HotProcessHard\\Hard_TrustService.cs"},{"SourceFile":"HotProcessHard\\HotProessReportService.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustItemService.cs"},{"SourceFile":"HotProcessHard\\HotProess_TrustService.cs"},{"SourceFile":"MethodRefelect.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_ComponentsService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_ConsumablesService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DefectService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DetectionRateService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DetectionTypeService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DNCompareService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_GrooveTypeService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_MaterialService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_MediumService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PipingClassDetailService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PipingClassService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PressureService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_WeldingLocationServie.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_WeldingMethodService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_WeldTypeService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_CompanyStandardsService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_DomesticLawsRegulationsService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_DomesticStandardsService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_ForeignStandardsService.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQListService.cs"},{"SourceFile":"SendEmailService.cs"},{"SourceFile":"SessionName.cs"},{"SourceFile":"SoftRegeditService.cs"},{"SourceFile":"SQLHelper.cs"},{"SourceFile":"Common\\UploadFileService.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\Batch_NDEItemService.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\Batch_NDEService.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairRecordService.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataInTempService.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegation_Service.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\AItemEndCheckService.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\BItemEndCheckService.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageAuditService.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageEditService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_BatchTrustItemService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_BatchTrustService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_PointBatchItemService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_PointBatchService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_PipelineDetectionTypeService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_PipelineService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_WeldingDailyService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_WeldJointService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PreWeldReportService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\UserShowColumnsService.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Portable.BouncyCastle.1.8.6\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\EmitMapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\BLL\\bin\\Debug\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\SharpZipLib.1.2.0\\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.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files (x86)\\Microsoft SQL Server\\130\\SDK\\Assemblies\\Microsoft.SQLServer.ManagedDTS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Newtonsoft.Json.12.0.1\\lib\\net40\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\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.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\BLL\\bin\\Debug\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\BLL\\bin\\Debug\\BLL.pdb","OutputItemRelativePath":"BLL.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIService\\APIBaseInfoService.cs"},{"SourceFile":"APIService\\APIPreWeldingDailyService.cs"},{"SourceFile":"APIService\\APIReportQueryService.cs"},{"SourceFile":"APIService\\APIWelderService.cs"},{"SourceFile":"APIService\\APIUserService.cs"},{"SourceFile":"APIService\\APICheckService.cs"},{"SourceFile":"APIService\\APIMessagePushService.cs"},{"SourceFile":"Common\\AttachFileService.cs"},{"SourceFile":"Common\\BaseInfo\\Base_ProjectTypeService.cs"},{"SourceFile":"Common\\MailHelper.cs"},{"SourceFile":"Common\\ProjectSet\\Base_ProjectService.cs"},{"SourceFile":"Common\\ProjectSet\\Base_UnitService.cs"},{"SourceFile":"Common\\ChartControlService.cs"},{"SourceFile":"Common\\ConstValue.cs"},{"SourceFile":"Common\\ProjectSet\\Project_InstallationService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_ProjectPictureService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_WorkAreaService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UnitService.cs"},{"SourceFile":"Common\\ProjectSet\\Project_UserService.cs"},{"SourceFile":"Common\\ProjectSet\\Sys_SetService.cs"},{"SourceFile":"Common\\ProjectSet\\Welder_ProjectWelderService.cs"},{"SourceFile":"Common\\ProjectSet\\Welder_TeamGroupService.cs"},{"SourceFile":"Common\\ReportPrint\\Common_ReportPrintService.cs"},{"SourceFile":"Common\\SysManage\\Sys_LogService.cs"},{"SourceFile":"Common\\SysManage\\Sys_RoleService.cs"},{"SourceFile":"Common\\SysManage\\Sys_UserService.cs"},{"SourceFile":"Common\\UploadAttachmentService.cs"},{"SourceFile":"Common\\CommonService.cs"},{"SourceFile":"Common\\Const.cs"},{"SourceFile":"NPOIHelper.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PIPClassService.cs"},{"SourceFile":"Schedule\\TaskScheduleService.cs"},{"SourceFile":"SendEmail\\Email_ParamsService.cs"},{"SourceFile":"SendEmail\\Email_PopService.cs"},{"SourceFile":"SendEmail\\Email_SendLogService.cs"},{"SourceFile":"SendEmail\\Email_SendTemplateService.cs"},{"SourceFile":"SendEmail\\Email_ToPeopleService.cs"},{"SourceFile":"WelderManage\\WelderQualifiedService.cs"},{"SourceFile":"WelderManage\\WelderService.cs"},{"SourceFile":"DropListService.cs"},{"SourceFile":"DynamicTHeaderHepler.cs"},{"SourceFile":"ErrLogInfo.cs"},{"SourceFile":"FriendlyException.cs"},{"SourceFile":"Funs.cs"},{"SourceFile":"HotProcessHard\\Hard_ReportService.cs"},{"SourceFile":"HotProcessHard\\Hard_TrustItemService.cs"},{"SourceFile":"HotProcessHard\\Hard_TrustService.cs"},{"SourceFile":"HotProcessHard\\HotProessReportService.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustItemService.cs"},{"SourceFile":"HotProcessHard\\HotProess_TrustService.cs"},{"SourceFile":"MethodRefelect.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_ComponentsService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_ConsumablesService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DefectService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DetectionRateService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DetectionTypeService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_DNCompareService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_GrooveTypeService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_MaterialService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_MediumService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PipingClassDetailService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PipingClassService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_PressureService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_WeldingLocationServie.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_WeldingMethodService.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Base_WeldTypeService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_CompanyStandardsService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_DomesticLawsRegulationsService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_DomesticStandardsService.cs"},{"SourceFile":"PublicInfo\\FileControl\\FileControl_ForeignStandardsService.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQListService.cs"},{"SourceFile":"SessionName.cs"},{"SourceFile":"SoftRegeditService.cs"},{"SourceFile":"SQLHelper.cs"},{"SourceFile":"Common\\UploadFileService.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\Batch_NDEItemService.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\Batch_NDEService.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairRecordService.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataInTempService.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegation_Service.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\AItemEndCheckService.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\BItemEndCheckService.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageAuditService.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageEditService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_BatchTrustItemService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_BatchTrustService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_PointBatchItemService.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\Batch_PointBatchService.cs"},{"SourceFile":"WeldingProcess\\WelderTest\\WelderTestService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportCompleteService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_PipelineDetectionTypeService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_PipelineService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_WeldingDailyService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\Pipeline_WeldJointService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PreWeldReportService.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\UserShowColumnsService.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\SQL2012 x86\\130\\SDK\\Assemblies\\Microsoft.SQLServer.ManagedDTS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\BLL\\bin\\Debug\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\BLL\\bin\\Debug\\BLL.pdb","OutputItemRelativePath":"BLL.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj index b031343..14daee0 100644 --- a/HJGL/BLL/BLL.csproj +++ b/HJGL/BLL/BLL.csproj @@ -51,8 +51,9 @@ ..\FineUIPro.Web\bin\EmitMapper.dll - - bin\FineUIPro.dll + + False + ..\FineUIPro\FineUIPro.dll ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll diff --git a/HJGL/BLL/WeldingProcess/CheckManage/RepairRecordService.cs b/HJGL/BLL/WeldingProcess/CheckManage/RepairRecordService.cs index a5b5b2e..f6f05f9 100644 --- a/HJGL/BLL/WeldingProcess/CheckManage/RepairRecordService.cs +++ b/HJGL/BLL/WeldingProcess/CheckManage/RepairRecordService.cs @@ -33,29 +33,32 @@ namespace BLL /// public static void AddRepairRecord(Model.Repair_RepairRecord repair) { - Model.HJGLDB db = Funs.DB; - Model.Repair_RepairRecord newRepair = new Model.Repair_RepairRecord(); - newRepair.RepairRecordId = repair.RepairRecordId; - newRepair.RepairRecordCode = repair.RepairRecordCode; - newRepair.ProjectId = repair.ProjectId; - newRepair.UnitId = repair.UnitId; - newRepair.InstallationId = repair.InstallationId; - newRepair.WorkAreaId = repair.WorkAreaId; - newRepair.NoticeDate = repair.NoticeDate; - newRepair.NDEItemID = repair.NDEItemID; - newRepair.WeldJointId = repair.WeldJointId; - newRepair.DetectionTypeId = repair.DetectionTypeId; - newRepair.RepairLocation = repair.RepairLocation; - newRepair.WelderId = repair.WelderId; - newRepair.RepairMark = repair.RepairMark; - newRepair.CheckDefects = repair.CheckDefects; - newRepair.RepairWelder = repair.RepairWelder; - newRepair.RepairDate = repair.RepairDate; - newRepair.PhotoUrl = repair.PhotoUrl; - newRepair.Ex_ToPointBatchItemId = repair.Ex_ToPointBatchItemId; + using (Model.HJGLDB db = new Model.HJGLDB(Funs.ConnString)) + { - db.Repair_RepairRecord.InsertOnSubmit(newRepair); - db.SubmitChanges(); + Model.Repair_RepairRecord newRepair = new Model.Repair_RepairRecord(); + newRepair.RepairRecordId = repair.RepairRecordId; + newRepair.RepairRecordCode = repair.RepairRecordCode; + newRepair.ProjectId = repair.ProjectId; + newRepair.UnitId = repair.UnitId; + newRepair.InstallationId = repair.InstallationId; + newRepair.WorkAreaId = repair.WorkAreaId; + newRepair.NoticeDate = repair.NoticeDate; + newRepair.NDEItemID = repair.NDEItemID; + newRepair.WeldJointId = repair.WeldJointId; + newRepair.DetectionTypeId = repair.DetectionTypeId; + newRepair.RepairLocation = repair.RepairLocation; + newRepair.WelderId = repair.WelderId; + newRepair.RepairMark = repair.RepairMark; + newRepair.CheckDefects = repair.CheckDefects; + newRepair.RepairWelder = repair.RepairWelder; + newRepair.RepairDate = repair.RepairDate; + newRepair.PhotoUrl = repair.PhotoUrl; + newRepair.Ex_ToPointBatchItemId = repair.Ex_ToPointBatchItemId; + + db.Repair_RepairRecord.InsertOnSubmit(newRepair); + db.SubmitChanges(); + } } public static void UpdateRepairRecord(Model.Repair_RepairRecord repair) diff --git a/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs b/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs index 0df70dd..18207d4 100644 --- a/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs +++ b/HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs @@ -68,6 +68,7 @@ namespace BLL newDataInTemp.Value36 = dataInTemp.Value36; newDataInTemp.Value37 = dataInTemp.Value37; newDataInTemp.Value38 = dataInTemp.Value38; + newDataInTemp.Value39 = dataInTemp.Value39; newDataInTemp.ToopValue = dataInTemp.ToopValue; db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp); db.SubmitChanges(); @@ -123,6 +124,7 @@ namespace BLL newDataInTemp.Value36 = dataInTemp.Value36; newDataInTemp.Value37 = dataInTemp.Value37; newDataInTemp.Value38 = dataInTemp.Value38; + newDataInTemp.Value39 = dataInTemp.Value39; newDataInTemp.ToopValue = dataInTemp.ToopValue; try { diff --git a/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs b/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs index c6f5ed3..912e436 100644 --- a/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs +++ b/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs @@ -142,6 +142,13 @@ namespace BLL db.SubmitChanges(); } + public static List getPipelineListByPTP_ID(string PTP_ID) + { + Model.HJGLDB db = Funs.DB; + var view = (from x in db.PTP_PipelineList where x.PTP_ID == PTP_ID select x).ToList(); + return view; + } + /// /// 鏍规嵁涓婚敭鍒犻櫎璇曞帇淇℃伅鏄庣粏 /// @@ -156,7 +163,31 @@ namespace BLL db.SubmitChanges(); } } - + /// + /// 鏍规嵁璇曞帇鍖呭拰鍖哄煙涓婚敭鍒犻櫎璇曞帇淇℃伅鏄庣粏 + /// + /// + /// + public static void DeletePipelineListByPTP_IDAndWorkAreaId(string testPackageID,string workAreaId) + { + Model.HJGLDB db = Funs.DB; + var testPackage = from x in db.PTP_PipelineList where x.PTP_ID == testPackageID && x.WorkAreaId==workAreaId select x; + if (testPackage != null) + { + db.PTP_PipelineList.DeleteAllOnSubmit(testPackage); + db.SubmitChanges(); + } + } + public static void DeletePipelineListByPT_PipeId(string PT_PipeId) + { + Model.HJGLDB db = Funs.DB; + var testPackage = from x in db.PTP_PipelineList where x.PT_PipeId == PT_PipeId select x; + if (testPackage != null) + { + db.PTP_PipelineList.DeleteAllOnSubmit(testPackage); + db.SubmitChanges(); + } + } /// /// 澧炲姞璇曞帇淇℃伅鏄庣粏 /// @@ -176,7 +207,19 @@ namespace BLL db.PTP_PipelineList.InsertOnSubmit(newPipelineList); db.SubmitChanges(); } - + public static bool IsPipelineListExists(string PTP_ID, string PipelineId) + { + Model.HJGLDB db = Funs.DB; + var pipelineList = from x in db.PTP_PipelineList where x.PTP_ID == PTP_ID && x.PipelineId == PipelineId select x; + if (pipelineList.Count() > 0) + { + return true; + } + else + { + return false; + } + } /// /// 鏍规嵁鍗曚綅鑾峰彇璇曞帇 /// diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs index 106bde9..1c0b41a 100644 --- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs +++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs @@ -55,59 +55,123 @@ namespace BLL /// public static void AddWeldJoint(Model.Pipeline_WeldJoint weldJoint) { - Model.HJGLDB db = Funs.DB; - Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint + using (Model.HJGLDB db = new Model.HJGLDB(Funs.ConnString)) { - WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)), - ProjectId = weldJoint.ProjectId, - PipelineId = weldJoint.PipelineId, - WeldJointCode = weldJoint.WeldJointCode, - WeldTypeId = weldJoint.WeldTypeId, - Material1Id = weldJoint.Material1Id, - Material2Id = weldJoint.Material2Id, - Thickness = weldJoint.Thickness, - Dia = weldJoint.Dia, - Size = weldJoint.Size, - JointAttribute = weldJoint.JointAttribute, - JointArea = weldJoint.JointArea, - WeldingMethodId = weldJoint.WeldingMethodId, - IsHotProess = weldJoint.IsHotProess, - WeldingLocationId = weldJoint.WeldingLocationId, - WeldMatId = weldJoint.WeldMatId, - WeldSilkId = weldJoint.WeldSilkId, - GrooveTypeId = weldJoint.GrooveTypeId, - PipeSegment = weldJoint.PipeSegment, - PipeAssembly1Id = weldJoint.PipeAssembly1Id, - PipeAssembly2Id = weldJoint.PipeAssembly2Id, - PipeAssemblyCount = weldJoint.PipeAssemblyCount, - HeartNo1 = weldJoint.HeartNo1, - HeartNo2 = weldJoint.HeartNo2, - LastTemp = weldJoint.LastTemp, - CellTemp = weldJoint.CellTemp, - PrepareTemp = weldJoint.PrepareTemp, - Electricity = weldJoint.Electricity, - Voltage = weldJoint.Voltage, - TestPackageNo = weldJoint.TestPackageNo, - WeldingDailyCode = weldJoint.WeldingDailyCode, - BackingWelderId = weldJoint.BackingWelderId, - CoverWelderId = weldJoint.CoverWelderId, - WeldingDailyId = weldJoint.WeldingDailyId, - PipingClassId = weldJoint.PipingClassId, - Specification = weldJoint.Specification, - DoneDin = weldJoint.DoneDin, - SystemNumber = weldJoint.SystemNumber, - Remark = weldJoint.Remark, - IsGoldJoint = weldJoint.IsGoldJoint, - IsPMI=weldJoint.IsPMI, - WPQId = weldJoint.WPQId, - DetectionType = weldJoint.DetectionType, - PageNum = weldJoint.PageNum, - ANSISCH = weldJoint.ANSISCH + Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint + { + WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)), + ProjectId = weldJoint.ProjectId, + PipelineId = weldJoint.PipelineId, + WeldJointCode = weldJoint.WeldJointCode, + WeldTypeId = weldJoint.WeldTypeId, + Material1Id = weldJoint.Material1Id, + Material2Id = weldJoint.Material2Id, + Thickness = weldJoint.Thickness, + Dia = weldJoint.Dia, + Size = weldJoint.Size, + JointAttribute = weldJoint.JointAttribute, + JointArea = weldJoint.JointArea, + WeldingMethodId = weldJoint.WeldingMethodId, + IsHotProess = weldJoint.IsHotProess, + WeldingLocationId = weldJoint.WeldingLocationId, + WeldMatId = weldJoint.WeldMatId, + WeldSilkId = weldJoint.WeldSilkId, + GrooveTypeId = weldJoint.GrooveTypeId, + PipeSegment = weldJoint.PipeSegment, + PipeAssembly1Id = weldJoint.PipeAssembly1Id, + PipeAssembly2Id = weldJoint.PipeAssembly2Id, + PipeAssemblyCount = weldJoint.PipeAssemblyCount, + HeartNo1 = weldJoint.HeartNo1, + HeartNo2 = weldJoint.HeartNo2, + LastTemp = weldJoint.LastTemp, + CellTemp = weldJoint.CellTemp, + PrepareTemp = weldJoint.PrepareTemp, + Electricity = weldJoint.Electricity, + Voltage = weldJoint.Voltage, + TestPackageNo = weldJoint.TestPackageNo, + WeldingDailyCode = weldJoint.WeldingDailyCode, + BackingWelderId = weldJoint.BackingWelderId, + CoverWelderId = weldJoint.CoverWelderId, + WeldingDailyId = weldJoint.WeldingDailyId, + PipingClassId = weldJoint.PipingClassId, + Specification = weldJoint.Specification, + DoneDin = weldJoint.DoneDin, + SystemNumber = weldJoint.SystemNumber, + Remark = weldJoint.Remark, + IsGoldJoint = weldJoint.IsGoldJoint, + IsPMI = weldJoint.IsPMI, + WPQId = weldJoint.WPQId, + DetectionType = weldJoint.DetectionType, + PageNum = weldJoint.PageNum, + ANSISCH = weldJoint.ANSISCH, + IsBracket = weldJoint.IsBracket, - }; + }; - db.Pipeline_WeldJoint.InsertOnSubmit(newWeldJoint); - db.SubmitChanges(); + db.Pipeline_WeldJoint.InsertOnSubmit(newWeldJoint); + db.SubmitChanges(); + } + } + public static string AddWeldJointRef(Model.Pipeline_WeldJoint weldJoint ) + { string weldJointId = ""; + using (Model.HJGLDB db = new Model.HJGLDB(Funs.ConnString)) + { + Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint + { + WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)), + ProjectId = weldJoint.ProjectId, + PipelineId = weldJoint.PipelineId, + WeldJointCode = weldJoint.WeldJointCode, + WeldTypeId = weldJoint.WeldTypeId, + Material1Id = weldJoint.Material1Id, + Material2Id = weldJoint.Material2Id, + Thickness = weldJoint.Thickness, + Dia = weldJoint.Dia, + Size = weldJoint.Size, + JointAttribute = weldJoint.JointAttribute, + JointArea = weldJoint.JointArea, + WeldingMethodId = weldJoint.WeldingMethodId, + IsHotProess = weldJoint.IsHotProess, + WeldingLocationId = weldJoint.WeldingLocationId, + WeldMatId = weldJoint.WeldMatId, + WeldSilkId = weldJoint.WeldSilkId, + GrooveTypeId = weldJoint.GrooveTypeId, + PipeSegment = weldJoint.PipeSegment, + PipeAssembly1Id = weldJoint.PipeAssembly1Id, + PipeAssembly2Id = weldJoint.PipeAssembly2Id, + PipeAssemblyCount = weldJoint.PipeAssemblyCount, + HeartNo1 = weldJoint.HeartNo1, + HeartNo2 = weldJoint.HeartNo2, + LastTemp = weldJoint.LastTemp, + CellTemp = weldJoint.CellTemp, + PrepareTemp = weldJoint.PrepareTemp, + Electricity = weldJoint.Electricity, + Voltage = weldJoint.Voltage, + TestPackageNo = weldJoint.TestPackageNo, + WeldingDailyCode = weldJoint.WeldingDailyCode, + BackingWelderId = weldJoint.BackingWelderId, + CoverWelderId = weldJoint.CoverWelderId, + WeldingDailyId = weldJoint.WeldingDailyId, + PipingClassId = weldJoint.PipingClassId, + Specification = weldJoint.Specification, + DoneDin = weldJoint.DoneDin, + SystemNumber = weldJoint.SystemNumber, + Remark = weldJoint.Remark, + IsGoldJoint = weldJoint.IsGoldJoint, + IsPMI = weldJoint.IsPMI, + WPQId = weldJoint.WPQId, + DetectionType = weldJoint.DetectionType, + PageNum = weldJoint.PageNum, + ANSISCH = weldJoint.ANSISCH + + }; + + db.Pipeline_WeldJoint.InsertOnSubmit(newWeldJoint); + db.SubmitChanges(); + + weldJointId = newWeldJoint.WeldJointId; + } + return weldJointId; } /// @@ -163,7 +227,8 @@ namespace BLL newWeldJoint.WPQId = weldJoint.WPQId; newWeldJoint.DetectionType = weldJoint.DetectionType; newWeldJoint.PageNum = weldJoint.PageNum; - newWeldJoint.ANSISCH = weldJoint.ANSISCH; + newWeldJoint.ANSISCH = weldJoint.ANSISCH; + newWeldJoint.IsBracket = weldJoint.IsBracket; db.SubmitChanges(); } } @@ -213,6 +278,7 @@ namespace BLL newWeldJoint.DetectionType = weldJoint.DetectionType; newWeldJoint.PageNum = weldJoint.PageNum; newWeldJoint.ANSISCH = weldJoint.ANSISCH; + newWeldJoint.IsBracket = weldJoint.IsBracket; db.SubmitChanges(); } } @@ -252,10 +318,8 @@ namespace BLL { newWeldJoint.WeldingLocationId = weldJoint.WeldingLocationId; } - if (!string.IsNullOrEmpty(weldJoint.WeldMatId)) - { - newWeldJoint.WeldMatId = weldJoint.WeldMatId; - } + newWeldJoint.WeldMatId = weldJoint.WeldMatId; + if (!string.IsNullOrEmpty(weldJoint.WeldSilkId)) { newWeldJoint.WeldSilkId = weldJoint.WeldSilkId; @@ -338,6 +402,8 @@ namespace BLL newWeldJoint.IsGoldJoint = weldJoint.IsGoldJoint; newWeldJoint.WPQId = weldJoint.WPQId; newWeldJoint.DetectionType = weldJoint.DetectionType; + newWeldJoint.IsBracket = weldJoint.IsBracket; + if (!string.IsNullOrEmpty(weldJoint.PageNum)) { newWeldJoint.PageNum = weldJoint.PageNum; diff --git a/HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json b/HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json index e4fe33f..a417c6e 100644 --- a/HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json +++ b/HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro.Web","ProjectFileName":"FineUIPro.Web.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_GlobalResources\\Lan.en-US.designer.cs"},{"SourceFile":"App_GlobalResources\\Lan.zh-CN.designer.cs"},{"SourceFile":"App_GlobalResources\\Lan.Designer.cs"},{"SourceFile":"AttachFile\\fileupload.ashx.cs"},{"SourceFile":"AttachFile\\webuploader2.aspx.cs"},{"SourceFile":"AttachFile\\webuploader2.aspx.designer.cs"},{"SourceFile":"AttachFile\\webuploader.aspx.cs"},{"SourceFile":"AttachFile\\webuploader.aspx.designer.cs"},{"SourceFile":"Captcha\\captcha.ashx.cs"},{"SourceFile":"Captcha\\CaptchaImage.cs"},{"SourceFile":"common\\BaseInfo\\ProjectType.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectType.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeEdit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeEdit.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeView.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeView.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectView.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectView.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\SelectProject.aspx.cs"},{"SourceFile":"common\\BaseInfo\\SelectProject.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\UnitView.aspx.cs"},{"SourceFile":"common\\BaseInfo\\UnitView.aspx.designer.cs"},{"SourceFile":"common\\CommonPrint.cs"},{"SourceFile":"common\\ProjectSet\\EditTeamGroup.aspx.cs"},{"SourceFile":"common\\ProjectSet\\EditTeamGroup.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPicture.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPicture.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureEdit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureView.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureView.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectSysSet.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectSysSet.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUnit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUnit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUser.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUser.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectWelder.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectWelder.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\SelectUnit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\SelectUnit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\SelectUser.aspx.cs"},{"SourceFile":"common\\ProjectSet\\SelectUser.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\SelectWelder.aspx.cs"},{"SourceFile":"common\\ProjectSet\\SelectWelder.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\CalculateChinaEx.aspx.cs"},{"SourceFile":"common\\ReportPrint\\CalculateChinaEx.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ExPrintSet.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ExPrintSet.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ExReportPrint.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ExReportPrint.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\PrintDesigner.aspx.cs"},{"SourceFile":"common\\ReportPrint\\PrintDesigner.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ReadExReportFile.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ReadExReportFile.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\SaveTabFile.aspx.cs"},{"SourceFile":"common\\ReportPrint\\SaveTabFile.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\LogList.aspx.cs"},{"SourceFile":"common\\SysManage\\LogList.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Params_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_Params_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Params_List.aspx.cs"},{"SourceFile":"Email_Send\\Email_Params_List.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Pop_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_Pop_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_SendLog_List.aspx.cs"},{"SourceFile":"Email_Send\\Email_SendLog_List.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_List.aspx.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_List.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Send_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_Send_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\SelectRoleControl.ascx.cs"},{"SourceFile":"Email_Send\\SelectRoleControl.ascx.designer.cs"},{"SourceFile":"Email_Send\\SelectUserControl.ascx.cs"},{"SourceFile":"Email_Send\\SelectUserControl.ascx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClass.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClass.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClassEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClassEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\AnalysisEdit.aspx.cs"},{"SourceFile":"WelderManage\\AnalysisEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\QualificationAnalysis.aspx.cs"},{"SourceFile":"WelderManage\\QualificationAnalysis.aspx.designer.cs"},{"SourceFile":"WelderManage\\QualifiedProject.aspx.cs"},{"SourceFile":"WelderManage\\QualifiedProject.aspx.designer.cs"},{"SourceFile":"WelderManage\\QualifiedProjectEdit.aspx.cs"},{"SourceFile":"WelderManage\\QualifiedProjectEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderTestInfoImportError.aspx.cs"},{"SourceFile":"WelderManage\\WelderTestInfoImportError.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderManage.aspx.cs"},{"SourceFile":"WelderManage\\WelderManage.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderManageEdit.aspx.cs"},{"SourceFile":"WelderManage\\WelderManageEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderManageView.aspx.cs"},{"SourceFile":"WelderManage\\WelderManageView.aspx.designer.cs"},{"SourceFile":"Encrypt.aspx.cs"},{"SourceFile":"Encrypt.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardFeedback.aspx.cs"},{"SourceFile":"HotProcessHard\\HardFeedback.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardReport.aspx.cs"},{"SourceFile":"HotProcessHard\\HardReport.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardReportEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HardReportEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardTrust.aspx.cs"},{"SourceFile":"HotProcessHard\\HardTrust.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardTrustEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HardTrustEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardTrustItemEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HardTrustItemEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessFeedback.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessFeedback.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessReport.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessReport.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessReportEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessReportEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessTrust.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessTrust.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustItemEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustItemEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Components.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Components.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsView.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\Installation.aspx.cs"},{"SourceFile":"common\\ProjectSet\\Installation.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\InstallationEdit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\InstallationEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\InstallationView.aspx.cs"},{"SourceFile":"common\\ProjectSet\\InstallationView.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\Project.aspx.cs"},{"SourceFile":"common\\BaseInfo\\Project.aspx.designer.cs"},{"SourceFile":"common\\loading.aspx.cs"},{"SourceFile":"common\\loading.aspx.designer.cs"},{"SourceFile":"common\\Main.aspx.cs"},{"SourceFile":"common\\Main.aspx.designer.cs"},{"SourceFile":"common\\MainSupervision.aspx.cs"},{"SourceFile":"common\\MainSupervision.aspx.designer.cs"},{"SourceFile":"common\\main_bootstrap_pure.aspx.cs"},{"SourceFile":"common\\main_bootstrap_pure.aspx.designer.cs"},{"SourceFile":"common\\main_bootstrap_pure_login.aspx.cs"},{"SourceFile":"common\\main_bootstrap_pure_login.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectEdit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectEdit.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\Unit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\Unit.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\UnitEdit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\UnitEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\WorkArea.aspx.cs"},{"SourceFile":"common\\ProjectSet\\WorkArea.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaEdit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaView.aspx.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaView.aspx.designer.cs"},{"SourceFile":"common\\mainFullViews.aspx.cs"},{"SourceFile":"common\\mainFullViews.aspx.designer.cs"},{"SourceFile":"common\\source.aspx.cs"},{"SourceFile":"common\\source.aspx.designer.cs"},{"SourceFile":"common\\source_file.aspx.cs"},{"SourceFile":"common\\source_file.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\RoleList.aspx.cs"},{"SourceFile":"common\\SysManage\\RoleList.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\RoleListEdit.aspx.cs"},{"SourceFile":"common\\SysManage\\RoleListEdit.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\RolePower.aspx.cs"},{"SourceFile":"common\\SysManage\\RolePower.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UpdatePassword.aspx.cs"},{"SourceFile":"common\\SysManage\\UpdatePassword.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UpdatePasswordEdit.aspx.cs"},{"SourceFile":"common\\SysManage\\UpdatePasswordEdit.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UserList.aspx.cs"},{"SourceFile":"common\\SysManage\\UserList.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UserListEdit.aspx.cs"},{"SourceFile":"common\\SysManage\\UserListEdit.aspx.designer.cs"},{"SourceFile":"common\\themes.aspx.cs"},{"SourceFile":"common\\themes.aspx.designer.cs"},{"SourceFile":"config\\ajax.aspx.cs"},{"SourceFile":"config\\ajax.aspx.designer.cs"},{"SourceFile":"config\\enable_gzip_iis6.aspx.cs"},{"SourceFile":"config\\enable_gzip_iis6.aspx.designer.cs"},{"SourceFile":"config\\icons.aspx.cs"},{"SourceFile":"config\\icons.aspx.designer.cs"},{"SourceFile":"config\\icons_font.aspx.cs"},{"SourceFile":"config\\icons_font.aspx.designer.cs"},{"SourceFile":"config\\install_toolbox.aspx.cs"},{"SourceFile":"config\\install_toolbox.aspx.designer.cs"},{"SourceFile":"config\\loading.aspx.cs"},{"SourceFile":"config\\loading.aspx.designer.cs"},{"SourceFile":"config\\modify_webconfig.aspx.cs"},{"SourceFile":"config\\modify_webconfig.aspx.designer.cs"},{"SourceFile":"Controls\\ChartControl.ascx.cs"},{"SourceFile":"Controls\\ChartControl.ascx.designer.cs"},{"SourceFile":"Controls\\ClientJs\\ClientJs.ascx.cs"},{"SourceFile":"Controls\\ClientJs\\ClientJs.ascx.designer.cs"},{"SourceFile":"Controls\\GridNavgator.ascx.cs"},{"SourceFile":"Controls\\GridNavgator.ascx.designer.cs"},{"SourceFile":"Controls\\JDGL\\ChartControl.ascx.cs"},{"SourceFile":"Controls\\JDGL\\ChartControl.ascx.designer.cs"},{"SourceFile":"Controls\\ProgressBox.ascx.cs"},{"SourceFile":"Controls\\ProgressBox.ascx.designer.cs"},{"SourceFile":"default.aspx.cs"},{"SourceFile":"default.aspx.designer.cs"},{"SourceFile":"FileManage\\editCAD.aspx.cs"},{"SourceFile":"FileManage\\editCAD.aspx.designer.cs"},{"SourceFile":"FileManage\\EditOffice.aspx.cs"},{"SourceFile":"FileManage\\EditOffice.aspx.designer.cs"},{"SourceFile":"FileManage\\FileManageList.aspx.cs"},{"SourceFile":"FileManage\\FileManageList.aspx.designer.cs"},{"SourceFile":"FileManage\\Read.aspx.cs"},{"SourceFile":"FileManage\\Read.aspx.designer.cs"},{"SourceFile":"FileManage\\ReadCad.aspx.cs"},{"SourceFile":"FileManage\\ReadCad.aspx.designer.cs"},{"SourceFile":"FileManage\\Save.aspx.cs"},{"SourceFile":"FileManage\\Save.aspx.designer.cs"},{"SourceFile":"FileManage\\SaveCAD.aspx.cs"},{"SourceFile":"FileManage\\SaveCAD.aspx.designer.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"Login.aspx.cs"},{"SourceFile":"Login.aspx.designer.cs"},{"SourceFile":"LogOff.aspx.cs"},{"SourceFile":"LogOff.aspx.designer.cs"},{"SourceFile":"OperationError.aspx.cs"},{"SourceFile":"OperationError.aspx.designer.cs"},{"SourceFile":"common\\PageBase.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Consumables.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Consumables.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Control.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Control.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Defect.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Defect.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Detection.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Detection.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Groove.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Groove.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Material.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Material.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Medium.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Medium.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClass.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClass.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetail.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetail.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Pressure.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Pressure.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Testing.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Testing.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Weld.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Weld.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethod.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethod.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandards.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandards.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulations.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulations.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandards.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandards.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandards.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandards.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\FinalArchivedData.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\FinalArchivedData.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByMonthly.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByMonthly.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByUnit.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByUnit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WelderRank.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WelderRank.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingMonthly.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingMonthly.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingQuelity.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingQuelity.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingWeekly.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingWeekly.aspx.designer.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQList.aspx.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQList.aspx.designer.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQEdit.aspx.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQIn.aspx.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQIn.aspx.designer.cs"},{"SourceFile":"Report\\HJGLDs.cs"},{"SourceFile":"Report\\HJGLDs.Designer.cs"},{"SourceFile":"Report\\TestReport.aspx.cs"},{"SourceFile":"Report\\TestReport.aspx.designer.cs"},{"SourceFile":"Report\\TestReport2.aspx.cs"},{"SourceFile":"Report\\TestReport2.aspx.designer.cs"},{"SourceFile":"Report\\ReportPrint.aspx.cs"},{"SourceFile":"Report\\ReportPrint.aspx.designer.cs"},{"SourceFile":"res\\umeditor\\net\\imageUp.ashx.cs"},{"SourceFile":"res\\umeditor\\net\\Uploader.cs"},{"SourceFile":"WelderManage\\WelderTestInfo.aspx.cs"},{"SourceFile":"WelderManage\\WelderTestInfo.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderTestInfoEdit.aspx.cs"},{"SourceFile":"WelderManage\\WelderTestInfoEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManage.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageIn.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageIn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairAndExpand.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairAndExpand.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairNotice.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairNotice.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\SeeFilm.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\SeeFilm.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataIn.aspx.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataIn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataInEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataInEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegation.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegation.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationReport.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDetectionEntry.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDetectionEntry.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMISelectList.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMISelectList.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\AItemEndCheck.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\AItemEndCheck.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\BItemEndCheck.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\BItemEndCheck.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\ImportError.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\ImportError.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\selectJointCode.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\selectJointCode.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageItemEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageItemEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageComplete.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageComplete.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDECheckWarn.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDECheckWarn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDTTrustPrint.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDTTrustPrint.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\OpenResetPoint.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\OpenResetPoint.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointForAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointForAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointItemAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointItemAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointManage.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\RTTrustReplace.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\RTTrustReplace.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\SelectExpandPoint.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\SelectExpandPoint.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchIn.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchIn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchManage.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchOut.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchOut.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchSelect.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchSelect.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportComplete.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportComplete.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportCompleteEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportCompleteEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\GetWdldingDailyItem.ashx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfo.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfo.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoBatchEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoBatchEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoCopy.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoCopy.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointShowColumn.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointShowColumn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineDetectionTypeEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineDetectionTypeEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManage.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManageEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManageEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineShowColumn.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineShowColumn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PreWeldReportAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PreWeldReportAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportItemEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportItemEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\DetectionAnalyze.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\DetectionAnalyze.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCmprehensive.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCmprehensive.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCompreInfo.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCompreInfo.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\JointComprehensive.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\JointComprehensive.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldDailyExport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldDailyExport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\MediaComprehensive.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\MediaComprehensive.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEDetectionInformation.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEDetectionInformation.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEWithOut.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEWithOut.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTBacklogList.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTBacklogList.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTByWelder.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTByWelder.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\OutstandingWelds.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\OutstandingWelds.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\PrefabricatedInstall.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\PrefabricatedInstall.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTbacklogReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTbacklogReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWeldList.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWeldList.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWelds.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWelds.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTRejectedRateReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTRejectedRateReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\TwoWeekNDEWithOut.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\TwoWeekNDEWithOut.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkareaAnalyze.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkareaAnalyze.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaQuality.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaQuality.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaShowColumn.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaShowColumn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeeklyWeldsReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeeklyWeldsReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderPerformance.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderPerformance.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderRepairLog.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderRepairLog.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderWeek.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderWeek.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldNoHandle.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldNoHandle.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldSummary.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldSummary.aspx.designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\AxInterop.SYNCARDOCXLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Portable.BouncyCastle.1.8.6\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\SharpZipLib.1.2.0\\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.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.JScript.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1404.0\\lib\\net40\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1404.0\\lib\\net40\\Microsoft.ReportViewer.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1404.0\\lib\\net40\\Microsoft.ReportViewer.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1404.0\\lib\\net40\\Microsoft.ReportViewer.ProcessingObjectModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1404.0\\lib\\net40\\Microsoft.ReportViewer.WebDesign.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1404.0\\lib\\net40\\Microsoft.ReportViewer.WebForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.SqlServer.Types.14.0.1016.290\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Newtonsoft.Json.12.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\NPOI.2.5.3\\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.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\ThoughtWorks.QRCode.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\FineUIPro.Web.dll","OutputItemRelativePath":"FineUIPro.Web.dll"},{"OutputItemFullPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\FineUIPro.Web.pdb","OutputItemRelativePath":"FineUIPro.Web.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\FineUIPro.Web","ProjectFileName":"FineUIPro.Web.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_GlobalResources\\Lan.en-US.designer.cs"},{"SourceFile":"App_GlobalResources\\Lan.zh-CN.designer.cs"},{"SourceFile":"App_GlobalResources\\Lan.Designer.cs"},{"SourceFile":"AttachFile\\fileupload.ashx.cs"},{"SourceFile":"AttachFile\\webuploader2.aspx.cs"},{"SourceFile":"AttachFile\\webuploader2.aspx.designer.cs"},{"SourceFile":"AttachFile\\webuploader.aspx.cs"},{"SourceFile":"AttachFile\\webuploader.aspx.designer.cs"},{"SourceFile":"Captcha\\captcha.ashx.cs"},{"SourceFile":"Captcha\\CaptchaImage.cs"},{"SourceFile":"common\\BaseInfo\\ProjectType.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectType.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeEdit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeEdit.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeView.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectTypeView.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectView.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectView.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\SelectProject.aspx.cs"},{"SourceFile":"common\\BaseInfo\\SelectProject.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\UnitView.aspx.cs"},{"SourceFile":"common\\BaseInfo\\UnitView.aspx.designer.cs"},{"SourceFile":"common\\CommonPrint.cs"},{"SourceFile":"common\\DataTableEx.cs"},{"SourceFile":"common\\ProjectSet\\EditTeamGroup.aspx.cs"},{"SourceFile":"common\\ProjectSet\\EditTeamGroup.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPicture.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPicture.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureEdit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureView.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectPictureView.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectSysSet.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectSysSet.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUnit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUnit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUser.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectUser.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\ProjectWelder.aspx.cs"},{"SourceFile":"common\\ProjectSet\\ProjectWelder.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\SelectUnit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\SelectUnit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\SelectUser.aspx.cs"},{"SourceFile":"common\\ProjectSet\\SelectUser.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\SelectWelder.aspx.cs"},{"SourceFile":"common\\ProjectSet\\SelectWelder.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\CalculateChinaEx.aspx.cs"},{"SourceFile":"common\\ReportPrint\\CalculateChinaEx.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ExPrintSet.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ExPrintSet.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ExReportPrint.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ExReportPrint.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\PrintDesigner.aspx.cs"},{"SourceFile":"common\\ReportPrint\\PrintDesigner.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ReadExReportFile.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ReadExReportFile.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\SaveTabFile.aspx.cs"},{"SourceFile":"common\\ReportPrint\\SaveTabFile.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\LogList.aspx.cs"},{"SourceFile":"common\\SysManage\\LogList.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Params_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_Params_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Params_List.aspx.cs"},{"SourceFile":"Email_Send\\Email_Params_List.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Pop_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_Pop_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_SendLog_List.aspx.cs"},{"SourceFile":"Email_Send\\Email_SendLog_List.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_List.aspx.cs"},{"SourceFile":"Email_Send\\Email_SendTemplate_List.aspx.designer.cs"},{"SourceFile":"Email_Send\\Email_Send_Edit.aspx.cs"},{"SourceFile":"Email_Send\\Email_Send_Edit.aspx.designer.cs"},{"SourceFile":"Email_Send\\SelectRoleControl.ascx.cs"},{"SourceFile":"Email_Send\\SelectRoleControl.ascx.designer.cs"},{"SourceFile":"Email_Send\\SelectUserControl.ascx.cs"},{"SourceFile":"Email_Send\\SelectUserControl.ascx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClass.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClass.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClassEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PIPClassEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\AnalysisEdit.aspx.cs"},{"SourceFile":"WelderManage\\AnalysisEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\QualificationAnalysis.aspx.cs"},{"SourceFile":"WelderManage\\QualificationAnalysis.aspx.designer.cs"},{"SourceFile":"WelderManage\\QualifiedProject.aspx.cs"},{"SourceFile":"WelderManage\\QualifiedProject.aspx.designer.cs"},{"SourceFile":"WelderManage\\QualifiedProjectEdit.aspx.cs"},{"SourceFile":"WelderManage\\QualifiedProjectEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderTestInfoImportError.aspx.cs"},{"SourceFile":"WelderManage\\WelderTestInfoImportError.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderManage.aspx.cs"},{"SourceFile":"WelderManage\\WelderManage.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderManageEdit.aspx.cs"},{"SourceFile":"WelderManage\\WelderManageEdit.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderManageView.aspx.cs"},{"SourceFile":"WelderManage\\WelderManageView.aspx.designer.cs"},{"SourceFile":"Encrypt.aspx.cs"},{"SourceFile":"Encrypt.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardFeedback.aspx.cs"},{"SourceFile":"HotProcessHard\\HardFeedback.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardReport.aspx.cs"},{"SourceFile":"HotProcessHard\\HardReport.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardReportEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HardReportEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardTrust.aspx.cs"},{"SourceFile":"HotProcessHard\\HardTrust.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardTrustEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HardTrustEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HardTrustItemEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HardTrustItemEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessFeedback.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessFeedback.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessReport.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessReport.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessReportEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessReportEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessTrust.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessTrust.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustEdit.aspx.designer.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustItemEdit.aspx.cs"},{"SourceFile":"HotProcessHard\\HotProessTrustItemEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Components.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Components.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ComponentsView.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\Installation.aspx.cs"},{"SourceFile":"common\\ProjectSet\\Installation.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\InstallationEdit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\InstallationEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\InstallationView.aspx.cs"},{"SourceFile":"common\\ProjectSet\\InstallationView.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\Project.aspx.cs"},{"SourceFile":"common\\BaseInfo\\Project.aspx.designer.cs"},{"SourceFile":"common\\loading.aspx.cs"},{"SourceFile":"common\\loading.aspx.designer.cs"},{"SourceFile":"common\\Main.aspx.cs"},{"SourceFile":"common\\Main.aspx.designer.cs"},{"SourceFile":"common\\MainSupervision.aspx.cs"},{"SourceFile":"common\\MainSupervision.aspx.designer.cs"},{"SourceFile":"common\\main_bootstrap_pure.aspx.cs"},{"SourceFile":"common\\main_bootstrap_pure.aspx.designer.cs"},{"SourceFile":"common\\main_bootstrap_pure_login.aspx.cs"},{"SourceFile":"common\\main_bootstrap_pure_login.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\ProjectEdit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\ProjectEdit.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\Unit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\Unit.aspx.designer.cs"},{"SourceFile":"common\\BaseInfo\\UnitEdit.aspx.cs"},{"SourceFile":"common\\BaseInfo\\UnitEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\WorkArea.aspx.cs"},{"SourceFile":"common\\ProjectSet\\WorkArea.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaEdit.aspx.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaEdit.aspx.designer.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaView.aspx.cs"},{"SourceFile":"common\\ProjectSet\\WorkAreaView.aspx.designer.cs"},{"SourceFile":"common\\mainFullViews.aspx.cs"},{"SourceFile":"common\\mainFullViews.aspx.designer.cs"},{"SourceFile":"common\\source.aspx.cs"},{"SourceFile":"common\\source.aspx.designer.cs"},{"SourceFile":"common\\source_file.aspx.cs"},{"SourceFile":"common\\source_file.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\RoleList.aspx.cs"},{"SourceFile":"common\\SysManage\\RoleList.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\RoleListEdit.aspx.cs"},{"SourceFile":"common\\SysManage\\RoleListEdit.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\RolePower.aspx.cs"},{"SourceFile":"common\\SysManage\\RolePower.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UpdatePassword.aspx.cs"},{"SourceFile":"common\\SysManage\\UpdatePassword.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UpdatePasswordEdit.aspx.cs"},{"SourceFile":"common\\SysManage\\UpdatePasswordEdit.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UserList.aspx.cs"},{"SourceFile":"common\\SysManage\\UserList.aspx.designer.cs"},{"SourceFile":"common\\SysManage\\UserListEdit.aspx.cs"},{"SourceFile":"common\\SysManage\\UserListEdit.aspx.designer.cs"},{"SourceFile":"common\\themes.aspx.cs"},{"SourceFile":"common\\themes.aspx.designer.cs"},{"SourceFile":"config\\ajax.aspx.cs"},{"SourceFile":"config\\ajax.aspx.designer.cs"},{"SourceFile":"config\\enable_gzip_iis6.aspx.cs"},{"SourceFile":"config\\enable_gzip_iis6.aspx.designer.cs"},{"SourceFile":"config\\icons.aspx.cs"},{"SourceFile":"config\\icons.aspx.designer.cs"},{"SourceFile":"config\\icons_font.aspx.cs"},{"SourceFile":"config\\icons_font.aspx.designer.cs"},{"SourceFile":"config\\install_toolbox.aspx.cs"},{"SourceFile":"config\\install_toolbox.aspx.designer.cs"},{"SourceFile":"config\\loading.aspx.cs"},{"SourceFile":"config\\loading.aspx.designer.cs"},{"SourceFile":"config\\modify_webconfig.aspx.cs"},{"SourceFile":"config\\modify_webconfig.aspx.designer.cs"},{"SourceFile":"Controls\\ChartControl.ascx.cs"},{"SourceFile":"Controls\\ChartControl.ascx.designer.cs"},{"SourceFile":"Controls\\ClientJs\\ClientJs.ascx.cs"},{"SourceFile":"Controls\\ClientJs\\ClientJs.ascx.designer.cs"},{"SourceFile":"Controls\\GridNavgator.ascx.cs"},{"SourceFile":"Controls\\GridNavgator.ascx.designer.cs"},{"SourceFile":"Controls\\JDGL\\ChartControl.ascx.cs"},{"SourceFile":"Controls\\JDGL\\ChartControl.ascx.designer.cs"},{"SourceFile":"Controls\\ProgressBox.ascx.cs"},{"SourceFile":"Controls\\ProgressBox.ascx.designer.cs"},{"SourceFile":"default.aspx.cs"},{"SourceFile":"default.aspx.designer.cs"},{"SourceFile":"FileManage\\editCAD.aspx.cs"},{"SourceFile":"FileManage\\editCAD.aspx.designer.cs"},{"SourceFile":"FileManage\\EditOffice.aspx.cs"},{"SourceFile":"FileManage\\EditOffice.aspx.designer.cs"},{"SourceFile":"FileManage\\FileManageList.aspx.cs"},{"SourceFile":"FileManage\\FileManageList.aspx.designer.cs"},{"SourceFile":"FileManage\\Read.aspx.cs"},{"SourceFile":"FileManage\\Read.aspx.designer.cs"},{"SourceFile":"FileManage\\ReadCad.aspx.cs"},{"SourceFile":"FileManage\\ReadCad.aspx.designer.cs"},{"SourceFile":"FileManage\\Save.aspx.cs"},{"SourceFile":"FileManage\\Save.aspx.designer.cs"},{"SourceFile":"FileManage\\SaveCAD.aspx.cs"},{"SourceFile":"FileManage\\SaveCAD.aspx.designer.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"Login.aspx.cs"},{"SourceFile":"Login.aspx.designer.cs"},{"SourceFile":"LogOff.aspx.cs"},{"SourceFile":"LogOff.aspx.designer.cs"},{"SourceFile":"OperationError.aspx.cs"},{"SourceFile":"OperationError.aspx.designer.cs"},{"SourceFile":"common\\PageBase.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Consumables.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Consumables.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ConsumablesView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Control.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Control.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\ControlView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Defect.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Defect.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DefectView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Detection.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Detection.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\DetectionView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Groove.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Groove.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\GrooveView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Material.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Material.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MaterialView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Medium.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Medium.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\MediumView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClass.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClass.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetail.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetail.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassDetailView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PipingClassView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Pressure.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Pressure.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\PressureView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Testing.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Testing.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\TestingView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Weld.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\Weld.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethod.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethod.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodEdit.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldingMethodView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldView.aspx.cs"},{"SourceFile":"PublicInfo\\BaseInfo\\WeldView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandards.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandards.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\CompanyStandardsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulations.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulations.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticLawsRegulationsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandards.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandards.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\DomesticStandardsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandards.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandards.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsEdit.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsView.aspx.cs"},{"SourceFile":"PublicInfo\\FileControl\\ForeignStandardsView.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\FinalArchivedData.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\FinalArchivedData.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByMonthly.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByMonthly.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByUnit.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\StatisticsByUnit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WelderRank.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WelderRank.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingMonthly.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingMonthly.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingQuelity.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingQuelity.aspx.designer.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingWeekly.aspx.cs"},{"SourceFile":"PublicInfo\\ProcessControl\\WeldingWeekly.aspx.designer.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQList.aspx.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQList.aspx.designer.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQEdit.aspx.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQEdit.aspx.designer.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQIn.aspx.cs"},{"SourceFile":"PublicInfo\\WPQ\\WPQIn.aspx.designer.cs"},{"SourceFile":"Report\\HJGLDs.cs"},{"SourceFile":"Report\\HJGLDs.Designer.cs"},{"SourceFile":"Report\\TestReport.aspx.cs"},{"SourceFile":"Report\\TestReport.aspx.designer.cs"},{"SourceFile":"Report\\TestReport2.aspx.cs"},{"SourceFile":"Report\\TestReport2.aspx.designer.cs"},{"SourceFile":"Report\\ReportPrint.aspx.cs"},{"SourceFile":"Report\\ReportPrint.aspx.designer.cs"},{"SourceFile":"res\\umeditor\\net\\imageUp.ashx.cs"},{"SourceFile":"res\\umeditor\\net\\Uploader.cs"},{"SourceFile":"WelderManage\\WelderTestInfo.aspx.cs"},{"SourceFile":"WelderManage\\WelderTestInfo.aspx.designer.cs"},{"SourceFile":"WelderManage\\WelderTestInfoEdit.aspx.cs"},{"SourceFile":"WelderManage\\WelderTestInfoEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManage.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageIn.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\CheckManageIn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairAndExpand.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairAndExpand.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairNotice.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\RepairNotice.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\SeeFilm.aspx.cs"},{"SourceFile":"WeldingProcess\\CheckManage\\SeeFilm.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataIn.aspx.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataIn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataInEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\DataIn\\DataInEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegation.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegation.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationReport.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDelegationReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDetectionEntry.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMIDetectionEntry.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMISelectList.aspx.cs"},{"SourceFile":"WeldingProcess\\PMI\\PMISelectList.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\AItemEndCheck.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\AItemEndCheck.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\BItemEndCheck.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\BItemEndCheck.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\ImportError.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\ImportError.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\selectJointCode.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\selectJointCode.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageItemEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageItemEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageComplete.aspx.cs"},{"SourceFile":"WeldingProcess\\TestPackageManage\\TestPackageManageComplete.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDECheckWarn.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDECheckWarn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDTTrustPrint.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\NDTTrustPrint.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\OpenResetPoint.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\OpenResetPoint.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointForAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointForAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointItemAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointItemAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointManage.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\RTTrustReplace.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\RTTrustReplace.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\SelectExpandPoint.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\SelectExpandPoint.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\PointAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchIn.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchIn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchManage.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchOut.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchOut.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchSelect.aspx.cs"},{"SourceFile":"WeldingProcess\\TrustManage\\TrustBatchSelect.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportComplete.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportComplete.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportCompleteEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\DailyReportCompleteEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\GetWdldingDailyItem.ashx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfo.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfo.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoBatchEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoBatchEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoCopy.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoCopy.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointInfoEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointShowColumn.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\JointShowColumn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineDetectionTypeEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineDetectionTypeEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManage.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManage.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManageEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineManageEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineShowColumn.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PipelineShowColumn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PreWeldReportAudit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\PreWeldReportAudit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\SuperQueWelding.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\SuperQueWelding.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportItemEdit.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingManage\\WeldReportItemEdit.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\DetectionAnalyze.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\DetectionAnalyze.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCmprehensive.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCmprehensive.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCompreInfo.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\IsoCompreInfo.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\JointComprehensive.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\JointComprehensive.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTRateConfirm.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTRateConfirm.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldDailyExport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldDailyExport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\MediaComprehensive.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\MediaComprehensive.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEDetectionInformation.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEDetectionInformation.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEWithOut.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDEWithOut.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTBacklogList.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTBacklogList.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTByWelder.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\NDTByWelder.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\OutstandingWelds.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\OutstandingWelds.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\PrefabricatedInstall.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\PrefabricatedInstall.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTbacklogReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTbacklogReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWeldList.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWeldList.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWelds.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTButtWelds.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTRejectedRateReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\RTRejectedRateReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\TwoWeekNDEWithOut.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\TwoWeekNDEWithOut.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkareaAnalyze.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkareaAnalyze.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaQuality.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaQuality.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaShowColumn.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\UnitWorkAreaShowColumn.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeeklyWeldsReport.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeeklyWeldsReport.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderPerformance.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderPerformance.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderRepairLog.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderRepairLog.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderWeek.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WelderWeek.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldNoHandle.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldNoHandle.aspx.designer.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldSummary.aspx.cs"},{"SourceFile":"WeldingProcess\\WeldingReport\\WeldSummary.aspx.designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\BLL\\bin\\Debug\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.JScript.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Visual Studio 2022\\Common7\\IDE\\PublicAssemblies\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\FineUIPro.Web.dll","OutputItemRelativePath":"FineUIPro.Web.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\FineUIPro.Web\\bin\\FineUIPro.Web.pdb","OutputItemRelativePath":"FineUIPro.Web.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs index cd767c0..ff85a82 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs @@ -4272,6 +4272,15 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 杩斾慨鎵╂帰杩借釜娓呭崟 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string RepairExpansionTrackingList { + get { + return ResourceManager.GetString("RepairExpansionTrackingList", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 杩斾慨浣嶇疆 鐨勬湰鍦板寲瀛楃涓层 /// diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 3608b8d..4110d2d 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -2136,4 +2136,7 @@ 涓嶅瓨鍦ㄦPMI濮旀墭 + + 杩斾慨鎵╂帰杩借釜娓呭崟 + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/鐒婃帴鏁版嵁瀵煎叆妯＄増.xlsx b/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/鐒婃帴鏁版嵁瀵煎叆妯＄増.xlsx index 16dcba4..e7df63b 100644 Binary files a/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/鐒婃帴鏁版嵁瀵煎叆妯＄増.xlsx and b/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/鐒婃帴鏁版嵁瀵煎叆妯＄増.xlsx differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 4cd31ed..197b084 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -64,7 +64,8 @@ ..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll - + + False ..\FineUIPro\FineUIPro.dll @@ -96,6 +97,9 @@ ..\packages\MimeKit.4.6.0\lib\net48\MimeKit.dll + + ..\packages\MiniExcel.1.34.2\lib\net45\MiniExcel.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -119,6 +123,7 @@ ..\packages\System.Formats.Asn1.8.0.0\lib\net462\System.Formats.Asn1.dll + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -1312,6 +1317,8 @@ + + @@ -5793,6 +5800,20 @@ JointComprehensive.aspx + + PipelineTraceList.aspx + ASPXCodeBehind + + + PipelineTraceList.aspx + + + RepairExTrackingList.aspx + ASPXCodeBehind + + + RepairExTrackingList.aspx + RTRateConfirm.aspx ASPXCodeBehind diff --git a/HJGL/FineUIPro.Web/Global.asax.cs b/HJGL/FineUIPro.Web/Global.asax.cs index 972f1ff..3cb1659 100644 --- a/HJGL/FineUIPro.Web/Global.asax.cs +++ b/HJGL/FineUIPro.Web/Global.asax.cs @@ -297,7 +297,8 @@ { var wpsList = from x in Funs.DB.WPQ_WPQList where x.ProjectId == ((Model.Sys_User)Session["CurrUser"]).LoginProjectId select x; var welderList = from x in Funs.DB.Welder_ProjectWelder where x.ProjectId == ((Model.Sys_User)Session["CurrUser"]).LoginProjectId select x; - foreach (var wps in wpsList) + foreach (var wps in + wpsList) { string testWelder = string.Empty; string materialStr = string.Empty; diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index 5535ca1..aea5566 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -1,4 +1,4 @@ -锘 +锘 -
+
- + - + - - - - - - + + + + + + - + - - + + - + - - - + + + - + - + - + - - + + - - + + - - - + + + - + - + - + - - + + @@ -105,33 +105,37 @@ --> - + - - - + + + - - - - + + + + - + - - + + - - + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx index 8abb38f..c44f1c2 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx @@ -35,6 +35,13 @@ AutoPostBack="true" Label="<%$ Resources:Lan,TestNumber %>" LabelWidth="100px" OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Right"> + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs index bd29e42..cc57959 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs @@ -203,7 +203,7 @@ namespace FineUIPro.Web.CheckManage //鍗曞彿 string ndtTypeId = e.Node.NodeID.Split('|')[0]; - var checks = from x in Funs.DB.View_Batch_NDE + var checks = (from x in Funs.DB.View_Batch_NDE where x.NDEDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1) && x.NDEDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(-1) && x.ProjectId == this.CurrUser.LoginProjectId && x.NDECode.Contains(this.txtSearchCode.Text.Trim()) @@ -211,7 +211,12 @@ namespace FineUIPro.Web.CheckManage && x.UnitId == e.Node.ParentNode.ParentNode.NodeID && x.DetectionTypeId == ndtTypeId orderby x.NDECode descending - select x; + select x).ToList(); + if (ckUnqualified.Checked) + { + var q = (from x in Funs.DB.View_NoReportNdt select x.NDEID).ToList().Distinct(); + checks = checks.Where(x => q.Contains(x.NDEID)).ToList(); + } foreach (var check in checks) { TreeNode newNode = new TreeNode(); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.designer.cs index d0cbf07..297db84 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CheckManage { - - - public partial class CheckManage { - +namespace FineUIPro.Web.CheckManage +{ + + + public partial class CheckManage + { + /// /// form1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar1 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtNDEDateMonth 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtNDEDateMonth; - + /// /// Toolbar5 鎺т欢銆 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar5; - + /// /// txtSearchCode 鎺т欢銆 /// @@ -83,7 +85,25 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtSearchCode; - + + /// + /// Toolbar3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// ckUnqualified 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.CheckBox ckUnqualified; + /// /// tvControlItem 鎺т欢銆 /// @@ -92,7 +112,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 鎺т欢銆 /// @@ -101,7 +121,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar2 鎺т欢銆 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// hdNDEID 鎺т欢銆 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.HiddenField hdNDEID; - + /// /// ToolbarFill1 鎺т欢銆 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnNew 鎺т欢銆 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 鎺т欢銆 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnImport; - + /// /// btnEdit 鎺т欢銆 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnEdit; - + /// /// btnAudit 鎺т欢銆 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnAudit; - + /// /// btnDelete 鎺т欢銆 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnDelete; - + /// /// BtnRepairRecord 鎺т欢銆 /// @@ -182,7 +202,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button BtnRepairRecord; - + /// /// SimpleForm1 鎺т欢銆 /// @@ -191,7 +211,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtNDECode 鎺т欢銆 /// @@ -200,7 +220,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtNDECode; - + /// /// txtUnitName 鎺т欢銆 /// @@ -209,7 +229,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtUnitName; - + /// /// txtInstallation 鎺т欢銆 /// @@ -218,7 +238,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtInstallation; - + /// /// txtNDEDate 鎺т欢銆 /// @@ -227,7 +247,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtNDEDate; - + /// /// txtCheckUnit 鎺т欢銆 /// @@ -236,7 +256,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtCheckUnit; - + /// /// txtDetectionTypeCode 鎺т欢銆 /// @@ -245,7 +265,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtDetectionTypeCode; - + /// /// txtTrustBatchCode 鎺т欢銆 /// @@ -254,7 +274,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTrustBatchCode; - + /// /// Label1 鎺т欢銆 /// @@ -263,7 +283,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label Label1; - + /// /// Label2 鎺т欢銆 /// @@ -272,7 +292,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label Label2; - + /// /// Grid1 鎺т欢銆 /// @@ -281,7 +301,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Grid Grid1; - + /// /// lbCheckDefects 鎺т欢銆 /// @@ -290,7 +310,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.WebControls.Label lbCheckDefects; - + /// /// ToolbarSeparator1 鎺т欢銆 /// @@ -299,7 +319,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 鎺т欢銆 /// @@ -308,7 +328,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 鎺т欢銆 /// @@ -317,7 +337,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 鎺т欢銆 /// @@ -326,7 +346,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 鎺т欢銆 /// @@ -335,7 +355,7 @@ namespace FineUIPro.Web.CheckManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Window Window2; - + /// /// WindowRepair 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs index babb058..d7af210 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs @@ -245,6 +245,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage List listStr = new List(); listStr.Add(new SqlParameter("@DetectionTypeId", repairRecord.DetectionTypeId)); + #region 鏃ч昏緫 // 濡傛灉鏄浜屾杩斾慨涓嶅姞杞芥墿閫忓彛 if (!code4.Contains("EX1") && code2 == "R2") { @@ -275,6 +276,24 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage } } + #endregion + #region 鏂伴昏緫 + //var rate = from x in Funs.DB.Pipeline_WeldJoint + // join y in Funs.DB.Pipeline_Pipeline on x.PipelineId equals y.PipelineId + // join z in Funs.DB.Base_DetectionRate on y.DetectionRateId equals z.DetectionRateId + // where x.WeldJointId == repairRecord.WeldJointId + // select z.DetectionRateValue; + //// 濡傛灉杩斾慨鐨勭剨鍙ｄ负100%鐨勬娴嬫瘮渚嬶紝鍒欎笉杩涜鎵╅ + //if (rate.Count() > 0 && rate.First().Value == 100) + //{ + // listStr.Add(new SqlParameter("@ProjectId", "0")); + //} + //else + //{ + // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + + //} + #endregion //if (ndt.SysType == "灏勭嚎妫娴") //{ // strSql += " AND Flag = @Flag"; @@ -406,6 +425,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage var rjot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(repair.WeldJointId); rjot.WeldJointCode = rjot.WeldJointCode.Replace("R1","").Replace("P1", "").Replace("S1", "").Trim() + "C1"; rjot.OldWeldJointCode = rjot.WeldJointCode; + rjot.Remark = "杩斾慨鍓插彛"; Funs.DB.SubmitChanges(); } else @@ -608,12 +628,14 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage // 鍥炲啓鐒婂彛 var joint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(repair.WeldJointId); - if (!string.IsNullOrEmpty(joint.OldWeldJointCode)) - { - joint.WeldJointCode = joint.OldWeldJointCode; - joint.OldWeldJointCode = null; - Funs.DB.SubmitChanges(); - } + //if (!string.IsNullOrEmpty(joint.OldWeldJointCode)) + //{ + // joint.WeldJointCode = joint.OldWeldJointCode; + // joint.OldWeldJointCode = null; + // Funs.DB.SubmitChanges(); + //}--搴斾负鍒犻櫎杩斾慨鍙 + + //var exp = BLL.RepairRecordService.GetExportItem(repairRecordId); //if (exp != null) //{ @@ -628,6 +650,11 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage //} db.Repair_RepairRecord.DeleteOnSubmit(repair); db.SubmitChanges(); + if (joint.WeldJointCode.Contains("P") || joint.WeldJointCode.Contains("S") || joint.WeldJointCode.Contains("R")) + { + Pipeline_WeldJointService.DeleteWeldJointById(joint.WeldJointId); + + } this.InitTreeMenu();//鍔犺浇鏍 Alert.ShowInTop("鍒犻櫎鎴愬姛锛", MessageBoxIcon.Success); } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs index adc499c..ef251cc 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs @@ -78,132 +78,203 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage newItem.RepairRecordId = SQLHelper.GetNewID(typeof(Model.Repair_RepairRecord)); string code = q.TrustBatchCode; - if (code.Substring(code.Length - 2, 1) == "R") + //if (code.Substring(code.Length - 2, 1) == "R") + //{ + // string first = code.Substring(0, code.Length - 1); + // string last = code.Substring(code.Length - 1); + // int n = Convert.ToInt32(last) + 1; + // newItem.RepairRecordCode = first + n.ToString(); + // newJointCode = q.WeldJointCode.Substring(0, q.WeldJointCode.Length - 2) + "R" + n.ToString(); + //} + //else + //{ + // if (q.CheckResult != "1") // 涓嶅悎鏍 + // { + // if (code.Substring(code.Length - 3, 2) == "EX") + // { + // newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1"; + // } + // else + // { + // newItem.RepairRecordCode = q.TrustBatchCode + "R1"; + // } + // if (!q.WeldJointCode.Contains("R1")) + // { + // newJointCode = q.WeldJointCode + "R1"; + // } + // else + // { + // newJointCode = q.WeldJointCode; + // } + // } + // else // 鍚堟牸浣嗘湁淇（鎴栧紓鐗 + // { + // if (q.Remark.Contains("淇（")) + // { + // newItem.RepairRecordCode = q.TrustBatchCode + "P1"; + // if (!q.WeldJointCode.Contains("P1")) + // { + // newJointCode = q.WeldJointCode + "P1"; + // } + // else + // { + // newJointCode = q.WeldJointCode; + // } + // } + // if (q.Remark.Contains("寮傜墿")) + // { + // newItem.RepairRecordCode = q.TrustBatchCode + "S1"; + + // if (!q.WeldJointCode.Contains("S1")) + // { + // newJointCode = q.WeldJointCode + "S1"; + // } + // else + // { + // newJointCode = q.WeldJointCode; + // } + // } + // } + + // #region 鍘熼昏緫 + // //if (code.Substring(code.Length - 3, 2) == "EX") + // //{ + // // newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1"; + // // if (!q.WeldJointCode.Contains("R1")) + // // { + // // newJointCode = q.WeldJointCode + "R1"; + // // } + // // else + // // { + // // newJointCode = q.WeldJointCode; + // // } + // //} + // //else + // //{ + // // if (q.Remark.Contains("淇（")) + // // { + // // newItem.RepairRecordCode = q.TrustBatchCode + "P1"; + // // if (!q.WeldJointCode.Contains("P1")) + // // { + // // newJointCode = q.WeldJointCode + "P1"; + // // } + // // else + // // { + // // newJointCode = q.WeldJointCode; + // // } + // // } + // // else if (q.Remark.Contains("寮傜墿")) + // // { + // // newItem.RepairRecordCode = q.TrustBatchCode + "S1"; + + // // if (!q.WeldJointCode.Contains("S1")) + // // { + // // newJointCode = q.WeldJointCode + "S1"; + // // } + // // else + // // { + // // newJointCode = q.WeldJointCode; + // // } + // // } + // // else + // // { + // // newItem.RepairRecordCode = q.TrustBatchCode + "R1"; + // // if (!q.WeldJointCode.Contains("R1")) + // // { + // // newJointCode = q.WeldJointCode + "R1"; + // // } + // // else + // // { + // // newJointCode = q.WeldJointCode; + // // } + // // } + // //} + // #endregion + //} + + if (code.Substring(code.Length - 2, 1)=="R"|| code.Substring(code.Length - 2, 1) == "P" || code.Substring(code.Length - 2, 1) == "S") { - string first = code.Substring(0, code.Length - 1); - string last = code.Substring(code.Length - 1); - int n = Convert.ToInt32(last) + 1; - newItem.RepairRecordCode = first + n.ToString(); - newJointCode = q.WeldJointCode.Substring(0, q.WeldJointCode.Length - 2) + "R" + n.ToString(); + newItem.RepairRecordCode = code.Substring(0,code.Length - 2) + txtRepairMark.Text; + newJointCode = q.WeldJointCode.Substring(0, q.WeldJointCode.Length - 2)+txtRepairMark.Text; } else { - if (q.CheckResult != "1") // 涓嶅悎鏍 - { - if (code.Substring(code.Length - 3, 2) == "EX") - { - newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1"; - } - else - { - newItem.RepairRecordCode = q.TrustBatchCode + "R1"; - } - if (!q.WeldJointCode.Contains("R1")) - { - newJointCode = q.WeldJointCode + "R1"; - } - else - { - newJointCode = q.WeldJointCode; - } - } - else // 鍚堟牸浣嗘湁淇（鎴栧紓鐗 - { - if (q.Remark.Contains("淇（")) - { - newItem.RepairRecordCode = q.TrustBatchCode + "P1"; - if (!q.WeldJointCode.Contains("P1")) - { - newJointCode = q.WeldJointCode + "P1"; - } - else - { - newJointCode = q.WeldJointCode; - } - } - if (q.Remark.Contains("寮傜墿")) - { - newItem.RepairRecordCode = q.TrustBatchCode + "S1"; - - if (!q.WeldJointCode.Contains("S1")) - { - newJointCode = q.WeldJointCode + "S1"; - } - else - { - newJointCode = q.WeldJointCode; - } - } - } - - #region 鍘熼昏緫 - //if (code.Substring(code.Length - 3, 2) == "EX") - //{ - // newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1"; - // if (!q.WeldJointCode.Contains("R1")) - // { - // newJointCode = q.WeldJointCode + "R1"; - // } - // else - // { - // newJointCode = q.WeldJointCode; - // } - //} - //else - //{ - // if (q.Remark.Contains("淇（")) - // { - // newItem.RepairRecordCode = q.TrustBatchCode + "P1"; - // if (!q.WeldJointCode.Contains("P1")) - // { - // newJointCode = q.WeldJointCode + "P1"; - // } - // else - // { - // newJointCode = q.WeldJointCode; - // } - // } - // else if (q.Remark.Contains("寮傜墿")) - // { - // newItem.RepairRecordCode = q.TrustBatchCode + "S1"; - - // if (!q.WeldJointCode.Contains("S1")) - // { - // newJointCode = q.WeldJointCode + "S1"; - // } - // else - // { - // newJointCode = q.WeldJointCode; - // } - // } - // else - // { - // newItem.RepairRecordCode = q.TrustBatchCode + "R1"; - // if (!q.WeldJointCode.Contains("R1")) - // { - // newJointCode = q.WeldJointCode + "R1"; - // } - // else - // { - // newJointCode = q.WeldJointCode; - // } - // } - //} - #endregion + newItem.RepairRecordCode = code + txtRepairMark.Text; + newJointCode = q.WeldJointCode + txtRepairMark.Text; } + var isExistRepairRecordCode = from x in Funs.DB.Repair_RepairRecord where x.RepairRecordCode == newItem.RepairRecordCode select x; if (isExistRepairRecordCode.Count() > 0) { ShowNotify("璇ヨ繑淇彿宸插瓨鍦紒璇蜂慨鏀瑰凡瀛樺湪鐨勮繑淇彿", MessageBoxIcon.Warning); return; } + + + // 鍥炲啓鐒婂彛鍙 + var weldJoint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId); + //joint.WeldJointCode = newJointCode; + //joint.OldWeldJointCode = q.WeldJointCode; + //Funs.DB.SubmitChanges(); + Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint + { + WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)), + ProjectId = weldJoint.ProjectId, + PipelineId = weldJoint.PipelineId, + WeldJointCode = newJointCode, + WeldTypeId = weldJoint.WeldTypeId, + Material1Id = weldJoint.Material1Id, + Material2Id = weldJoint.Material2Id, + Thickness = weldJoint.Thickness, + Dia = weldJoint.Dia, + Size = weldJoint.Size, + JointAttribute = weldJoint.JointAttribute, + JointArea = weldJoint.JointArea, + WeldingMethodId = weldJoint.WeldingMethodId, + IsHotProess = weldJoint.IsHotProess, + WeldingLocationId = weldJoint.WeldingLocationId, + WeldMatId = weldJoint.WeldMatId, + WeldSilkId = weldJoint.WeldSilkId, + GrooveTypeId = weldJoint.GrooveTypeId, + PipeSegment = weldJoint.PipeSegment, + PipeAssembly1Id = weldJoint.PipeAssembly1Id, + PipeAssembly2Id = weldJoint.PipeAssembly2Id, + PipeAssemblyCount = weldJoint.PipeAssemblyCount, + HeartNo1 = weldJoint.HeartNo1, + HeartNo2 = weldJoint.HeartNo2, + LastTemp = weldJoint.LastTemp, + CellTemp = weldJoint.CellTemp, + PrepareTemp = weldJoint.PrepareTemp, + Electricity = weldJoint.Electricity, + Voltage = weldJoint.Voltage, + TestPackageNo = weldJoint.TestPackageNo, + WeldingDailyCode = weldJoint.WeldingDailyCode, + BackingWelderId = weldJoint.BackingWelderId, + CoverWelderId = weldJoint.CoverWelderId, + WeldingDailyId = weldJoint.WeldingDailyId, + PipingClassId = weldJoint.PipingClassId, + Specification = weldJoint.Specification, + DoneDin = weldJoint.DoneDin, + SystemNumber = weldJoint.SystemNumber, + Remark = weldJoint.Remark, + IsGoldJoint = weldJoint.IsGoldJoint, + IsPMI = weldJoint.IsPMI, + WPQId = weldJoint.WPQId, + DetectionType = weldJoint.DetectionType, + PageNum = weldJoint.PageNum, + ANSISCH = weldJoint.ANSISCH, + OldWeldJointCode = weldJoint.OldWeldJointCode, + + }; + string WeldJointId= BLL.Pipeline_WeldJointService.AddWeldJointRef(newWeldJoint); + newItem.ProjectId = q.ProjectId; newItem.UnitId = q.UnitId; newItem.InstallationId = q.InstallationId; newItem.WorkAreaId = q.WorkAreaId; newItem.NoticeDate = DateTime.Now; newItem.NDEItemID = ndeItemId; - newItem.WeldJointId = q.WeldJointId; + newItem.WeldJointId = WeldJointId; newItem.DetectionTypeId = q.DetectionTypeId; newItem.WelderId = q.BackingWelderId; newItem.RepairLocation = q.RepairLocation; @@ -211,12 +282,6 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage newItem.RepairMark = txtRepairMark.Text; newItem.PhotoUrl = imgPhoto.ImageUrl; BLL.RepairRecordService.AddRepairRecord(newItem); - - // 鍥炲啓鐒婂彛鍙 - var joint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId); - joint.WeldJointCode = newJointCode; - joint.OldWeldJointCode = q.WeldJointCode; - Funs.DB.SubmitChanges(); } else { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx index c70da54..c484f69 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx @@ -218,6 +218,9 @@ + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs index 9c6e84b..dc4e886 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs @@ -65,7 +65,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7, Value8,Value9,Value10,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19, Value20,Value21,Value22,Value23,Value24,Value25,Value26,Value27,Value28,Value29,Value30,Value31, - Value32,Value33,Value34,Value35,Value36,Value37,Value38 + Value32,Value33,Value34,Value35,Value36,Value37,Value38,Value39 FROM Sys_DataInTemp WHERE UserId=@UserId"; List listStr = new List(); @@ -355,6 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim(); newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim(); newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim(); + newDataInTemp.Value39 = ds.Tables[0].Rows[i][38].ToString().Trim(); BLL.DataInTempService.AddDataInTemp(newDataInTemp); } @@ -1525,15 +1526,23 @@ namespace FineUIPro.Web.WeldingProcess.DataIn if (!string.IsNullOrEmpty(tempData.Value37)) { - var weldMat = consumabless.FirstOrDefault(x => x.ConsumablesCode == tempData.Value37 && x.ConsumablesType == "2"); - if (weldMat == null) + if (tempData.Value37=="NULL") { - errInfo += "鐒婃潯[" + tempData.Value37 + "]涓嶅瓨鍦紱"; + weldJoint.WeldMatId = null; } else { - weldJoint.WeldMatId = weldMat.ConsumablesId; + var weldMat = consumabless.FirstOrDefault(x => x.ConsumablesCode == tempData.Value37 && x.ConsumablesType == "2"); + if (weldMat == null) + { + errInfo += "鐒婃潯[" + tempData.Value37 + "]涓嶅瓨鍦紱"; + } + else + { + weldJoint.WeldMatId = weldMat.ConsumablesId; + } } + } else { @@ -1561,6 +1570,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn weldJoint.IsPMI = jot.IsPMI; } } + if (!string.IsNullOrEmpty(tempData.Value39)) + { + weldJoint.IsBracket = true; + weldJoint.Specification = tempData.Value39; + } + else + { + if (jot != null && jot.IsBracket != null) + { + weldJoint.IsBracket = jot.IsBracket; + } + } if (string.IsNullOrEmpty(errInfo)) // 鎵鏈変俊鎭纭殑璇 杩欐彃鍏ョ绾跨剨鍙 { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx index c2c2220..f4fd291 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx @@ -13,14 +13,23 @@ EnableCollapse="true" Width="290px" Title="璇曞帇鍓嶅熬椤笰妫鏌" ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> - - - - + + + + - + + + + + + + + = startTime && x.TableDate < endTime orderby x.TestPackageNo descending - select x; + select x).ToList(); + if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim())) + { + dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList(); + } foreach (var item in dReports) { TreeNode newNode = new TreeNode(); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.designer.cs index 5cda8fe..0e97d41 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.TestPackageManage { - - - public partial class AItemEndCheck { - +namespace FineUIPro.Web.WeldingProcess.TestPackageManage +{ + + + public partial class AItemEndCheck + { + /// /// Head1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - + /// /// form1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar1 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtSearchDate 鎺т欢銆 /// @@ -74,7 +76,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtSearchDate; - + + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtSearchCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSearchCode; + /// /// tvControlItem 鎺т欢銆 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 鎺т欢銆 /// @@ -92,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Grid1 鎺т欢銆 /// @@ -101,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar5 鎺т欢銆 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar5; - + /// /// btnNew 鎺т欢銆 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnNew; - + /// /// btnDelete 鎺т欢銆 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnDelete; - + /// /// btnSave 鎺т欢銆 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnSave; - + /// /// txtRemark 鎺т欢銆 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// txtCheckMan 鎺т欢銆 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtCheckMan; - + /// /// txtCheckDate 鎺т欢銆 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtCheckDate; - + /// /// txtDealMan 鎺т欢銆 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtDealMan; - + /// /// txtDealDate 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx index f4738f8..87528c0 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx @@ -14,14 +14,24 @@ EnableCollapse="true" Width="290px" Title="璇曞帇鍚庡熬椤笲妫鏌" ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> - - - - + + + + - + + + + + + + + + = startTime && x.TableDate < endTime - orderby x.TestPackageNo descending - select x; + var dReports = (from x in testPackageUnitList + where x.InstallationId == installationId + && x.TableDate >= startTime && x.TableDate < endTime + orderby x.TestPackageNo descending + select x).ToList(); + if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim())) + { + dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList(); + } foreach (var item in dReports) { TreeNode newNode = new TreeNode(); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.designer.cs index ab79b98..fdcf7a0 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.TestPackageManage { - - - public partial class BItemEndCheck { - +namespace FineUIPro.Web.WeldingProcess.TestPackageManage +{ + + + public partial class BItemEndCheck + { + /// /// Head1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - + /// /// form1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar1 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtSearchDate 鎺т欢銆 /// @@ -74,7 +76,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtSearchDate; - + + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtSearchCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSearchCode; + /// /// tvControlItem 鎺т欢銆 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 鎺т欢銆 /// @@ -92,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Grid1 鎺т欢銆 /// @@ -101,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar5 鎺т欢銆 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar5; - + /// /// btnNew 鎺т欢銆 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnNew; - + /// /// btnDelete 鎺т欢銆 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnDelete; - + /// /// btnSave 鎺т欢銆 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnSave; - + /// /// txtRemark 鎺т欢銆 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// txtCheckMan 鎺т欢銆 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtCheckMan; - + /// /// txtCheckDate 鎺т欢銆 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtCheckDate; - + /// /// txtDealMan 鎺т欢銆 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtDealMan; - + /// /// txtDealDate 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx index af1f4c2..5aee7fc 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx @@ -18,7 +18,7 @@ } .Purple span { - background-color: Purple; + background-color: plum; } .f-grid-row.Cyan { @@ -34,7 +34,7 @@ } .f-grid-row.Purple { - background-color: Purple; + background-color: plum; } /*瀹氫箟鐖跺鍣*/ @@ -61,7 +61,7 @@ @@ -71,6 +71,15 @@ + + + + + + + - + - + @@ -224,76 +233,177 @@ - - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs index 77445dc..9c3a668 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs @@ -229,11 +229,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01"); DateTime endTime = startTime.AddMonths(1); string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0]; - var dReports = from x in testPackageUnitList - where x.InstallationId == installationId - && x.TableDate >= startTime && x.TableDate < endTime - orderby x.TestPackageNo descending - select x; + var dReports = (from x in testPackageUnitList + where x.InstallationId == installationId + && x.TableDate >= startTime && x.TableDate < endTime + orderby x.TestPackageNo descending + select x).ToList(); + if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim())) + { + dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList(); + } foreach (var item in dReports) { TreeNode newNode = new TreeNode(); @@ -294,6 +298,162 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage Grid1.DataSource = table; Grid1.DataBind(); this.ShowGridItem(); + BindGridRT(); + BindGridPT(); + } + + private void BindGridRT() { + + string strSql = ""; + strSql = @" + WITH CTE_WeldJoints AS ( + SELECT PipelineId, WeldJointCode, JointAttribute, WelderCode, DetectionType, WeldJointId + FROM View_Pipeline_WeldJoint + WHERE DetectionType LIKE '%32617d42-24cb-4390-b115-d53c9c9e2c81%' + ), + CTE_JoinCounts AS ( + SELECT PipelineId, + COUNT(*) AS jointCount, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FjointCount + FROM CTE_WeldJoints + GROUP BY PipelineId + ), + CTE_WelderStats AS ( + SELECT PipelineId, WelderCode, + COUNT(*) AS WelderNum, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FNdeNum + FROM CTE_WeldJoints + GROUP BY PipelineId, WelderCode + ), + CTE_NDECounts AS ( + + SELECT PipelineId, WelderCode, + COUNT(*) AS NdeNum, + STUFF((SELECT ',' + NDEReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint2 ON joint2.WeldJointId = trust.WeldJointId + WHERE joint2.PipelineId = joint.PipelineId AND joint2.WelderCode = joint.WelderCode + FOR XML PATH('')), 1, 1, '') AS NdeReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint ON joint.WeldJointId = trust.WeldJointId + GROUP BY PipelineId, WelderCode + + ) + SELECT DISTINCT d.PipelineCode, + m.MaterialCode, + d.Specification, + COALESCE(jc.jointCount, 0) AS jointCount, + COALESCE(jc.FjointCount, 0) AS FjointCount, + c.WelderCode, + COALESCE(ws.WelderNum, 0) AS WelderNum, + COALESCE(nc.NdeNum, 0) AS NdeNum, + COALESCE(ws.FNdeNum, 0) AS FNdeNum, + (CASE WHEN COALESCE(ws.WelderNum, 0) = 0 THEN '0.00%' + ELSE CAST(CAST(CAST((COALESCE(nc.NdeNum, 0))*100 AS FLOAT)/COALESCE(ws.WelderNum, 0) AS DECIMAL(19,2)) AS NVARCHAR(19))+'%' END) AS Ratio ,--瀹為檯妫娴嬫瘮渚 + COALESCE(nc.NdeReportNo, '') AS NdeReportNo + FROM PTP_PipelineList a + INNER JOIN PTP_TestPackage b ON a.PTP_ID = b.PTP_ID + INNER JOIN CTE_WeldJoints c ON c.PipelineId = a.PipelineId + INNER JOIN Pipeline_Pipeline d ON c.PipelineId = d.PipelineId + LEFT JOIN Base_Material m ON d.MainMaterialId = m.MaterialId + LEFT JOIN CTE_JoinCounts jc ON jc.PipelineId = a.PipelineId + LEFT JOIN CTE_WelderStats ws ON ws.PipelineId = a.PipelineId AND ws.WelderCode = c.WelderCode + LEFT JOIN CTE_NDECounts nc ON nc.PipelineId = a.PipelineId AND nc.WelderCode = c.WelderCode + WHERE b.PTP_ID = @PTPID + and b.ProjectId = @projectId + AND c.WelderCode IS NOT NULL + AND COALESCE(ws.WelderNum, 0) > 0 + ORDER BY d.PipelineCode, m.MaterialCode, d.Specification, c.WelderCode"; + SqlParameter[] parms = + { + new SqlParameter("@PTPID",this.tvControlItem.SelectedNodeID), + new SqlParameter("@projectId",this.CurrUser.LoginProjectId ) + }; + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parms); + // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid2.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid2, tb); + Grid2.DataSource = table; + Grid2.DataBind(); + } + private void BindGridPT() { + string strSql = ""; + strSql = @" + WITH CTE_WeldJoints AS ( + SELECT PipelineId, WeldJointCode, JointAttribute, WelderCode, DetectionType, WeldJointId + FROM View_Pipeline_WeldJoint + WHERE DetectionType LIKE '%53704a2c-ce45-41d9-a6e7-be24f0780d87%' + ), + CTE_JoinCounts AS ( + SELECT PipelineId, + COUNT(*) AS jointCount, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FjointCount + FROM CTE_WeldJoints + GROUP BY PipelineId + ), + CTE_WelderStats AS ( + SELECT PipelineId, WelderCode, + COUNT(*) AS WelderNum, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FNdeNum + FROM CTE_WeldJoints + GROUP BY PipelineId, WelderCode + ), + CTE_NDECounts AS ( + + SELECT PipelineId, WelderCode, + COUNT(*) AS NdeNum, + STUFF((SELECT ',' + NDEReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint2 ON joint2.WeldJointId = trust.WeldJointId + WHERE joint2.PipelineId = joint.PipelineId AND joint2.WelderCode = joint.WelderCode + FOR XML PATH('')), 1, 1, '') AS NdeReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint ON joint.WeldJointId = trust.WeldJointId + GROUP BY PipelineId, WelderCode + + ) + SELECT DISTINCT d.PipelineCode, + m.MaterialCode, + d.Specification, + COALESCE(jc.jointCount, 0) AS jointCount, + COALESCE(jc.FjointCount, 0) AS FjointCount, + c.WelderCode, + COALESCE(ws.WelderNum, 0) AS WelderNum, + COALESCE(nc.NdeNum, 0) AS NdeNum, + COALESCE(ws.FNdeNum, 0) AS FNdeNum, + (CASE WHEN COALESCE(ws.WelderNum, 0) = 0 THEN '0.00%' + ELSE CAST(CAST(CAST((COALESCE(nc.NdeNum, 0))*100 AS FLOAT)/COALESCE(ws.WelderNum, 0) AS DECIMAL(19,2)) AS NVARCHAR(19))+'%' END) AS Ratio ,--瀹為檯妫娴嬫瘮渚 + COALESCE(nc.NdeReportNo, '') AS NdeReportNo + FROM PTP_PipelineList a + INNER JOIN PTP_TestPackage b ON a.PTP_ID = b.PTP_ID + INNER JOIN CTE_WeldJoints c ON c.PipelineId = a.PipelineId + INNER JOIN Pipeline_Pipeline d ON c.PipelineId = d.PipelineId + LEFT JOIN Base_Material m ON d.MainMaterialId = m.MaterialId + LEFT JOIN CTE_JoinCounts jc ON jc.PipelineId = a.PipelineId + LEFT JOIN CTE_WelderStats ws ON ws.PipelineId = a.PipelineId AND ws.WelderCode = c.WelderCode + LEFT JOIN CTE_NDECounts nc ON nc.PipelineId = a.PipelineId AND nc.WelderCode = c.WelderCode + WHERE b.PTP_ID = @PTPID + and b.ProjectId = @projectId + AND c.WelderCode IS NOT NULL + AND COALESCE(ws.WelderNum, 0) > 0 + ORDER BY d.PipelineCode, m.MaterialCode, d.Specification, c.WelderCode"; + SqlParameter[] parms = + { + new SqlParameter("@PTPID",this.tvControlItem.SelectedNodeID), + new SqlParameter("@projectId",this.CurrUser.LoginProjectId ) + }; + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parms); + // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid3.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid3, tb); + Grid3.DataSource = table; + Grid3.DataBind(); } /// @@ -656,6 +816,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage } #endregion + #region 璇曞帇鍖呮墦鍗 /// @@ -3696,6 +3857,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage a.WeldingMethodCode, a.WeldingDate, a.WeldSilkCode, + a.WeldSilkName, a.WeldMatCode, a.BackingWelderCode, a.CoverWelderCode, @@ -3710,7 +3872,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage FROM PTP_TestPackage as b inner join PTP_PipelineList as c on b.PTP_ID=c.PTP_ID inner join View_Pipeline_WeldJoint as a on c.PipelineId=a.PipelineId - left join Project_WorkArea as e on e.WorkAreaId=c.WorkAreaId + inner join Project_WorkArea as e on e.WorkAreaId=c.WorkAreaId WHERE Is_hjName='鏄' and b.PTP_ID=@PTPID and a.projectId=@projectId "; @@ -3727,11 +3889,11 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.SetColumnWidth(0, 15 * 256); ws.SetColumnWidth(1, 6 * 256); - ws.SetColumnWidth(2, 6 * 256); - ws.SetColumnWidth(3, 9 * 256); + ws.SetColumnWidth(2, 3 * 256); + ws.SetColumnWidth(3, 8 * 256); ws.SetColumnWidth(4, 11 * 256); - ws.SetColumnWidth(5, 9 * 256); - ws.SetColumnWidth(6, 8 * 256); + ws.SetColumnWidth(5, 11 * 256); + ws.SetColumnWidth(6, 10 * 256); ws.SetColumnWidth(7, 10 * 256); ws.SetColumnWidth(8, 6 * 256); ws.SetColumnWidth(9, 6 * 256); @@ -3855,6 +4017,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage #endregion #region 琛ㄦ牸 + var style2 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 6, true, false); ws = ExcelCreateRowNew(ws, hssfworkbook, rowIndex + 6, rowIndex + 17, style, 0, 14, 18); var dataTit = rowIndex + 6; @@ -3921,13 +4084,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(dataIndex).GetCell(8).SetCellValue(dr["WeldingMethodCode"].ToString()); //鐒婃潗鐗屽彿 List silkMats = new List(); - if (!string.IsNullOrWhiteSpace(dr["WeldSilkCode"].ToString())) + if (!string.IsNullOrWhiteSpace(dr["WeldSilkName"].ToString())) { - silkMats.Add(dr["WeldSilkCode"].ToString()); + silkMats.Add(dr["WeldSilkName"].ToString()); } - if (!string.IsNullOrWhiteSpace(dr["WeldMatCode"].ToString())) + + + if (!string.IsNullOrWhiteSpace(dr["WeldSilkName"].ToString())) { - silkMats.Add(dr["WeldMatCode"].ToString()); + silkMats.Add(dr["WeldSilkName"].ToString()); } if (silkMats.Count > 0) silkMats = silkMats.GroupBy(x => x).Select(x => x.Key).ToList(); ws.GetRow(dataIndex).GetCell(10).SetCellValue(string.Join("/", silkMats)); @@ -4036,100 +4201,222 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage //22-灏勭嚎妫娴嬫瘮渚嬬‘璁よ〃SHT 3503-J412-2007 private void template22(XSSFWorkbook hssfworkbook, XSSFSheet ws) { + var PipelineIdList = (from x in Funs.DB.PTP_PipelineList where x.PTP_ID == tvControlItem.SelectedNodeID select x.PipelineId).ToList().Distinct(); + var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID); //鑾峰彇绛惧悕 var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer); + int rowIndex = 0; + int pageIndex =1; + foreach (var pipelineId in PipelineIdList) + { + // string sql = @" + // WITH CTE_WeldJoints AS (SELECT PipelineId, WeldJointCode, JointAttribute, WelderCode, DetectionType,WeldJointId + // FROM View_Pipeline_WeldJoint + // WHERE DetectionType LIKE '%32617d42-24cb-4390-b115-d53c9c9e2c81%') + //select * + //from (select d.PipelineCode, + // (select MaterialCode from Base_Material as m where d.MainMaterialId = m.MaterialId) as MaterialCode, + // d.Specification, + // (select count(1) + // from CTE_WeldJoints as joint + // where joint.PipelineId = a.PipelineId) as jointCount, --褰撳墠绠＄嚎鐨勭剨鍙ｆ绘暟 + // (case + // when a.isAll = 1 then + // (select count(1) + // from CTE_WeldJoints as joint + // where joint.PipelineId = a.PipelineId + // and joint.JointAttribute = '鍥哄畾F') + // else + // (select count(1) + // from CTE_WeldJoints as joint + // where joint.PipelineId = a.PipelineId + // and joint.JointAttribute = '鍥哄畾' + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0) + // end) as FjointCount, --褰撳墠绠＄嚎鐨勭剨鍙ｇ殑鍥哄畾鍙ｆ绘暟 + // c.WelderCode, --鐒婂伐鍙 + // (case + // when a.isAll = 1 then + // (select count(1) + // from CTE_WeldJoints as vjoint + // where vjoint.PipelineId = a.PipelineId + // and vjoint.WelderCode = c.WelderCode) + // else + // (select count(1) + // from CTE_WeldJoints as vjoint + // where vjoint.PipelineId = a.PipelineId + // and CHARINDEX(',' + vjoint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and vjoint.WelderCode = c.WelderCode) + // end) as WelderNum, + // (case + // when a.isAll = 1 then + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and joint.WelderCode = c.WelderCode) + // else + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and joint.WelderCode = c.WelderCode) + // end + // ) as NdeNum, --妫娴嬪彛鏁伴噺 + // (case + // when a.isAll = 1 then + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and joint.JointAttribute = '鍥哄畾F' + // and joint.WelderCode = c.WelderCode) + // else + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and joint.JointAttribute = '鍥哄畾F' + // and joint.WelderCode = c.WelderCode) + // end + // ) as FNdeNum, --妫娴嬪浐瀹氬彛鏁伴噺 + // ( + // case + // when a.isAll = 1 then + // (stuff((select ',' + nde.NDEReportNo + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and joint.WelderCode = c.WelderCode + // FOR xml path ('')), 1, 1, '')) + // else + // (stuff((select ',' + nde.NDEReportNo + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and joint.WelderCode = c.WelderCode + // FOR xml path ( '' )), 1, 1, '')) + // end) as NdeReportNo + // from PTP_PipelineList as a + // inner join + // PTP_TestPackage as b on a.PTP_ID = b.PTP_ID + // inner join View_Pipeline_WeldJoint as c + // on c.PipelineId = a.PipelineId + // inner join Pipeline_Pipeline as d + // on c.PipelineId = d.PipelineId + // where b.PTP_ID = @PTPID + // and b.ProjectId = @projectId and a.PipelineId=@PipelineId + // AND c.WelderCode IS NOT NULL) as t where t.WelderNum >0 + //group by t.PipelineCode, t.MaterialCode, t.Specification, t.jointCount, t.FjointCount, t.WelderCode, t.WelderNum, + // t.NdeNum, t.FNdeNum, t.NdeReportNo + //ORDER BY t.PipelineCode, t.MaterialCode, t.Specification, t.jointCount, t.FjointCount, t.WelderCode "; + string sql = @" +WITH CTE_WeldJoints AS ( + SELECT PipelineId, WeldJointCode, JointAttribute, WelderCode, DetectionType, WeldJointId + FROM View_Pipeline_WeldJoint + WHERE DetectionType LIKE '%32617d42-24cb-4390-b115-d53c9c9e2c81%' +), +CTE_JoinCounts AS ( + SELECT PipelineId, + COUNT(*) AS jointCount, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FjointCount + FROM CTE_WeldJoints + GROUP BY PipelineId +), +CTE_WelderStats AS ( + SELECT PipelineId, WelderCode, + COUNT(*) AS WelderNum, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FNdeNum + FROM CTE_WeldJoints + GROUP BY PipelineId, WelderCode +), +CTE_NDECounts AS ( + SELECT PipelineId, WelderCode, + COUNT(*) AS NdeNum, + STUFF((SELECT ',' + NDEReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint2 ON joint2.WeldJointId = trust.WeldJointId + WHERE joint2.PipelineId = joint.PipelineId AND joint2.WelderCode = joint.WelderCode + FOR XML PATH('')), 1, 1, '') AS NdeReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint ON joint.WeldJointId = trust.WeldJointId + GROUP BY PipelineId, WelderCode - string sql = @" - select * from ( - select d.PipelineCode, - (select MaterialCode from Base_Material as m where d.MainMaterialId=m.MaterialId) as MaterialCode , - d.Specification, - (select count(1) from Pipeline_WeldJoint as joint where joint.PipelineId=a.PipelineId) as jointCount, --褰撳墠绠＄嚎鐨勭剨鍙ｆ绘暟 - ( case when a.isAll=1 then - (select count(1) from Pipeline_WeldJoint as joint where joint.PipelineId=a.PipelineId and joint.JointAttribute='鍥哄畾F') - else - (select count(1) from Pipeline_WeldJoint as joint where joint.PipelineId=a.PipelineId and joint.JointAttribute='鍥哄畾' and CHARINDEX(','+joint.WeldJointCode+',',','+a.WeldJonintCode+'')>0) - - end ) as FjointCount, --褰撳墠绠＄嚎鐨勭剨鍙ｇ殑鍥哄畾鍙ｆ绘暟 - c.WelderCode, --鐒婂伐鍙 - ( case when a.isAll=1 then - (select count(1) from View_Pipeline_WeldJoint as vjoint where vjoint.PipelineId=a.PipelineId and vjoint.WelderCode=c.WelderCode) - else - (select count(1) from View_Pipeline_WeldJoint as vjoint where vjoint.PipelineId=a.PipelineId - and CHARINDEX(','+vjoint.WeldJointCode+',',','+a.WeldJonintCode+'')>0 and vjoint.WelderCode=c.WelderCode) - end ) as WelderNum, - (case when a.isAll=1 then - (select count(1) from Batch_NDEItem as nde inner join Batch_BatchTrustItem as trust - ON trust.TrustBatchItemId = nde.TrustBatchItemId - inner join View_Pipeline_WeldJoint as joint - ON joint.WeldJointId=trust.WeldJointId - where joint.PipelineId=a.PipelineId and joint.WelderCode=c.WelderCode) - else - ( - select count(1) from Batch_NDEItem as nde inner join Batch_BatchTrustItem as trust - ON trust.TrustBatchItemId = nde.TrustBatchItemId - inner join View_Pipeline_WeldJoint as joint - ON joint.WeldJointId=trust.WeldJointId - where joint.PipelineId=a.PipelineId and CHARINDEX(','+joint.WeldJointCode+',',','+a.WeldJonintCode+'')>0 and joint.WelderCode=c.WelderCode - ) - end - ) as NdeNum, --妫娴嬪彛鏁伴噺 - (case when a.isAll=1 then - (select count(1) from Batch_NDEItem as nde inner join Batch_BatchTrustItem as trust - ON trust.TrustBatchItemId = nde.TrustBatchItemId - inner join View_Pipeline_WeldJoint as joint - ON joint.WeldJointId=trust.WeldJointId - where joint.PipelineId=a.PipelineId and joint.JointAttribute='鍥哄畾F' and joint.WelderCode=c.WelderCode) - else - ( - select count(1) from Batch_NDEItem as nde inner join Batch_BatchTrustItem as trust - ON trust.TrustBatchItemId = nde.TrustBatchItemId - inner join View_Pipeline_WeldJoint as joint - ON joint.WeldJointId=trust.WeldJointId - where joint.PipelineId=a.PipelineId and CHARINDEX(','+joint.WeldJointCode+',',','+a.WeldJonintCode+'')>0 and joint.JointAttribute='鍥哄畾F' and joint.WelderCode=c.WelderCode - ) - end - ) as FNdeNum , --妫娴嬪浐瀹氬彛鏁伴噺 - ( - case when a.isAll=1 then - (stuff((select ','+nde.NDEReportNo from Batch_NDEItem as nde inner join Batch_BatchTrustItem as trust - ON trust.TrustBatchItemId = nde.TrustBatchItemId - inner join View_Pipeline_WeldJoint as joint - ON joint.WeldJointId=trust.WeldJointId - where joint.PipelineId=a.PipelineId and joint.WelderCode=c.WelderCode FOR xml path ('') ),1,1,'')) - else - (stuff((select ','+nde.NDEReportNo from Batch_NDEItem as nde inner join Batch_BatchTrustItem as trust - ON trust.TrustBatchItemId = nde.TrustBatchItemId - inner join View_Pipeline_WeldJoint as joint - ON joint.WeldJointId=trust.WeldJointId - where joint.PipelineId=a.PipelineId and CHARINDEX(','+joint.WeldJointCode+',',','+a.WeldJonintCode+'')>0 and joint.WelderCode=c.WelderCode FOR xml path ( '' ) ),1,1,'') ) - end) as NdeReportNo - from - PTP_PipelineList as a inner join - PTP_TestPackage as b on a.PTP_ID=b.PTP_ID - inner join View_Pipeline_WeldJoint as c - on c.PipelineId=a.PipelineId - inner join Pipeline_Pipeline as d - on c.PipelineId=d.PipelineId - where b.PTP_ID=@PTPID and b.ProjectId=@projectId AND c.WelderCode IS NOT NULL - ) as t - group by t.PipelineCode,t.MaterialCode,t.Specification,t.jointCount,t.FjointCount,t.WelderCode,t.WelderNum,t.NdeNum,t.FNdeNum,t.NdeReportNo - ORDER BY t.PipelineCode,t.MaterialCode,t.Specification,t.jointCount,t.FjointCount,t.WelderCode"; +) +SELECT DISTINCT d.PipelineCode, + m.MaterialCode, + d.Specification, + COALESCE(jc.jointCount, 0) AS jointCount, + COALESCE(jc.FjointCount, 0) AS FjointCount, + c.WelderCode, + COALESCE(ws.WelderNum, 0) AS WelderNum, + COALESCE(nc.NdeNum, 0) AS NdeNum, + COALESCE(ws.FNdeNum, 0) AS FNdeNum, + COALESCE(nc.NdeReportNo, '') AS NdeReportNo +FROM PTP_PipelineList a +INNER JOIN PTP_TestPackage b ON a.PTP_ID = b.PTP_ID +INNER JOIN CTE_WeldJoints c ON c.PipelineId = a.PipelineId +INNER JOIN Pipeline_Pipeline d ON c.PipelineId = d.PipelineId +LEFT JOIN Base_Material m ON d.MainMaterialId = m.MaterialId +LEFT JOIN CTE_JoinCounts jc ON jc.PipelineId = a.PipelineId +LEFT JOIN CTE_WelderStats ws ON ws.PipelineId = a.PipelineId AND ws.WelderCode = c.WelderCode +LEFT JOIN CTE_NDECounts nc ON nc.PipelineId = a.PipelineId AND nc.WelderCode = c.WelderCode +WHERE b.PTP_ID = @PTPID + and b.ProjectId = @projectId and a.PipelineId=@PipelineId +AND c.WelderCode IS NOT NULL +AND COALESCE(ws.WelderNum, 0) > 0 +ORDER BY d.PipelineCode, m.MaterialCode, d.Specification, c.WelderCode"; SqlParameter[] parms = { new SqlParameter("@PTPID",this.tvControlItem.SelectedNodeID), - new SqlParameter("@projectId",this.CurrUser.LoginProjectId) + new SqlParameter("@projectId",this.CurrUser.LoginProjectId), + new SqlParameter("@PipelineId",pipelineId) }; DataTable tb = SQLHelper.GetDataTableRunText(sql, parms); - var tbNum = tb.Rows.Count; - var pageNum = + var DetectionRateCode = (from x in Funs.DB.View_Pipeline_Pipeline + where x.PipelineId == pipelineId + select x.DetectionRateCode).FirstOrDefault(); + //濡傛灉tb鐨勮鏁颁笉鏄8鐨勫嶆暟锛屾坊鍔犵┖鐧借鑷宠鏁颁负8鐨勫嶆暟 + // 璁＄畻闇瑕佹坊鍔犵殑绌虹櫧琛屾暟 + int remainder = tb.Rows.Count % 8; + if (remainder != 0) + { + int rowsToAdd = 8 - remainder; // 璁＄畻闇瑕佹坊鍔犵殑琛屾暟 + for (int i = 0; i < rowsToAdd; i++) + { + tb.Rows.Add(tb.NewRow()); // 娣诲姞绌虹櫧琛 + } + } + var tbNum = tb.Rows.Count; + var pageNum = tbNum < 8 ? 1 : Math.Ceiling((float)(tbNum - 8) / 8) + 1; - int rowIndex = 0; - for (int i = 1; i <= pageNum; i++) + for (int i = 1; i <= pageNum; i++) { #region 澶撮儴 var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10.5, true, false, "瀹嬩綋"); @@ -4188,7 +4475,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage RegionUtil.SetBorderTop(0, new CellRangeAddress(rowIndex + 3, rowIndex + 3, 18, 20), ws); - ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue($"鍏 {pageNum} 椤 绗 {i} 椤"); + ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue($"鍏 pageNum 椤 绗 {pageIndex} 椤"); ws.GetRow(rowIndex + 4).GetCell(0).SetCellValue("鎵ц鏍囧噯\r\nApplicable code"); @@ -4201,7 +4488,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("妫娴嬫柟娉昞r\nExam. Method"); ws.GetRow(rowIndex + 4).GetCell(8).SetCellValue("灏勭嚎妫娴媆r\nRT"); ws.GetRow(rowIndex + 4).GetCell(16).SetCellValue("妫娴嬫瘮渚媆r\nExam. Rate"); - ws.GetRow(rowIndex + 4).GetCell(18).SetCellValue("5%"); + ws.GetRow(rowIndex + 4).GetCell(18).SetCellValue(DetectionRateCode); ws.GetRow(rowIndex).Height = 27 * 20; ws.GetRow(rowIndex + 1).Height = 27 * 20; @@ -4287,7 +4574,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage for (int k = rowIndex + 7; k < rowIndex + 16; k++) { - ws.GetRow(k).Height = 18 * 20; + ws.GetRow(k).Height = 18 * 30; //灏忚琛 if (k == rowIndex + 15) { @@ -4411,16 +4698,19 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(dataIndex).GetCell(15).SetCellValue(dr["FNdeNum"].ToString()); string a = string.IsNullOrEmpty(dr["NdeNum"].ToString()) ? "0" : dr["NdeNum"].ToString(); string b = string.IsNullOrEmpty(dr["WelderNum"].ToString()) ? "0" : dr["WelderNum"].ToString(); - - if (b == "0") - { - ws.GetRow(dataIndex).GetCell(17).SetCellValue("0%"); - } - else - { - decimal rate = Math.Round((decimal.Parse(a) / decimal.Parse(b)), 2); - ws.GetRow(dataIndex).GetCell(17).SetCellValue($"{rate * 100}%"); - } + if (!string.IsNullOrEmpty(dr["WelderCode"].ToString())) + { + if (b == "0") + { + ws.GetRow(dataIndex).GetCell(17).SetCellValue("0%"); + } + else + { + decimal rate = Math.Round((decimal.Parse(a) / decimal.Parse(b)), 2); + ws.GetRow(dataIndex).GetCell(17).SetCellValue($"{rate * 100}%"); + } + } + ws.GetRow(dataIndex).GetCell(20).SetCellValue(dr["NdeReportNo"].ToString()); } else @@ -4432,8 +4722,14 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage } j++; } - + ws.GetRow(rowIndex + 15).GetCell(0).SetCellValue("灏忚\r\nTotal"); + ws.GetRow(rowIndex + 15).GetCell(5).SetCellValue(pagelist.FirstOrDefault().jointCount.ToString() );// + ws.GetRow(rowIndex + 15).GetCell(7).SetCellValue(pagelist.FirstOrDefault().FjointCount.ToString());// + ws.GetRow(rowIndex + 15).GetCell(11).SetCellValue(pagelist.Sum(x=>Convert.ToInt32(x.WelderNum)).ToString());// + ws.GetRow(rowIndex + 15).GetCell(13).SetCellValue(pagelist.Sum(x=>Convert.ToInt32(x.NdeNum)).ToString());// + ws.GetRow(rowIndex + 15).GetCell(15).SetCellValue(pagelist.Sum(x => Convert.ToInt32(x.FNdeNum)).ToString());// + ws.GetRow(rowIndex + 15).Height = 25 * 20; #endregion @@ -4547,16 +4843,29 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage #endregion rowIndex = rowIndex + 24; + pageIndex++; } + + } + for (int i = ws.FirstRowNum; i <= ws.LastRowNum; i++) + { + var row = ws.GetRow(i); + for (int j = row.FirstCellNum; j < row.LastCellNum; j++) + { + var cell = row.GetCell(j); + if (cell!=null & cell.StringCellValue.Contains( "pageNum")) //<%=date%> 銆<%=servname%>涓烘浛鎹㈠墠鍐呭 + { + cell.SetCellValue(cell.StringCellValue.Replace("pageNum", (pageIndex-1).ToString())); //date銆乻ervname涓烘浛鎹㈠悗鐨勫唴瀹 + } + } + } ws.PrintSetup.Landscape = true; ws.ForceFormulaRecalculation = true; ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; //鍨傜洿姘村钩灞呬腑 ws.VerticallyCenter = true; ws.HorizontallyCenter = true; - - } //23-TP-09-瓒呭０&PAUT&TOFD妫娴嬫瘮渚嬬‘璁よ〃 @@ -4856,237 +5165,595 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage //24-TP-10-娓楅&MT妫娴嬫瘮渚嬬‘璁よ〃 private void template24(XSSFWorkbook hssfworkbook, XSSFSheet ws) { + var PipelineIdList = (from x in Funs.DB.PTP_PipelineList where x.PTP_ID == tvControlItem.SelectedNodeID select x.PipelineId).ToList().Distinct(); + var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID); //鑾峰彇绛惧悕 var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer); - - //妯℃嫙鏁版嵁 - string sql = @"select '妯℃嫙鏁版嵁' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '妯℃嫙鏁版嵁' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '妯℃嫙鏁版嵁' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User"; - SqlParameter[] parms = new SqlParameter[] { new SqlParameter("@PTP_ID", this.tvControlItem.SelectedNodeID) }; - var dt = SQLHelper.GetDataTableRunText(sql, parms); - - var tbNum = dt.Rows.Count; - var pageNum = tbNum < 8 ? 1 : Math.Ceiling((float)(tbNum - 8) / 8) + 1; - int rowIndex = 0; - for (int num = 1; num <= pageNum; num++) + int pageIndex = 1; + foreach (var pipelineId in PipelineIdList) { - var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 9, true, false, "Arial Unicode MS"); + // string sql = @" + // WITH CTE_WeldJoints AS (SELECT PipelineId, WeldJointCode, JointAttribute, WelderCode, DetectionType,WeldJointId + // FROM View_Pipeline_WeldJoint + // WHERE DetectionType LIKE '%53704a2c-ce45-41d9-a6e7-be24f0780d87%') + //select * + //from (select d.PipelineCode, + // (select MaterialCode from Base_Material as m where d.MainMaterialId = m.MaterialId) as MaterialCode, + // d.Specification, + // (select count(1) + // from CTE_WeldJoints as joint + // where joint.PipelineId = a.PipelineId) as jointCount, --褰撳墠绠＄嚎鐨勭剨鍙ｆ绘暟 + // (case + // when a.isAll = 1 then + // (select count(1) + // from CTE_WeldJoints as joint + // where joint.PipelineId = a.PipelineId + // and joint.JointAttribute = '鍥哄畾F') + // else + // (select count(1) + // from CTE_WeldJoints as joint + // where joint.PipelineId = a.PipelineId + // and joint.JointAttribute = '鍥哄畾' + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0) + // end) as FjointCount, --褰撳墠绠＄嚎鐨勭剨鍙ｇ殑鍥哄畾鍙ｆ绘暟 + // c.WelderCode, --鐒婂伐鍙 + // (case + // when a.isAll = 1 then + // (select count(1) + // from CTE_WeldJoints as vjoint + // where vjoint.PipelineId = a.PipelineId + // and vjoint.WelderCode = c.WelderCode) + // else + // (select count(1) + // from CTE_WeldJoints as vjoint + // where vjoint.PipelineId = a.PipelineId + // and CHARINDEX(',' + vjoint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and vjoint.WelderCode = c.WelderCode) + // end) as WelderNum, + // (case + // when a.isAll = 1 then + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and joint.WelderCode = c.WelderCode) + // else + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and joint.WelderCode = c.WelderCode) + // end + // ) as NdeNum, --妫娴嬪彛鏁伴噺 + // (case + // when a.isAll = 1 then + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and joint.JointAttribute = '鍥哄畾F' + // and joint.WelderCode = c.WelderCode) + // else + // (select count(1) + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and joint.JointAttribute = '鍥哄畾F' + // and joint.WelderCode = c.WelderCode) + // end + // ) as FNdeNum, --妫娴嬪浐瀹氬彛鏁伴噺 + // ( + // case + // when a.isAll = 1 then + // (stuff((select ',' + nde.NDEReportNo + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and joint.WelderCode = c.WelderCode + // FOR xml path ('')), 1, 1, '')) + // else + // (stuff((select ',' + nde.NDEReportNo + // from Batch_NDEItem as nde + // inner join Batch_BatchTrustItem as trust + // ON trust.TrustBatchItemId = nde.TrustBatchItemId + // inner join CTE_WeldJoints as joint + // ON joint.WeldJointId = trust.WeldJointId + // where joint.PipelineId = a.PipelineId + // and CHARINDEX(',' + joint.WeldJointCode + ',', ',' + a.WeldJonintCode + '') > 0 + // and joint.WelderCode = c.WelderCode + // FOR xml path ( '' )), 1, 1, '')) + // end) as NdeReportNo + // from PTP_PipelineList as a + // inner join + // PTP_TestPackage as b on a.PTP_ID = b.PTP_ID + // inner join View_Pipeline_WeldJoint as c + // on c.PipelineId = a.PipelineId + // inner join Pipeline_Pipeline as d + // on c.PipelineId = d.PipelineId + // where b.PTP_ID = @PTPID + // and b.ProjectId = @projectId and a.PipelineId=@PipelineId + // AND c.WelderCode IS NOT NULL) as t where t.WelderNum >0 + //group by t.PipelineCode, t.MaterialCode, t.Specification, t.jointCount, t.FjointCount, t.WelderCode, t.WelderNum, + // t.NdeNum, t.FNdeNum, t.NdeReportNo + //ORDER BY t.PipelineCode, t.MaterialCode, t.Specification, t.jointCount, t.FjointCount, t.WelderCode "; + string sql = @" +WITH CTE_WeldJoints AS ( + SELECT PipelineId, WeldJointCode, JointAttribute, WelderCode, DetectionType, WeldJointId + FROM View_Pipeline_WeldJoint + WHERE DetectionType LIKE '%53704a2c-ce45-41d9-a6e7-be24f0780d87%' +), +CTE_JoinCounts AS ( + SELECT PipelineId, + COUNT(*) AS jointCount, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FjointCount + FROM CTE_WeldJoints + GROUP BY PipelineId +), +CTE_WelderStats AS ( + SELECT PipelineId, WelderCode, + COUNT(*) AS WelderNum, + SUM(CASE WHEN JointAttribute = '鍥哄畾F' THEN 1 ELSE 0 END) AS FNdeNum + FROM CTE_WeldJoints + GROUP BY PipelineId, WelderCode +), +CTE_NDECounts AS ( - #region 澶撮儴 - var style1 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Right, 9, true, false, "Arial Unicode MS"); - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex, style1, 0, 20, true); + SELECT PipelineId, WelderCode, + COUNT(*) AS NdeNum, + STUFF((SELECT ',' + NDEReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint2 ON joint2.WeldJointId = trust.WeldJointId + WHERE joint2.PipelineId = joint.PipelineId AND joint2.WelderCode = joint.WelderCode + FOR XML PATH('')), 1, 1, '') AS NdeReportNo + FROM Batch_NDEItem nde + INNER JOIN Batch_BatchTrustItem trust ON trust.TrustBatchItemId = nde.TrustBatchItemId + INNER JOIN View_Pipeline_WeldJoint joint ON joint.WeldJointId = trust.WeldJointId + GROUP BY PipelineId, WelderCode - //璁剧疆琛屽搴 - ws.SetColumnWidth(0, 13 * 256);//A - ws.SetColumnWidth(1, 2 * 256);//B - ws.SetColumnWidth(2, 7 * 256);//C - ws.SetColumnWidth(3, 5 * 256);//D - ws.SetColumnWidth(4, 4 * 256);//E - ws.SetColumnWidth(5, 5 * 256);//F - ws.SetColumnWidth(6, 6 * 256);//G - ws.SetColumnWidth(7, 6 * 256);//H - ws.SetColumnWidth(8, 6 * 256);//I - ws.SetColumnWidth(9, 5 * 256);//J - ws.SetColumnWidth(10, 5 * 256);//K - ws.SetColumnWidth(11, 5 * 256);//L - ws.SetColumnWidth(12, 7 * 256);//M - ws.SetColumnWidth(13, 5 * 256);//N - ws.SetColumnWidth(14, 5 * 256);//O - ws.SetColumnWidth(15, 5 * 256);//P - ws.SetColumnWidth(16, 5 * 256);//Q - ws.SetColumnWidth(17, 6 * 256);//R - ws.SetColumnWidth(18, 6 * 256);//S - ws.SetColumnWidth(19, 6 * 256);//T - ws.SetColumnWidth(20, 13 * 256);//U - - //璁剧疆琛岄珮搴 - ws.GetRow(rowIndex).HeightInPoints = 10f; - ws.GetRow(rowIndex).GetCell(20).CellStyle = style1; - ws.GetRow(rowIndex).GetCell(20).SetCellValue("Form No. TP-10"); - - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 1, rowIndex + 2, style, 0, 20, true); - //璁剧疆琛岄珮搴 - ws.GetRow(rowIndex + 1).HeightInPoints = 90f; - ws.GetRow(rowIndex + 2).HeightInPoints = 30f; - - //鍚堝苟鍗曞厓鏍煎拰濉厖鏂囨湰 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 1, rowIndex + 1, 0, 2)); - ws.GetRow(rowIndex + 1).GetCell(0).SetCellValue(""); - - var style3 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 13, true, true, "Arial Unicode MS"); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 1, rowIndex + 1, 3, 17)); - ws.GetRow(rowIndex + 1).GetCell(3).CellStyle = style3; - ws.GetRow(rowIndex + 1).GetCell(3).SetCellValue($"绠￠亾鐒婃帴鎺ュご娓楅/纾佺矇妫娴嬫瘮渚嬬‘璁よ〃锛堜竴锛塡nPipeline Welding Joints Penetrant/Magnetic Examination Rate Confirmation Form锛圛锛塡n鍏 {pageNum} 椤 绗 {num} 椤"); - - var style2 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Top, NPOI.SS.UserModel.HorizontalAlignment.Left, 9, true, false, "Arial Unicode MS"); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 1, rowIndex + 1, 18, 20)); - ws.GetRow(rowIndex + 1).GetCell(18).CellStyle = style2; - ws.GetRow(rowIndex + 1).GetCell(18).SetCellValue($"\n宸ョ▼鍚嶇О锛歿info?.projectName}\n Project Name锛歿info?.enProjectName}\n 鍗曞厓鍚嶇О锛歿info?.workAreaName}\n Unit Name:{info?.enWorkAreaName}"); - - ws.GetRow(rowIndex + 2).GetCell(0).SetCellValue("鎵ц鏍囧噯\nApplicable code"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 1, 5)); - ws.GetRow(rowIndex + 2).GetCell(1).SetCellValue("NB/T47013.3-2015"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 6, 7)); - ws.GetRow(rowIndex + 2).GetCell(6).SetCellValue("妫娴嬫柟娉昞nExam. Method"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 8, 15)); - ws.GetRow(rowIndex + 2).GetCell(8).SetCellValue("娓楅忔娴媆nPT"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 16, 17)); - ws.GetRow(rowIndex + 2).GetCell(16).SetCellValue("妫娴嬫瘮渚媆nExam. Rate"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 18, 20)); - ws.GetRow(rowIndex + 2).GetCell(18).SetCellValue("95%"); - - #endregion - - #region 琛ㄦ牸閮ㄥ垎 - - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 3, rowIndex + 13, style, 0, 20, true); - //璁剧疆楂樺害鍜屽悎骞跺垪濉厖鏂囨湰 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 0, 1)); - ws.GetRow(rowIndex + 3).GetCell(0).SetCellValue("绠￠亾缂栧彿\nPipeline No."); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 2, 2)); - ws.GetRow(rowIndex + 3).GetCell(2).SetCellValue("鏉愯川\nMaterial"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 3, 4)); - ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue("瑙 鏍/Size\n mm"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 5, 8)); - ws.GetRow(rowIndex + 3).GetCell(5).SetCellValue("绠￠亾鐒婃帴鎺ュご\nWelding Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 9, 12)); - ws.GetRow(rowIndex + 3).GetCell(9).SetCellValue("鏂界剨鐒婂伐\nWelder"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 13, 16)); - ws.GetRow(rowIndex + 3).GetCell(13).SetCellValue("妫娴嬬剨鎺ユ帴澶碶nExanined Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 6)); - ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue("鎬绘暟\nTotal"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 7, 8)); - ws.GetRow(rowIndex + 4).GetCell(7).SetCellValue("鍥哄畾鍙ｆ暟\nField Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 9, 10)); - ws.GetRow(rowIndex + 4).GetCell(9).SetCellValue("鐒婂伐浠ｅ彿\nWelder No."); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 11, 12)); - ws.GetRow(rowIndex + 4).GetCell(11).SetCellValue("鏂界剨鏁伴噺\nWelded Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 13, 14)); - ws.GetRow(rowIndex + 4).GetCell(13).SetCellValue("鎬绘暟\nTotal Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 15, 16)); - ws.GetRow(rowIndex + 4).GetCell(15).SetCellValue("鍥哄畾鍙ｆ暟\nField Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 17, 19)); - ws.GetRow(rowIndex + 3).GetCell(17).SetCellValue("瀹為檯妫娴嬫瘮渚媆nActual exam. Rate"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 20, 20)); - ws.GetRow(rowIndex + 3).GetCell(20).SetCellValue("妫娴嬫姤鍛婄紪鍙穃nExamination Report No."); - - var dStart = 0; - var dEnd = 0; - if (num == 1) +) +SELECT DISTINCT d.PipelineCode, + m.MaterialCode, + d.Specification, + COALESCE(jc.jointCount, 0) AS jointCount, + COALESCE(jc.FjointCount, 0) AS FjointCount, + c.WelderCode, + COALESCE(ws.WelderNum, 0) AS WelderNum, + COALESCE(nc.NdeNum, 0) AS NdeNum, + COALESCE(ws.FNdeNum, 0) AS FNdeNum, + COALESCE(nc.NdeReportNo, '') AS NdeReportNo +FROM PTP_PipelineList a +INNER JOIN PTP_TestPackage b ON a.PTP_ID = b.PTP_ID +INNER JOIN CTE_WeldJoints c ON c.PipelineId = a.PipelineId +INNER JOIN Pipeline_Pipeline d ON c.PipelineId = d.PipelineId +LEFT JOIN Base_Material m ON d.MainMaterialId = m.MaterialId +LEFT JOIN CTE_JoinCounts jc ON jc.PipelineId = a.PipelineId +LEFT JOIN CTE_WelderStats ws ON ws.PipelineId = a.PipelineId AND ws.WelderCode = c.WelderCode +LEFT JOIN CTE_NDECounts nc ON nc.PipelineId = a.PipelineId AND nc.WelderCode = c.WelderCode +WHERE b.PTP_ID = @PTPID + and b.ProjectId = @projectId and a.PipelineId=@PipelineId +AND c.WelderCode IS NOT NULL +AND COALESCE(ws.WelderNum, 0) > 0 +ORDER BY d.PipelineCode, m.MaterialCode, d.Specification, c.WelderCode"; + SqlParameter[] parms = { - dStart = 0; - dEnd = 8; - } - else + new SqlParameter("@PTPID",this.tvControlItem.SelectedNodeID), + new SqlParameter("@projectId",this.CurrUser.LoginProjectId), + new SqlParameter("@PipelineId",pipelineId) + }; + DataTable tb = SQLHelper.GetDataTableRunText(sql, parms); + var DetectionRateCode = (from x in Funs.DB.View_Pipeline_Pipeline + where x.PipelineId == pipelineId + select x.DetectionRateCode).FirstOrDefault(); + //濡傛灉tb鐨勮鏁颁笉鏄8鐨勫嶆暟锛屾坊鍔犵┖鐧借鑷宠鏁颁负8鐨勫嶆暟 + // 璁＄畻闇瑕佹坊鍔犵殑绌虹櫧琛屾暟 + int remainder = tb.Rows.Count % 8; + if (remainder != 0) { - dStart = num == 2 ? 8 : ((num - 2) * 8) + 8; - dEnd = ((num - 1) * 8) + 8; - } - var pageTb = GetPageToTable(dt, dStart, dEnd); - - int j = 0; - for (int i = 3; i < 14; i++) - { - if (i == 3 || i == 4) + int rowsToAdd = 8 - remainder; // 璁＄畻闇瑕佹坊鍔犵殑琛屾暟 + for (int i = 0; i < rowsToAdd; i++) { - ws.GetRow(rowIndex + i).HeightInPoints = 30f; - continue; + tb.Rows.Add(tb.NewRow()); // 娣诲姞绌虹櫧琛 } - if (i == 13) + } + var tbNum = tb.Rows.Count; + var pageNum = + tbNum < 8 ? 1 + : Math.Ceiling((float)(tbNum - 8) / 8) + 1; + for (int num = 1; num <= pageNum; num++) + { + var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 9, true, false, "Arial Unicode MS"); + + #region 澶撮儴 + var style1 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Right, 9, true, false, "Arial Unicode MS"); + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex, style1, 0, 20, true); + + //璁剧疆琛屽搴 + ws.SetColumnWidth(0, 13 * 256);//A + ws.SetColumnWidth(1, 2 * 256);//B + ws.SetColumnWidth(2, 7 * 256);//C + ws.SetColumnWidth(3, 5 * 256);//D + ws.SetColumnWidth(4, 4 * 256);//E + ws.SetColumnWidth(5, 5 * 256);//F + ws.SetColumnWidth(6, 6 * 256);//G + ws.SetColumnWidth(7, 6 * 256);//H + ws.SetColumnWidth(8, 6 * 256);//I + ws.SetColumnWidth(9, 5 * 256);//J + ws.SetColumnWidth(10, 5 * 256);//K + ws.SetColumnWidth(11, 5 * 256);//L + ws.SetColumnWidth(12, 7 * 256);//M + ws.SetColumnWidth(13, 5 * 256);//N + ws.SetColumnWidth(14, 5 * 256);//O + ws.SetColumnWidth(15, 5 * 256);//P + ws.SetColumnWidth(16, 5 * 256);//Q + ws.SetColumnWidth(17, 6 * 256);//R + ws.SetColumnWidth(18, 6 * 256);//S + ws.SetColumnWidth(19, 6 * 256);//T + ws.SetColumnWidth(20, 13 * 256);//U + + //璁剧疆琛岄珮搴 + ws.GetRow(rowIndex).HeightInPoints = 10f; + ws.GetRow(rowIndex).GetCell(20).CellStyle = style1; + ws.GetRow(rowIndex).GetCell(20).SetCellValue("Form No. TP-10"); + + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 1, rowIndex + 2, style, 0, 20, true); + //璁剧疆琛岄珮搴 + ws.GetRow(rowIndex + 1).HeightInPoints = 90f; + ws.GetRow(rowIndex + 2).HeightInPoints = 30f; + + //鍚堝苟鍗曞厓鏍煎拰濉厖鏂囨湰 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 1, rowIndex + 1, 0, 2)); + ws.GetRow(rowIndex + 1).GetCell(0).SetCellValue(""); + + var style3 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 13, true, true, "Arial Unicode MS"); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 1, rowIndex + 1, 3, 17)); + ws.GetRow(rowIndex + 1).GetCell(3).CellStyle = style3; + ws.GetRow(rowIndex + 1).GetCell(3).SetCellValue($"绠￠亾鐒婃帴鎺ュご娓楅/纾佺矇妫娴嬫瘮渚嬬‘璁よ〃锛堜竴锛塡nPipeline Welding Joints Penetrant/Magnetic Examination Rate Confirmation Form锛圛锛塡n鍏 pageNum 椤 绗 {pageIndex} 椤"); + + var style2 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Top, NPOI.SS.UserModel.HorizontalAlignment.Left, 9, true, false, "Arial Unicode MS"); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 1, rowIndex + 1, 18, 20)); + ws.GetRow(rowIndex + 1).GetCell(18).CellStyle = style2; + ws.GetRow(rowIndex + 1).GetCell(18).SetCellValue($"\n宸ョ▼鍚嶇О锛歿info?.projectName}\n Project Name锛歿info?.enProjectName}\n 鍗曞厓鍚嶇О锛歿info?.workAreaName}\n Unit Name:{info?.enWorkAreaName}"); + + ws.GetRow(rowIndex + 2).GetCell(0).SetCellValue("鎵ц鏍囧噯\nApplicable code"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 1, 5)); + ws.GetRow(rowIndex + 2).GetCell(1).SetCellValue("NB/T47013.3-2015"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 6, 7)); + ws.GetRow(rowIndex + 2).GetCell(6).SetCellValue("妫娴嬫柟娉昞nExam. Method"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 8, 15)); + ws.GetRow(rowIndex + 2).GetCell(8).SetCellValue("娓楅忔娴媆nPT"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 16, 17)); + ws.GetRow(rowIndex + 2).GetCell(16).SetCellValue("妫娴嬫瘮渚媆nExam. Rate"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 2, rowIndex + 2, 18, 20)); + ws.GetRow(rowIndex + 2).GetCell(18).SetCellValue(DetectionRateCode); + + #endregion + + #region 琛ㄦ牸閮ㄥ垎 + + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 3, rowIndex + 13, style, 0, 20, true); + //璁剧疆楂樺害鍜屽悎骞跺垪濉厖鏂囨湰 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 0, 1)); + ws.GetRow(rowIndex + 3).GetCell(0).SetCellValue("绠￠亾缂栧彿\nPipeline No."); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 2, 2)); + ws.GetRow(rowIndex + 3).GetCell(2).SetCellValue("鏉愯川\nMaterial"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 3, 4)); + ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue("瑙 鏍/Size\n mm"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 5, 8)); + ws.GetRow(rowIndex + 3).GetCell(5).SetCellValue("绠￠亾鐒婃帴鎺ュご\nWelding Joints"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 9, 12)); + ws.GetRow(rowIndex + 3).GetCell(9).SetCellValue("鏂界剨鐒婂伐\nWelder"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 13, 16)); + ws.GetRow(rowIndex + 3).GetCell(13).SetCellValue("妫娴嬬剨鎺ユ帴澶碶nExanined Joints"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 6)); + ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue("鎬绘暟\nTotal"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 7, 8)); + ws.GetRow(rowIndex + 4).GetCell(7).SetCellValue("鍥哄畾鍙ｆ暟\nField Joints"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 9, 10)); + ws.GetRow(rowIndex + 4).GetCell(9).SetCellValue("鐒婂伐浠ｅ彿\nWelder No."); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 11, 12)); + ws.GetRow(rowIndex + 4).GetCell(11).SetCellValue("鏂界剨鏁伴噺\nWelded Joints"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 13, 14)); + ws.GetRow(rowIndex + 4).GetCell(13).SetCellValue("鎬绘暟\nTotal Joints"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 15, 16)); + ws.GetRow(rowIndex + 4).GetCell(15).SetCellValue("鍥哄畾鍙ｆ暟\nField Joints"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 17, 19)); + ws.GetRow(rowIndex + 3).GetCell(17).SetCellValue("瀹為檯妫娴嬫瘮渚媆nActual exam. Rate"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 4, 20, 20)); + ws.GetRow(rowIndex + 3).GetCell(20).SetCellValue("妫娴嬫姤鍛婄紪鍙穃nExamination Report No."); + var dStart = 0; + var dEnd = 0; + if (num == 1) { - ws.GetRow(rowIndex + i).HeightInPoints = 30f; + dStart = 0; + dEnd = 8; } else { - ws.GetRow(rowIndex + i).HeightInPoints = 17f; - if (pageTb.Rows.Count > j) + dStart = num == 2 ? 8 : ((num - 2) * 8) + 8; + dEnd = ((num - 1) * 8) + 8; + } + var pageTb = GetPageToTable(tb, dStart, dEnd); + + int j = 0; + + var pagelist = DataTableEx.ToList(pageTb); + + int oneNum = 1; + int twoNum = 1; + int threeNum = 1; + int fourNum = 1; + int fiveNum = 1; + + for (int i = 3; i < 14; i++) + { + if (i == 3 || i == 4) { - var dr = pageTb.Rows[j]; - ws.GetRow(rowIndex + i).GetCell(0).SetCellValue("妯℃嫙鏁版嵁"); + ws.GetRow(rowIndex + i).HeightInPoints = 30f; + continue; } - j++; + if (i == 13) + { + ws.GetRow(rowIndex + i).HeightInPoints = 30f; + } + else + { + ws.GetRow(rowIndex + i).HeightInPoints = 17f; + if (pageTb.Rows.Count > j) + { + var dr = pageTb.Rows[j]; + + ws.GetRow(rowIndex + i).GetCell(0).SetCellValue(dr["PipelineCode"].ToString()); + var PipelineCodeNum = pagelist.Count(x => x.PipelineCode == dr["PipelineCode"].ToString()); + if (PipelineCodeNum > 1) + { + if (oneNum == 1) + { + oneNum += PipelineCodeNum; + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i + PipelineCodeNum - 1, 0, 1)); + } + oneNum -= 1; + } + else + { + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 0, 1)); + } + + + ws.GetRow(rowIndex + i).GetCell(2).SetCellValue(dr["MaterialCode"].ToString()); + var MaterialCodeNum = pagelist.Count(x => x.PipelineCode == dr["PipelineCode"].ToString() && x.MaterialCode == dr["MaterialCode"].ToString()); + if (MaterialCodeNum > 1) + { + if (twoNum == 1) + { + twoNum += MaterialCodeNum; + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i + PipelineCodeNum - 1, 2, 2)); + } + twoNum -= 1; + } + int SpecificationNum = 0; + ws.GetRow(rowIndex + i).GetCell(3).SetCellValue(dr["Specification"].ToString()); + if (string.IsNullOrEmpty(dr["Specification"].ToString())) + { + SpecificationNum = pagelist.Count(x => x.PipelineCode == dr["PipelineCode"].ToString()); + } + else + { + SpecificationNum = pagelist.Count(x => x.PipelineCode == dr["PipelineCode"].ToString() && x.Specification == dr["Specification"].ToString()); + } + if (SpecificationNum > 1) + { + if (threeNum == 1) + { + threeNum += SpecificationNum; + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i + PipelineCodeNum - 1, 3, 4)); + } + threeNum -= 1; + } + else + { + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 3, 4)); + } + + ws.GetRow(rowIndex + i).GetCell(5).SetCellValue(dr["jointCount"].ToString()); + var jointCountNum = pagelist.Count(x => x.PipelineCode == dr["PipelineCode"].ToString() && x.jointCount == dr["jointCount"].ToString()); + if (jointCountNum > 1) + { + if (fourNum == 1) + { + fourNum += jointCountNum; + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i + PipelineCodeNum - 1, 5, 6)); + } + fourNum -= 1; + } + else + { + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 5, 6)); + } + + ws.GetRow(rowIndex + i).GetCell(7).SetCellValue(dr["FjointCount"].ToString()); + var FjointCountNum = pagelist.Count(x => x.PipelineCode == dr["PipelineCode"].ToString() && x.FjointCount == dr["FjointCount"].ToString()); + if (FjointCountNum > 1) + { + if (fiveNum == 1) + { + fiveNum += FjointCountNum; + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i + PipelineCodeNum - 1, 7, 8)); + } + fiveNum -= 1; + } + else + { + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 7, 8)); + } + + + ws.GetRow(rowIndex + i).GetCell(9).SetCellValue(dr["WelderCode"].ToString()); + ws.GetRow(rowIndex + i).GetCell(11).SetCellValue(dr["WelderNum"].ToString()); + ws.GetRow(rowIndex + i).GetCell(13).SetCellValue(dr["NdeNum"].ToString()); + ws.GetRow(rowIndex + i).GetCell(15).SetCellValue(dr["FNdeNum"].ToString()); + string a = string.IsNullOrEmpty(dr["NdeNum"].ToString()) ? "0" : dr["NdeNum"].ToString(); + string b = string.IsNullOrEmpty(dr["WelderNum"].ToString()) ? "0" : dr["WelderNum"].ToString(); + if (!string.IsNullOrEmpty(dr["WelderCode"].ToString())) + { + if (b == "0") + { + ws.GetRow(rowIndex + i).GetCell(17).SetCellValue("0%"); + } + else + { + decimal rate = Math.Round((decimal.Parse(a) / decimal.Parse(b)), 2); + ws.GetRow(rowIndex + i).GetCell(17).SetCellValue($"{rate * 100}%"); + } + } + + ws.GetRow(rowIndex + i).GetCell(20).SetCellValue(dr["NdeReportNo"].ToString()); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 9, 10)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 11, 12)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 13, 14)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 15, 16)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 17, 19)); + } + else + { + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 0, 1)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 3, 4)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 5, 6)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 7, 8)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 9, 10)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 11, 12)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 13, 14)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 15, 16)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 17, 19)); + } + j++; + } + + /* ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 0, 1)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 3, 4)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 5, 6)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 7, 8)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 9, 10)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 11, 12)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 13, 14)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 15, 16)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 17, 19));*/ } + ws.GetRow(rowIndex + 13).GetCell(0).SetCellValue("灏忚\nTotal"); + ws.GetRow(rowIndex + 13).GetCell(5).SetCellValue(pagelist.FirstOrDefault().jointCount.ToString());// + ws.GetRow(rowIndex + 13).GetCell(7).SetCellValue(pagelist.FirstOrDefault().FjointCount.ToString());// + ws.GetRow(rowIndex + 13).GetCell(11).SetCellValue(pagelist.Sum(x => Convert.ToInt32(x.WelderNum)).ToString());// + ws.GetRow(rowIndex + 13).GetCell(13).SetCellValue(pagelist.Sum(x => Convert.ToInt32(x.NdeNum)).ToString());// + ws.GetRow(rowIndex + 13).GetCell(15).SetCellValue(pagelist.Sum(x => Convert.ToInt32(x.FNdeNum)).ToString());// - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 0, 1)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 3, 4)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 5, 6)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 7, 8)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 9, 10)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 11, 12)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 13, 14)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 15, 16)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 17, 19)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 0, 1)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 3, 4)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 5, 6)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 7, 8)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 9, 10)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 11, 12)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 13, 14)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 15, 16)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 13, rowIndex + 13, 17, 19)); + #endregion + + #region 灏鹃儴 + + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 14, rowIndex + 16, style, 0, 20, true); + //璁剧疆琛岄珮 + ws.GetRow(rowIndex + 14).HeightInPoints = 30f; + ws.GetRow(rowIndex + 15).HeightInPoints = 30f; + ws.GetRow(rowIndex + 16).HeightInPoints = 125f; + + ws.GetRow(rowIndex + 14).GetCell(0).SetCellValue("澶囨敞\nRemark"); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 14, rowIndex + 14, 1, 20)); + + ws.GetRow(rowIndex + 14).GetCell(1).CellStyle = style2; + ws.GetRow(rowIndex + 14).GetCell(1).SetCellValue("鐒婂彛浣嶇疆涓庢娴嬬剨鍙ｈ绠￠亾鍗曠嚎鍥句笌鏃犳崯妫娴嬫姤鍛娿俓nPlease refer to Pipeline Iso-drawing and NDE Report for joints position and examined joints."); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 0, 3)); + ws.GetRow(rowIndex + 15).GetCell(0).SetCellValue("寤 璁 / 鐩 鐞 鍗 浣峔nOwner/JianLi Company"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 4, 9)); + ws.GetRow(rowIndex + 15).GetCell(4).SetCellValue("鎬 鎵 鍖 鍗 浣峔nGeneral Contractor"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 10, 16)); + ws.GetRow(rowIndex + 15).GetCell(10).SetCellValue("妫 娴 鍗 浣峔nExamination Contractor"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 17, 20)); + ws.GetRow(rowIndex + 15).GetCell(17).SetCellValue("鏂 宸 鍗 浣峔nConstruction Company"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 0, 3)); + ws.GetRow(rowIndex + 16).GetCell(0).CellStyle = style2; + ws.GetRow(rowIndex + 16).GetCell(0).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n\n\n\n\n\n 鏃ユ湡Date锛 骞 鏈 鏃"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 4, 9)); + ws.GetRow(rowIndex + 16).GetCell(4).CellStyle = style2; + ws.GetRow(rowIndex + 16).GetCell(4).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n\n\n\n\n\n 鏃ユ湡Date锛 骞 鏈 鏃"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 10, 16)); + ws.GetRow(rowIndex + 16).GetCell(10).CellStyle = style2; + ws.GetRow(rowIndex + 16).GetCell(10).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n\n\n\n\n\n 鏃ユ湡Date锛 骞 鏈 鏃"); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 17, 20)); + ws.GetRow(rowIndex + 16).GetCell(17).CellStyle = style2; + ws.GetRow(rowIndex + 16).GetCell(17).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n 璐ㄩ噺妫鏌ュ憳锛歕n Quality Inspector:\n 鍒惰〃锛歕n\n Prepared锛歕n 鏃ユ湡Date锛 骞 鏈 鏃"); + + #endregion + + rowIndex += 17; + pageIndex++; + } + } + for (int i = ws.FirstRowNum; i <= ws.LastRowNum; i++) + { + var row = ws.GetRow(i); + for (int j = row.FirstCellNum; j < row.LastCellNum; j++) + { + var cell = row.GetCell(j); + if (cell != null & cell.StringCellValue.Contains("pageNum")) //<%=date%> 銆<%=servname%>涓烘浛鎹㈠墠鍐呭 + { + cell.SetCellValue(cell.StringCellValue.Replace("pageNum", (pageIndex - 1).ToString())); //date銆乻ervname涓烘浛鎹㈠悗鐨勫唴瀹 + } } - ws.GetRow(rowIndex + 13).GetCell(0).SetCellValue("灏忚\nTotal"); - - #endregion - - #region 灏鹃儴 - - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 14, rowIndex + 16, style, 0, 20, true); - //璁剧疆琛岄珮 - ws.GetRow(rowIndex + 14).HeightInPoints = 30f; - ws.GetRow(rowIndex + 15).HeightInPoints = 30f; - ws.GetRow(rowIndex + 16).HeightInPoints = 125f; - - ws.GetRow(rowIndex + 14).GetCell(0).SetCellValue("澶囨敞\nRemark"); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 14, rowIndex + 14, 1, 20)); - - ws.GetRow(rowIndex + 14).GetCell(1).CellStyle = style2; - ws.GetRow(rowIndex + 14).GetCell(1).SetCellValue("鐒婂彛浣嶇疆涓庢娴嬬剨鍙ｈ绠￠亾鍗曠嚎鍥句笌鏃犳崯妫娴嬫姤鍛娿俓nPlease refer to Pipeline Iso-drawing and NDE Report for joints position and examined joints."); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 0, 3)); - ws.GetRow(rowIndex + 15).GetCell(0).SetCellValue("寤 璁 / 鐩 鐞 鍗 浣峔nOwner/JianLi Company"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 4, 9)); - ws.GetRow(rowIndex + 15).GetCell(4).SetCellValue("鎬 鎵 鍖 鍗 浣峔nGeneral Contractor"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 10, 16)); - ws.GetRow(rowIndex + 15).GetCell(10).SetCellValue("妫 娴 鍗 浣峔nExamination Contractor"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 17, 20)); - ws.GetRow(rowIndex + 15).GetCell(17).SetCellValue("鏂 宸 鍗 浣峔nConstruction Company"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 0, 3)); - ws.GetRow(rowIndex + 16).GetCell(0).CellStyle = style2; - ws.GetRow(rowIndex + 16).GetCell(0).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n\n\n\n\n\n 鏃ユ湡Date锛 骞 鏈 鏃"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 4, 9)); - ws.GetRow(rowIndex + 16).GetCell(4).CellStyle = style2; - ws.GetRow(rowIndex + 16).GetCell(4).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n\n\n\n\n\n 鏃ユ湡Date锛 骞 鏈 鏃"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 10, 16)); - ws.GetRow(rowIndex + 16).GetCell(10).CellStyle = style2; - ws.GetRow(rowIndex + 16).GetCell(10).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n\n\n\n\n\n 鏃ユ湡Date锛 骞 鏈 鏃"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 17, 20)); - ws.GetRow(rowIndex + 16).GetCell(17).CellStyle = style2; - ws.GetRow(rowIndex + 16).GetCell(17).SetCellValue("涓撲笟宸ョ▼甯圽n Discipline Engineer: \n 璐ㄩ噺妫鏌ュ憳锛歕n Quality Inspector:\n 鍒惰〃锛歕n\n Prepared锛歕n 鏃ユ湡Date锛 骞 鏈 鏃"); - - #endregion - - rowIndex += 17; } - ws.PrintSetup.Landscape = true; ws.ForceFormulaRecalculation = true; ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs index c7ca868..57cfcc5 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs @@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// protected global::FineUIPro.DatePicker txtSearchDate; + /// + /// Toolbar5 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtSearchCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSearchCode; + /// /// tvControlItem 鎺т欢銆 /// @@ -473,6 +491,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// protected global::FineUIPro.DatePicker txtAuditDate; + /// + /// TabStrip1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TabStrip TabStrip1; + /// /// Grid1 鎺т欢銆 /// @@ -590,6 +617,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// protected global::FineUIPro.DropDownList ddlPageSize; + /// + /// Grid2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// Grid3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid3; + /// /// Window1 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx index a67e827..d14016f 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx @@ -40,17 +40,26 @@ - - - - + + + + - + + + + + + + + = startTime && x.TableDate < endTime - orderby x.TestPackageNo descending - select x; + var dReports = (from x in testPackageUnitList + where x.InstallationId == installationId + && x.TableDate >= startTime && x.TableDate < endTime + orderby x.TestPackageNo descending + select x).ToList(); + if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim())) + { + dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList(); + } foreach (var item in dReports) { TreeNode newNode = new TreeNode(); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.designer.cs index b4ef277..15d8e42 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.TestPackageManage { - - - public partial class TestPackageManageComplete { - +namespace FineUIPro.Web.WeldingProcess.TestPackageManage +{ + + + public partial class TestPackageManageComplete + { + /// /// Head1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - + /// /// form1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar1 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtSearchDate 鎺т欢銆 /// @@ -74,7 +76,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtSearchDate; - + + /// + /// Toolbar5 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtSearchCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSearchCode; + /// /// tvControlItem 鎺т欢銆 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 鎺т欢銆 /// @@ -92,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar2 鎺т欢銆 /// @@ -101,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// hdPTP_ID 鎺т欢銆 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.HiddenField hdPTP_ID; - + /// /// ToolbarFill1 鎺т欢銆 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnAudit 鎺т欢銆 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnAudit; - + /// /// btnCancelAudit 鎺т欢銆 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnCancelAudit; - + /// /// btnPrint 鎺т欢銆 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnPrint; - + /// /// SimpleForm1 鎺т欢銆 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtTestPackageNo 鎺т欢銆 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestPackageNo; - + /// /// drpInstallation 鎺т欢銆 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label drpInstallation; - + /// /// txtTestPackageName 鎺т欢銆 /// @@ -182,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestPackageName; - + /// /// drpTestType 鎺т欢銆 /// @@ -191,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label drpTestType; - + /// /// txtTestService 鎺т欢銆 /// @@ -200,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestService; - + /// /// txtTestHeat 鎺т欢銆 /// @@ -209,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestHeat; - + /// /// txtTestAmbientTemp 鎺т欢銆 /// @@ -218,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestAmbientTemp; - + /// /// txtTestMediumTemp 鎺т欢銆 /// @@ -227,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestMediumTemp; - + /// /// txtVacuumTestService 鎺т欢銆 /// @@ -236,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtVacuumTestService; - + /// /// txtVacuumTestPressure 鎺т欢銆 /// @@ -245,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtVacuumTestPressure; - + /// /// txtTightnessTestTime 鎺т欢銆 /// @@ -254,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTightnessTestTime; - + /// /// txtTightnessTestTemp 鎺т欢銆 /// @@ -263,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTightnessTestTemp; - + /// /// txtTightnessTest 鎺т欢銆 /// @@ -272,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTightnessTest; - + /// /// txtTestPressure 鎺т欢銆 /// @@ -281,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestPressure; - + /// /// txtTestPressureTemp 鎺т欢銆 /// @@ -290,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestPressureTemp; - + /// /// txtTestPressureTime 鎺т欢銆 /// @@ -299,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTestPressureTime; - + /// /// txtOperationMedium 鎺т欢銆 /// @@ -308,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtOperationMedium; - + /// /// txtPurgingMedium 鎺т欢銆 /// @@ -317,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtPurgingMedium; - + /// /// txtCleaningMedium 鎺т欢銆 /// @@ -326,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtCleaningMedium; - + /// /// txtLeakageTestService 鎺т欢銆 /// @@ -335,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtLeakageTestService; - + /// /// txtLeakageTestPressure 鎺т欢銆 /// @@ -344,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtLeakageTestPressure; - + /// /// txtAllowSeepage 鎺т欢銆 /// @@ -353,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtAllowSeepage; - + /// /// txtFactSeepage 鎺т欢銆 /// @@ -362,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtFactSeepage; - + /// /// drpModifier 鎺т欢銆 /// @@ -371,7 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label drpModifier; - + /// /// txtModifyDate 鎺т欢銆 /// @@ -380,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtModifyDate; - + /// /// drpTabler 鎺т欢銆 /// @@ -389,7 +409,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label drpTabler; - + /// /// txtTableDate 鎺т欢銆 /// @@ -398,7 +418,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtTableDate; - + /// /// txtRemark 鎺т欢銆 /// @@ -407,7 +427,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtRemark; - + /// /// txtAuditMan 鎺т欢銆 /// @@ -416,7 +436,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtAuditMan; - + /// /// txtAuditDate 鎺т欢銆 /// @@ -425,7 +445,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtAuditDate; - + /// /// drpFinisher 鎺т欢銆 /// @@ -434,7 +454,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpFinisher; - + /// /// txtFinishDate 鎺т欢銆 /// @@ -443,7 +463,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtFinishDate; - + /// /// txtFinishDef 鎺т欢銆 /// @@ -452,7 +472,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtFinishDef; - + /// /// Grid1 鎺т欢銆 /// @@ -461,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar3 鎺т欢銆 /// @@ -470,7 +490,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// lbCyan 鎺т欢銆 /// @@ -479,7 +499,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lbCyan; - + /// /// lab1 鎺т欢銆 /// @@ -488,7 +508,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lab1; - + /// /// Label1 鎺т欢銆 /// @@ -497,7 +517,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label Label1; - + /// /// lab2 鎺т欢銆 /// @@ -506,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lab2; - + /// /// Label2 鎺т欢銆 /// @@ -515,7 +535,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label Label2; - + /// /// lab3 鎺т欢銆 /// @@ -524,7 +544,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lab3; - + /// /// Label4 鎺т欢銆 /// @@ -533,7 +553,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label Label4; - + /// /// lab4 鎺т欢銆 /// @@ -542,7 +562,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lab4; - + /// /// ToolbarSeparator1 鎺т欢銆 /// @@ -551,7 +571,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 鎺т欢銆 /// @@ -560,7 +580,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 鎺т欢銆 /// @@ -569,7 +589,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 鎺т欢銆 /// @@ -578,7 +598,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 鎺т欢銆 /// @@ -587,7 +607,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Window Window2; - + /// /// Window3 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx index 5000a85..c827c95 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx @@ -20,6 +20,15 @@ + + + + + + + + AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand"> + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs index 11fdb39..d331d74 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs @@ -182,11 +182,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01"); DateTime endTime = startTime.AddMonths(1); string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0]; - var dReports = from x in testPackageUnitList + var dReports =( from x in testPackageUnitList where x.InstallationId == installationId && x.TableDate >= startTime && x.TableDate < endTime orderby x.TestPackageNo descending - select x; + select x).ToList(); + if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim())) + { + dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList(); + } foreach (var item in dReports) { TreeNode newNode = new TreeNode(); @@ -1084,5 +1088,42 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage return dict; } + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "delete") + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnDelete)) + { + var testPackageManage = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID); + if (testPackageManage != null) + { + if (testPackageManage.AduditDate.HasValue) + { + Alert.ShowInTop("姝よ瘯鍘嬪崟宸插鏍革紒", MessageBoxIcon.Warning); + return; + } + if (TestPackageManageEditService.getPipelineListByPTP_ID(PTP_ID).Count == 1) + { + Alert.ShowInTop("姝よ瘯鍘嬪崟涓嬩粎鏈変竴鏉＄绾匡紝璇风洿鎺ュ垹闄よ瘯鍘嬪寘锛", MessageBoxIcon.Warning); + return; + } + string id = e.RowID; + TestPackageManageEditService.DeletePipelineListByPT_PipeId( id); + this.BindGrid(); + } + else + { + ShowNotify("璇烽夋嫨瑕佸垹闄ょ殑璇曞帇鍖呰褰曪紒", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning); + return; + } + + } + } } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.designer.cs index adf57df..5d80689 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.designer.cs @@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// protected global::FineUIPro.DatePicker txtSearchDate; + /// + /// Toolbar5 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtSearchCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSearchCode; + /// /// tvControlItem 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx index d89ed06..f66ef52 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx @@ -19,6 +19,8 @@ + + @@ -124,7 +126,7 @@ + AutoPostBack="true" OnSelectedIndexChanged="Find_OnSelectedIndexChanged" > @@ -146,7 +148,7 @@ runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true" SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" - AllowPaging="true" IsDatabasePaging="true" PageSize="100" + AllowPaging="true" IsDatabasePaging="true" PageSize="10000" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" > @@ -400,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// /// protected void Find_OnSelectedIndexChanged(object sender, EventArgs e) - { + { this.CollectGridJointInfo(); this.BindGrid(); this.ShowGridItem(); @@ -463,143 +463,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnSave)) { - if (BLL.TestPackageManageEditService.IsExistTestPackageCode(this.txtTestPackageNo.Text, this.PTP_ID, this.CurrUser.LoginProjectId)) - { - ShowNotify("璇曞帇鍖呯紪鍙峰凡瀛樺湪锛岃閲嶆柊褰曞叆锛", MessageBoxIcon.Warning); - return; - } - if (string.IsNullOrEmpty(this.txtTestPackageNo.Text) || this.drpUnit.SelectedValue == BLL.Const._Null || this.drpTabler.SelectedValue == BLL.Const._Null - || this.drpInstallation.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.txtTableDate.Text)) - { - ShowNotify("蹇呭～椤逛笉鑳戒负绌猴紒", MessageBoxIcon.Warning); - return; - } - this.CollectGridJointInfo(); - if (this.listSelects.Count() == 0) - { - ShowNotify("璇烽夋嫨绠＄嚎鍙凤紒", MessageBoxIcon.Warning); - return; - } - var updatetrust = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID); - if (updatetrust != null && updatetrust.AduditDate.HasValue) - { - ShowNotify("姝ゆ柦鍘嬪寘宸插鏍镐笉鑳戒慨鏀癸紒", MessageBoxIcon.Warning); - return; - } - - Model.PTP_TestPackage testPackage = new Model.PTP_TestPackage(); - testPackage.ProjectId = this.CurrUser.LoginProjectId; - if (this.drpInstallation.SelectedValue != BLL.Const._Null) - { - testPackage.InstallationId = this.drpInstallation.SelectedValue; - } - if (this.drpUnit.SelectedValue != BLL.Const._Null) - { - testPackage.UnitId = this.drpUnit.SelectedValue; - } - - testPackage.TestPackageNo = this.txtTestPackageNo.Text.Trim(); - testPackage.TestPackageName = this.txtTestPackageName.Text.Trim(); - testPackage.TestHeat = this.txtTestHeat.Text.Trim(); - testPackage.TestService = this.txtTestService.Text.Trim(); - if (this.drpTestType.SelectedValue != BLL.Const._Null) - { - testPackage.TestType = this.drpTestType.SelectedValue; - } - if (this.drpTabler.SelectedValue != BLL.Const._Null) - { - testPackage.Tabler = this.drpTabler.SelectedValue; - } - testPackage.TableDate = Funs.GetNewDateTime(this.txtTableDate.Text); - if (this.drpModifier.SelectedValue != BLL.Const._Null) - { - testPackage.Modifier = this.drpModifier.SelectedValue; - } - testPackage.ModifyDate = Funs.GetNewDateTime(this.txtModifyDate.Text); - testPackage.Remark = this.txtRemark.Text.Trim(); - //testPackage.TestPackageCode = this.txtTestPackageCode.Text.Trim(); - testPackage.TestAmbientTemp = this.txtTestAmbientTemp.Text.Trim(); - testPackage.TestMediumTemp = this.txtTestMediumTemp.Text.Trim(); - testPackage.TestPressure = this.txtTestPressure.Text.Trim(); - testPackage.TestPressureTemp = this.txtTestPressureTemp.Text.Trim(); - testPackage.TestPressureTime = this.txtTestPressureTime.Text.Trim(); - testPackage.TightnessTest = this.txtTightnessTest.Text.Trim(); - testPackage.TightnessTestTemp = this.txtTightnessTestTemp.Text.Trim(); - testPackage.TightnessTestTime = this.txtTightnessTestTime.Text.Trim(); - testPackage.LeakageTestService = this.txtLeakageTestService.Text.Trim(); - testPackage.LeakageTestPressure = this.txtLeakageTestPressure.Text.Trim(); - testPackage.VacuumTestService = this.txtVacuumTestService.Text.Trim(); - testPackage.VacuumTestPressure = this.txtVacuumTestPressure.Text.Trim(); - testPackage.OperationMedium = this.txtOperationMedium.Text.Trim(); - testPackage.PurgingMedium = this.txtPurgingMedium.Text.Trim(); - testPackage.CleaningMedium = this.txtCleaningMedium.Text.Trim(); - testPackage.AllowSeepage = this.txtAllowSeepage.Text.Trim(); - testPackage.FactSeepage = this.txtFactSeepage.Text.Trim(); - if (!string.IsNullOrEmpty(this.PTP_ID)) - { - testPackage.PTP_ID = this.PTP_ID; - BLL.TestPackageManageEditService.UpdateTestPackage(testPackage); - //BLL.TestPackageManageEditService.DeleteTestPackage(PTP_ID); - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnModify, this.PTP_ID); - } - else - { - testPackage.PTP_ID = SQLHelper.GetNewID(typeof(Model.PTP_TestPackage)); - this.PTP_ID = testPackage.PTP_ID; - BLL.TestPackageManageEditService.AddTestPackage(testPackage); - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnAdd, this.PTP_ID); - } - JArray teamGroupData = Grid1.GetMergedData(); - if (listSelects.Count > 0) - { - BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID); - } - foreach (JObject teamGroupRow in teamGroupData) - { - string PipelineId = teamGroupRow["id"].ToString(); - string status = teamGroupRow.Value("status"); - - if (listSelects.Contains(PipelineId)) - { - JObject values = teamGroupRow.Value("values"); - string WeldJonintCodes = values.Value("WeldJointCode"); - string workAreaId = values.Value("WorkAreaId"); - if (string.IsNullOrEmpty(WeldJonintCodes)) - WeldJonintCodes = "鍏ㄩ儴"; - - //澶勭悊鍓╀笅鏉ョ殑鍙 - List listJointCode = new List(); - var tempData = Funs.DB.PTP_PipelineList.Where(t=>t.PipelineId== PipelineId && t.IsAll==false).Select(t => t.WeldJonintCode).ToList(); - foreach (var item in tempData) - { - if (!string.IsNullOrEmpty(item)) - { - string[] arr=item.Split(','); - for (int i = 0; i < arr.Length; i++) - { - listJointCode.Add(arr[i]); - } - } - } - if(WeldJonintCodes=="鍏ㄩ儴" && listJointCode.Count > 0) - { - var nextJointCode = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineId && !listJointCode.Contains(t.WeldJointCode)) - .Select(t => t.WeldJointCode).ToList().ToArray(); - WeldJonintCodes = String.Join(",", nextJointCode.ToArray()); - } - Model.PTP_PipelineList newitem = new Model.PTP_PipelineList(); - newitem.PTP_ID = this.PTP_ID; - newitem.PipelineId = PipelineId; - newitem.IsAll = WeldJonintCodes=="鍏ㄩ儴" ? true : false; - newitem.WeldJonintCode = WeldJonintCodes; - newitem.WorkAreaId = workAreaId; - BLL.TestPackageManageEditService.AddPipelineList(newitem); - } - } - ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID) - + ActiveWindow.GetHidePostBackReference()); - this.BindGrid(); + Save(); + ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); } else { @@ -607,8 +472,172 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage return; } } + + protected void btnSubmit_Click1(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnSave)) + { + // Save(); + ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID) + + ActiveWindow.GetHidePostBackReference()); + } + else + { + ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning); + return; + } + } + protected void Save() + { + if (BLL.TestPackageManageEditService.IsExistTestPackageCode(this.txtTestPackageNo.Text, this.PTP_ID, this.CurrUser.LoginProjectId)) + { + ShowNotify("璇曞帇鍖呯紪鍙峰凡瀛樺湪锛岃閲嶆柊褰曞叆锛", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrEmpty(this.txtTestPackageNo.Text) || this.drpUnit.SelectedValue == BLL.Const._Null || this.drpTabler.SelectedValue == BLL.Const._Null + || this.drpInstallation.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.txtTableDate.Text)) + { + ShowNotify("蹇呭～椤逛笉鑳戒负绌猴紒", MessageBoxIcon.Warning); + return; + } + this.CollectGridJointInfo(); + if (this.listSelects.Count() == 0) + { + ShowNotify("璇烽夋嫨绠＄嚎鍙凤紒", MessageBoxIcon.Warning); + return; + } + var updatetrust = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID); + if (updatetrust != null && updatetrust.AduditDate.HasValue) + { + ShowNotify("姝ゆ柦鍘嬪寘宸插鏍镐笉鑳戒慨鏀癸紒", MessageBoxIcon.Warning); + return; + } + + Model.PTP_TestPackage testPackage = new Model.PTP_TestPackage(); + testPackage.ProjectId = this.CurrUser.LoginProjectId; + if (this.drpInstallation.SelectedValue != BLL.Const._Null) + { + testPackage.InstallationId = this.drpInstallation.SelectedValue; + } + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + testPackage.UnitId = this.drpUnit.SelectedValue; + } + + testPackage.TestPackageNo = this.txtTestPackageNo.Text.Trim(); + testPackage.TestPackageName = this.txtTestPackageName.Text.Trim(); + testPackage.TestHeat = this.txtTestHeat.Text.Trim(); + testPackage.TestService = this.txtTestService.Text.Trim(); + if (this.drpTestType.SelectedValue != BLL.Const._Null) + { + testPackage.TestType = this.drpTestType.SelectedValue; + } + if (this.drpTabler.SelectedValue != BLL.Const._Null) + { + testPackage.Tabler = this.drpTabler.SelectedValue; + } + testPackage.TableDate = Funs.GetNewDateTime(this.txtTableDate.Text); + if (this.drpModifier.SelectedValue != BLL.Const._Null) + { + testPackage.Modifier = this.drpModifier.SelectedValue; + } + testPackage.ModifyDate = Funs.GetNewDateTime(this.txtModifyDate.Text); + testPackage.Remark = this.txtRemark.Text.Trim(); + //testPackage.TestPackageCode = this.txtTestPackageCode.Text.Trim(); + testPackage.TestAmbientTemp = this.txtTestAmbientTemp.Text.Trim(); + testPackage.TestMediumTemp = this.txtTestMediumTemp.Text.Trim(); + testPackage.TestPressure = this.txtTestPressure.Text.Trim(); + testPackage.TestPressureTemp = this.txtTestPressureTemp.Text.Trim(); + testPackage.TestPressureTime = this.txtTestPressureTime.Text.Trim(); + testPackage.TightnessTest = this.txtTightnessTest.Text.Trim(); + testPackage.TightnessTestTemp = this.txtTightnessTestTemp.Text.Trim(); + testPackage.TightnessTestTime = this.txtTightnessTestTime.Text.Trim(); + testPackage.LeakageTestService = this.txtLeakageTestService.Text.Trim(); + testPackage.LeakageTestPressure = this.txtLeakageTestPressure.Text.Trim(); + testPackage.VacuumTestService = this.txtVacuumTestService.Text.Trim(); + testPackage.VacuumTestPressure = this.txtVacuumTestPressure.Text.Trim(); + testPackage.OperationMedium = this.txtOperationMedium.Text.Trim(); + testPackage.PurgingMedium = this.txtPurgingMedium.Text.Trim(); + testPackage.CleaningMedium = this.txtCleaningMedium.Text.Trim(); + testPackage.AllowSeepage = this.txtAllowSeepage.Text.Trim(); + testPackage.FactSeepage = this.txtFactSeepage.Text.Trim(); + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + testPackage.PTP_ID = this.PTP_ID; + BLL.TestPackageManageEditService.UpdateTestPackage(testPackage); + //BLL.TestPackageManageEditService.DeleteTestPackage(PTP_ID); + BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnModify, this.PTP_ID); + } + else + { + testPackage.PTP_ID = SQLHelper.GetNewID(typeof(Model.PTP_TestPackage)); + this.PTP_ID = testPackage.PTP_ID; + BLL.TestPackageManageEditService.AddTestPackage(testPackage); + BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnAdd, this.PTP_ID); + } + JArray teamGroupData = Grid1.GetMergedData(); + if (listSelects.Count > 0) + { + //if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue != null) + //{ + // BLL.TestPackageManageEditService.DeletePipelineListByPTP_IDAndWorkAreaId(testPackage.PTP_ID, drpWorkArea.SelectedValue); + + //} + //else + //{ + // BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID); + //} + } + foreach (JObject teamGroupRow in teamGroupData) + { + string PipelineId = teamGroupRow["id"].ToString(); + string status = teamGroupRow.Value("status"); + + if (listSelects.Contains(PipelineId)) + { + JObject values = teamGroupRow.Value("values"); + string WeldJonintCodes = values.Value("WeldJointCode"); + string workAreaId = values.Value("WorkAreaId"); + if (string.IsNullOrEmpty(WeldJonintCodes)) + WeldJonintCodes = "鍏ㄩ儴"; + + //澶勭悊鍓╀笅鏉ョ殑鍙 + List listJointCode = new List(); + var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineId && t.IsAll == false).Select(t => t.WeldJonintCode).ToList(); + foreach (var item in tempData) + { + if (!string.IsNullOrEmpty(item)) + { + string[] arr = item.Split(','); + for (int i = 0; i < arr.Length; i++) + { + listJointCode.Add(arr[i]); + } + } + } + if (WeldJonintCodes == "鍏ㄩ儴" && listJointCode.Count > 0) + { + var nextJointCode = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineId && !listJointCode.Contains(t.WeldJointCode)) + .Select(t => t.WeldJointCode).ToList().ToArray(); + WeldJonintCodes = String.Join(",", nextJointCode.ToArray()); + } + Model.PTP_PipelineList newitem = new Model.PTP_PipelineList(); + newitem.PTP_ID = this.PTP_ID; + newitem.PipelineId = PipelineId; + newitem.IsAll = WeldJonintCodes == "鍏ㄩ儴" ? true : false; + newitem.WeldJonintCode = WeldJonintCodes; + newitem.WorkAreaId = workAreaId; + if (!TestPackageManageEditService.IsPipelineListExists(newitem.PTP_ID, newitem.PipelineId)) + { + BLL.TestPackageManageEditService.AddPipelineList(newitem); + + } + } + } + } #endregion - + #region 鏀堕泦Grid椤甸潰淇℃伅 /// @@ -621,10 +650,10 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { string rowID = Grid1.DataKeys[i][0].ToString(); CheckBoxField checkField = (CheckBoxField)Grid1.FindColumn("ckbIsSelected"); - if (listSelects.Contains(rowID)) - { - listSelects.Remove(rowID); - } + //if (listSelects.Contains(rowID)) + //{ + // listSelects.Remove(rowID); + //} if (checkField.GetCheckedState(i)) { listSelects.Add(rowID); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs index a73b06f..2cf1b02 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs @@ -86,6 +86,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// protected global::FineUIPro.Button btnSave; + /// + /// btnSubmit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSubmit; + /// /// SimpleForm1 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx index 2969d39..dd80e32 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx @@ -135,6 +135,7 @@ + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs index d23a782..b1fc552 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs @@ -331,6 +331,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } //鏄惁PMI澶勭悊 ckbIsPMI.Checked = (jointInfo.IsPMI.HasValue && jointInfo.IsPMI.Value) ? true : false; + ckbIsBracket.Checked = (jointInfo.IsBracket.HasValue && jointInfo.IsBracket.Value) ? true : false; if (jointInfo.IsCancel == true) { @@ -505,6 +506,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } //鏄惁PMI澶勭悊 newJointInfo.IsPMI = ckbIsPMI.Checked; + //鏄惁鏀灦锛岃创搴曠墖 + newJointInfo.IsBracket = ckbIsBracket.Checked; + if (ckbIsGoldJoint.Checked == true) { @@ -835,5 +839,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } } #endregion + + protected void ckbIsBracket_CheckedChanged(object sender, CheckedEventArgs e) + { + if (ckbIsBracket.Checked) + { + txtSpecification.Readonly = false; + } + else + { + txtSpecification.Readonly = true; + } + } } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs index 8cc284a..7002ca0 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs @@ -320,6 +320,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage /// protected global::FineUIPro.CheckBox ckbIsGoldJoint; + /// + /// ckbIsBracket 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.CheckBox ckbIsBracket; + /// /// drpNDTType 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs index 52ed133..bbae737 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs @@ -10,6 +10,7 @@ using NPOI.XSSF.UserModel; using System.Linq; using BLL; using System.Web.Configuration; +using NPOI.SS.Formula.Functions; namespace FineUIPro.Web.WeldingProcess.WeldingManage { @@ -1306,6 +1307,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (isExistFloor && isExistCell) { var wps = BLL.WPQListServiceService.GetWPQById(d.WPQId); + var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(jotId); + if (!wps.WelderIds.Contains(cellWelderId)) { errorCheck += (i + 2) + "琛,鐩栭潰鐒婂伐鍙凤細[" + ds.Tables[0].Rows[i]["鐩栭潰鐒婂伐鍙"].ToString() + "]楠岃瘉鏃犵剨WPS璧勮川锛"; @@ -1315,7 +1318,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { errorCheck += (i + 2) + "琛,鎵撳簳鐒婂伐鍙凤細[" + ds.Tables[0].Rows[i]["鎵撳簳鐒婂伐鍙"].ToString() + "]楠岃瘉鏃犵剨WPS璧勮川锛"; } - + if (jot !=null) + { + if (jot.Thickness < wps.MinImpactThickness || jot.Thickness > wps.MaxImpactThickness) + { + errorCheck += (i + 2) + "琛岋紝鐒婂彛淇℃伅涓嶹PS缂栧彿涓嶅尮閰嶏紝"; + } + if (!wps.MaterialId1.Contains(jot.Material1Id) || !wps.MaterialId1.Contains(jot.Material2Id)) + { + errorCheck += (i + 2) + "琛岋紝鐒婂彛淇℃伅涓嶹PS缂栧彿涓嶅尮閰嶏紝"; + } + } + } #region 鐒婂伐鍚堟牸椤硅祫璐ㄥ垽鏂 diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs index 0206c0c..6578f47 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs @@ -365,6 +365,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { errorCheck += rowIndex + "琛岋紝WPS涓嶈兘涓虹┖锛"; } + if (jot .Thickness< wps.MinImpactThickness || jot.Thickness > wps.MaxImpactThickness) + { + errorCheck += rowIndex + "琛岋紝鐒婂彛淇℃伅涓嶹PS缂栧彿涓嶅尮閰嶏紝"; + } + if (!wps.MaterialId1.Contains(jot.Material1Id)|| !wps.MaterialId1.Contains(jot.Material2Id)) + { + errorCheck += rowIndex + "琛岋紝鐒婂彛淇℃伅涓嶹PS缂栧彿涓嶅尮閰嶏紝"; + } + // 楠岃瘉鏁版嵁鏄惁涓鑷 if (!string.IsNullOrEmpty(item.WeldTypeId) && !string.IsNullOrEmpty(jot.WeldTypeId) && item.WeldTypeId != jot.WeldTypeId) diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx new file mode 100644 index 0000000..25df64e --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx @@ -0,0 +1,264 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PipelineTraceList.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingReport.PipelineTraceList" %> + + + + + + 绠￠亾杩芥函琛 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.cs new file mode 100644 index 0000000..adfca16 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.cs @@ -0,0 +1,389 @@ +锘縰sing BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using NPOI.HSSF.Util; +using NPOI.POIFS.Properties; +using NPOI.SS.UserModel; +using NPOI.XSSF.UserModel; +using System.IO; +using System.Security.Policy; +using System.Threading; +using MiniExcelLibs; + +namespace FineUIPro.Web.WeldingProcess.WeldingReport +{ + public partial class PipelineTraceList : PageBase + { + public static int percent { get; set; } + public static string url { get; set; } + + [System.Web.Services.WebMethod] + public static int getPercent() + { + return percent; + } + + [System.Web.Services.WebMethod] + public static string getUrl() + { + return url; + } + #region 鍔犺浇 + /// + /// 鍔犺浇椤甸潰 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, string.Empty, string.Empty, Resources.Lan.PleaseSelect);//鍖哄煙 + } + } + + private DataTable GetDataTable() + { + List listStr = new List(); + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + + if (drpWorkAreaId.SelectedValue != Const._Null && drpWorkAreaId.SelectedValue != null) + { + string[] areaList = drpWorkAreaId.SelectedValueArray; + string workAreaIds = string.Join(",", areaList); + listStr.Add(new SqlParameter("@workAreaIds", workAreaIds)); + // listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue)); + } + if (!string.IsNullOrEmpty(drpPipeLine.SelectedValue) && drpPipeLine.SelectedValue != Const._Null) + { + string[] pipeList = drpPipeLine.SelectedValueArray; + string pipeLineIds = string.Join(",", pipeList); + listStr.Add(new SqlParameter("@pipelineIds", pipeLineIds)); + } + else + { + listStr.Add(new SqlParameter("@pipelineIds", null)); + } + if (!string.IsNullOrEmpty(txtTestPackageNo.Text.Trim())) + { + listStr.Add(new SqlParameter("@TestPackageNo", '%'+txtTestPackageNo.Text.Trim()+"%")); + } + else + { + listStr.Add(new SqlParameter("@TestPackageNo", null)); + } + //if (!string.IsNullOrEmpty(this.drpWorkAreaId.Text.Trim())) + //{ + // listStr.Add(new SqlParameter("@pipelineCode", this.txtPipelineCode.Text.Trim())); + //} + //else + //{ + // listStr.Add(new SqlParameter("@pipelineCode", null)); + //} + SqlParameter[] parameter = listStr.ToArray(); + DataTable dt = SQLHelper.GetDataTableRunProc("sp_rpt_JointComprehensive", parameter); + return dt; + } + + /// + /// 缁戝畾鏁版嵁 + /// + private void BindGrid() + { + DataTable tb = GetDataTable(); + this.Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + + var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field("PipelineId")).Select(group => group.First()); + var distinctSingleNumber = tb.AsEnumerable().GroupBy(row => row.Field("SingleNumber")).Select(group => group.First()); + var backingWelder = tb.AsEnumerable().Where(row => row.Field("BackingWelderCode") != null).GroupBy(row => row.Field("BackingWelderCode")).Select(group => group.First()); + var coverWelder = tb.AsEnumerable().Where(row => row.Field("CoverWelderCode") != null).GroupBy(row => row.Field("CoverWelderCode")).Select(group => group.First()); + var jotNum = from x in tb.AsEnumerable() + group x by new { pipe = x.Field("PipelineId"), jot = x.Field("WeldJointCode"), Size = x.Field("JOT_Size") } + into g + select new { pipe = g.Key.pipe, jot = g.Key.jot, Size = g.Key.Size }; + JObject summary = new JObject(); + summary.Add("tfNumber", "鍚堣"); + summary.Add("SingleNumber", distinctSingleNumber.Count().ToString()); + summary.Add("PipelineCode", distinctPipelineCode.Count().ToString()); + summary.Add("WeldJointCode", jotNum.Count()); + summary.Add("BackingWelderCode", backingWelder.Count().ToString()); + summary.Add("CoverWelderCode", coverWelder.Count().ToString()); + + Grid1.SummaryData = summary; + } + + protected void drpWorkAreaId_OnSelectedIndexChanged(object sender, EventArgs e) + { + string[] workAreaIds = drpWorkAreaId.SelectedValueArray; + if (workAreaIds.Length == 1) + { + BLL.Pipeline_PipelineService.InitPipelineDropDownList(drpPipeLine, workAreaIds[0], Resources.Lan.PleaseSelect); + } + } + + /// + /// 鏀瑰彉绱㈠紩浜嬩欢 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 鍒嗛〉涓嬫媺閫夋嫨浜嬩欢 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 缁熻鎸夐挳浜嬩欢 + /// + /// 缁熻 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 瀵煎嚭鎸夐挳 + /// 瀵煎嚭鎸夐挳 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + percent = 0; + url = ""; + + Thread t = new Thread(new ThreadStart(() => { Export(); })); + t.Start(); + PageContext.RegisterStartupScript("showProcessBar()"); + + } + + private void Export() + { + string templatePath = Funs.RootPath + @"File\Excel\HJGL_DataOut\绠￠亾杩芥函琛.xlsx"; + string path = Funs.RootPath + @"File\Excel\Temp\绠￠亾杩芥函琛.xlsx"; + path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx"); + + + + DataTable tb = GetDataTable(); + DataColumn dc = null; + dc = tb.Columns.Add("Index", Type.GetType("System.Int32")); + dc = tb.Columns.Add("WeldSilk", Type.GetType("System.String")); + dc = tb.Columns.Add("WeldFlux", Type.GetType("System.String")); + int totalNum = tb.Rows.Count; + var rowIndex = 1; + foreach (DataRow row in tb.Rows) + { + + row["Index"] = row.Table.Rows.IndexOf(row) + 1; + row["WeldSilk"] = ConvertWeldSilk(row["WeldSilkId"]); + row["WeldFlux"] = ConvertWeldFlux(row["WeldSilkId"]); + if ((int)(90 * (rowIndex) / totalNum) > percent) + { + percent = (int)(100 * (rowIndex) / totalNum); + + } + rowIndex++; + } + + + tb.TableName = "Data"; + var value = new Dictionary() + { + ["Data"] = tb, + }; + MiniExcel.SaveAsByTemplate(path, templatePath, value); + + percent = 100; + url = path.Replace(Server.MapPath("~/"), ""); + /*string fileName = "绠￠亾杩芥函琛.xlsx"; + FileInfo info = new FileInfo(path); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + File.Delete(path);*/ + } + + /// + /// 瀵煎嚭鏂规硶 + /// + /// + /// + //private string GetGridTableHtml(Grid grid) + //{ + // StringBuilder sb = new StringBuilder(); + // grid.PageSize = 500000; + // BindGrid(); + // sb.Append(""); + // sb.Append(""); + // sb.Append(""); + // foreach (GridColumn column in grid.Columns) + // { + // sb.AppendFormat("", column.HeaderText); + // } + // sb.Append(""); + // foreach (GridRow row in grid.Rows) + // { + // sb.Append(""); + // foreach (GridColumn column in grid.Columns) + // { + // string html = row.Values[column.ColumnIndex].ToString(); + // if (column.ColumnID == "tfNumber") + // { + // html = (row.FindControl("labNumber") as AspNet.Label).Text; + // } + // if (column.ColumnID == "tfIsHotProess") + // { + // html = (row.FindControl("lblIsHotProess") as AspNet.Label).Text; + // } + // if (column.ColumnID == "tfif_dk") + // { + // html = (row.FindControl("lblif_dk") as AspNet.Label).Text; + // } + // sb.AppendFormat("", html); + // } + + // sb.Append(""); + // } + + // sb.Append("
{0}
{0}
"); + + // return sb.ToString(); + //} + #endregion + + #region 鏍煎紡鍖栧瓧绗︿覆 + /// + /// 鏄惁鐑鐞 + /// + /// + /// + protected string ConvertIsHotProess(object isHotProess) + { + if (isHotProess != null) + { + if (isHotProess.ToString() == "True") + { + return Resources.Lan.Yes; + } + else + { + return Resources.Lan.No; + } + } + return null; + } + + /// + /// 鏄惁鐐瑰彛 + /// + /// + /// + protected string Convertif_dk(object if_dk) + { + if (if_dk != null) + { + if (if_dk.ToString() == "1") + { + return Resources.Lan.Yes; + } + else + { + return Resources.Lan.No; + } + } + return null; + } + + protected string ConvertWeldSilk(object WeldSilkId) + { + string weldSilkName = string.Empty; + if (WeldSilkId != null) + { + string[] weldSilkIds = WeldSilkId.ToString().Split(','); + if (weldSilkIds.Count() > 0) + { + foreach (string s in weldSilkIds) + { + var silk = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(s); + if (silk != null) + { + weldSilkName = weldSilkName + silk.ConsumablesName + ','; + } + } + if (weldSilkName.Length > 0) + { + weldSilkName = weldSilkName.Substring(0, weldSilkName.Length - 1); + } + } + } + return weldSilkName; + } + + protected string ConvertWeldFlux(object WeldSilkId) + { + string weldFlux = string.Empty; + string[] weldSilkIds = WeldSilkId.ToString().Split(','); + if (weldSilkIds.Count() > 0) + { + foreach (string s in weldSilkIds) + { + var silk = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(s); + if (silk != null && !string.IsNullOrEmpty(silk.UserFlux)) + { + weldFlux = weldFlux + silk.UserFlux + ','; + } + + } + if (weldFlux.Length > 0) + { + weldFlux = weldFlux.Substring(0, weldFlux.Length - 1); + } + } + return weldFlux; + } + + #endregion + + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.designer.cs new file mode 100644 index 0000000..9113f43 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.designer.cs @@ -0,0 +1,197 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.WeldingReport +{ + + + public partial class PipelineTraceList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpWorkAreaId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpWorkAreaId; + + /// + /// drpPipeLine 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpPipeLine; + + /// + /// txtTestPackageNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtTestPackageNo; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// BtnAnalyse 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// btnOut 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// labNumber 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// Label3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// Label1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowExport 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowExport; + + /// + /// ContentPanel3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel3; + + /// + /// ScriptManager2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.ScriptManager ScriptManager2; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx new file mode 100644 index 0000000..1f170ef --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx @@ -0,0 +1,150 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RepairExTrackingList.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingReport.RepairExTrackingList" %> + + + + + + 杩斾慨鎵╂帰杩借釜娓呭崟 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.cs new file mode 100644 index 0000000..294fee3 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.cs @@ -0,0 +1,232 @@ +锘縰sing BLL; +using MiniExcelLibs; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Threading; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Model; + +namespace FineUIPro.Web.WeldingProcess.WeldingReport +{ + public partial class RepairExTrackingList : PageBase + { + public static int percent { get; set; } + public static string url { get; set; } + + [System.Web.Services.WebMethod] + public static int getPercent() + { + return percent; + } + + [System.Web.Services.WebMethod] + public static string getUrl() + { + return url; + } + #region 鍔犺浇 + /// + /// 鍔犺浇椤甸潰 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, string.Empty, string.Empty, Resources.Lan.PleaseSelect);//鍖哄煙 + } + } + + private DataTable GetDataTable() + { //鍒涘缓琛 + DataTable dt = new DataTable(); + + //1銆佹坊鍔犲垪 + dt.Columns.Add("WorkAreaCode", typeof(string)); + dt.Columns.Add("PipelineCode", typeof(string)); + dt.Columns.Add("WeldJointId", typeof(string)); + dt.Columns.Add("WeldJointCode", typeof(string)); + dt.Columns.Add("WelderCode", typeof(string)); + dt.Columns.Add("TeamGroupName", typeof(string)); + dt.Columns.Add("Specification", typeof(string)); + dt.Columns.Add("TrustBatchCode", typeof(string)); + dt.Columns.Add("TrustBatchCodeRepair", typeof(string)); + dt.Columns.Add("WeldJointCodeEx1", typeof(string)); + dt.Columns.Add("WeldJointCodeEx2", typeof(string)); + dt.Columns.Add("IsClose", typeof(string)); + List listStr = new List(); + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + + var view_Batch_BatchTrustItemSelect = (from x in Funs.DB.View_Batch_BatchTrustItemSelect + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + if (drpWorkAreaId.SelectedValue != Const._Null && drpWorkAreaId.SelectedValue != null) + { + view_Batch_BatchTrustItemSelect= view_Batch_BatchTrustItemSelect.Where(x => drpWorkAreaId.SelectedValueArray.Contains(x.WorkAreaId)).ToList(); + + } + if (!string.IsNullOrEmpty(drpPipeLine.SelectedValue) && drpPipeLine.SelectedValue != Const._Null) + { + view_Batch_BatchTrustItemSelect = view_Batch_BatchTrustItemSelect.Where(x => drpPipeLine.SelectedValueArray.Contains(x.PipelineId)).ToList(); + + } + var list = view_Batch_BatchTrustItemSelect.Where(x => x.IsWelderFirst == "鏄"); + + + foreach (var item in list) + { + DataRow dr = dt.NewRow(); + dr["WorkAreaCode"] = item.WorkAreaCode; + dr["PipelineCode"] = item.PipelineCode; + dr["WeldJointId"] = item.WeldJointId; + dr["WeldJointCode"] = item.WeldJointCode; + dr["WelderCode"] = item.WelderCode; + dr["TeamGroupName"] = item.TeamGroupName; + dr["Specification"] = item.Specification; + dr["TrustBatchCode"] = item.TrustBatchCode; + dr["TrustBatchCodeRepair"] = view_Batch_BatchTrustItemSelect.Where(x=>x.TrustBatchCode.Contains(item.TrustBatchCode+"R"))?.FirstOrDefault()?.TrustBatchCode; + + var exWeldJointCodeList = view_Batch_BatchTrustItemSelect.Where(x => x.TrustBatchCode.Contains(item.TrustBatchCode + "EX")).Select(x=>x.WeldJointCode).ToList(); + if (exWeldJointCodeList.Count == 1) + { + dr["WeldJointCodeEx1"] = exWeldJointCodeList[0]?.ToString(); + } + else if (exWeldJointCodeList.Count == 2) + { + dr["WeldJointCodeEx1"] = exWeldJointCodeList[0]?.ToString(); + dr["WeldJointCodeEx2"] = exWeldJointCodeList[1]?.ToString(); + } + + + if (!string.IsNullOrEmpty(dr["WeldJointCodeEx2"].ToString()) && !string.IsNullOrEmpty(dr["WeldJointCodeEx2"].ToString())) + { + dr["IsClose"] = "鏄"; + } + dt.Rows.Add(dr); + } + return dt; + } + + /// + /// 缁戝畾鏁版嵁 + /// + private void BindGrid() + { + DataTable tb = GetDataTable(); + this.Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + protected void drpWorkAreaId_OnSelectedIndexChanged(object sender, EventArgs e) + { + string[] workAreaIds = drpWorkAreaId.SelectedValueArray; + if (workAreaIds.Length == 1) + { + BLL.Pipeline_PipelineService.InitPipelineDropDownList(drpPipeLine, workAreaIds[0], Resources.Lan.PleaseSelect); + } + } + + /// + /// 鏀瑰彉绱㈠紩浜嬩欢 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 鍒嗛〉涓嬫媺閫夋嫨浜嬩欢 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 缁熻鎸夐挳浜嬩欢 + /// + /// 缁熻 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 瀵煎嚭鎸夐挳 + /// 瀵煎嚭鎸夐挳 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + percent = 0; + url = ""; + + Thread t = new Thread(new ThreadStart(() => { Export(); })); + t.Start(); + PageContext.RegisterStartupScript("showProcessBar()"); + + } + + private void Export() + { + string templatePath = Funs.RootPath + @"File\Excel\HJGL_DataOut\杩斾慨鎵╂帰杩借釜鎶ヨ〃.xlsx"; + string path = Funs.RootPath + @"File\Excel\Temp\杩斾慨鎵╂帰杩借釜鎶ヨ〃.xlsx"; + path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx"); + DataTable tb = GetDataTable(); + tb.TableName = "Data"; + var value = new Dictionary() + { + ["Data"] = tb, + }; + MiniExcel.SaveAsByTemplate(path, templatePath, value); + + percent = 100; + url = path.Replace(Server.MapPath("~/"), ""); + /*string fileName = "绠￠亾杩芥函琛.xlsx"; + FileInfo info = new FileInfo(path); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + File.Delete(path);*/ + } + + + #endregion + + + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.designer.cs new file mode 100644 index 0000000..0635d48 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.designer.cs @@ -0,0 +1,170 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.WeldingReport +{ + + + public partial class RepairExTrackingList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpWorkAreaId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpWorkAreaId; + + /// + /// drpPipeLine 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpPipeLine; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// BtnAnalyse 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// btnOut 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// labNumber 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowExport 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowExport; + + /// + /// ContentPanel3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel3; + + /// + /// ScriptManager2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.ScriptManager ScriptManager2; + } +} diff --git a/HJGL/FineUIPro.Web/packages.config b/HJGL/FineUIPro.Web/packages.config index 2f3dd60..0f3e177 100644 --- a/HJGL/FineUIPro.Web/packages.config +++ b/HJGL/FineUIPro.Web/packages.config @@ -4,6 +4,7 @@ + diff --git a/HJGL/FineUIPro/readme.txt b/HJGL/FineUIPro/readme.txt new file mode 100644 index 0000000..ab83b83 --- /dev/null +++ b/HJGL/FineUIPro/readme.txt @@ -0,0 +1,8 @@ +FineUI锛堜笓涓氱増锛塿3.6.0.0 + +瀹㈡埛锛氬悎鑲ヨ蹇呰揪淇℃伅鎶鏈湁闄愯矗浠诲叕鍙 + + +http://fineui.com/pro +鍚堣偉涓夌敓鐭充笂杞欢鏈夐檺鍏徃 + diff --git a/HJGL/Model/.vs/Model.csproj.dtbcache.json b/HJGL/Model/.vs/Model.csproj.dtbcache.json new file mode 100644 index 0000000..5811405 --- /dev/null +++ b/HJGL/Model/.vs/Model.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\Model","ProjectFileName":"Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIItem\\BaseInfoItem.cs"},{"SourceFile":"APIItem\\CheckItem.cs"},{"SourceFile":"APIItem\\PipeLineQueryItem.cs"},{"SourceFile":"APIItem\\ResponeData.cs"},{"SourceFile":"APIItem\\UserItem.cs"},{"SourceFile":"APIItem\\WelderPerformanceItem.cs"},{"SourceFile":"APIItem\\WeldJointItem.cs"},{"SourceFile":"APIItem\\WorkloadItem.cs"},{"SourceFile":"Chart\\DataSourceChart.cs"},{"SourceFile":"Chart\\DataSourcePoint.cs"},{"SourceFile":"Chart\\DataSourceTeam.cs"},{"SourceFile":"ErrorInfo.cs"},{"SourceFile":"HandleStep.cs"},{"SourceFile":"Model.cs"},{"SourceFile":"ModelProc.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SpSysMenuItem.cs"},{"SourceFile":"SpTDesktopItem.cs"},{"SourceFile":"SpWeldingDailyItem.cs"},{"SourceFile":"ViewModels\\ImportErrorViewModel.cs"},{"SourceFile":"ViewModels\\TestPackageInfoViewModel.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","OutputItemRelativePath":"Model.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.pdb","OutputItemRelativePath":"Model.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index cddaafe..b8cc97e 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -20956,6 +20956,8 @@ namespace Model private System.Nullable _IsSuperQueWelding; + private System.Nullable _IsBracket; + private EntitySet _Batch_BatchTrustItem; private EntitySet _Batch_PointBatchItem; @@ -21100,6 +21102,8 @@ namespace Model partial void OnAuditStatusChanged(); partial void OnIsSuperQueWeldingChanging(System.Nullable value); partial void OnIsSuperQueWeldingChanged(); + partial void OnIsBracketChanging(System.Nullable value); + partial void OnIsBracketChanged(); #endregion public Pipeline_WeldJoint() @@ -22194,6 +22198,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBracket", DbType="Bit")] + public System.Nullable IsBracket + { + get + { + return this._IsBracket; + } + set + { + if ((this._IsBracket != value)) + { + this.OnIsBracketChanging(value); + this.SendPropertyChanging(); + this._IsBracket = value; + this.SendPropertyChanged("IsBracket"); + this.OnIsBracketChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet Batch_BatchTrustItem { @@ -28832,6 +28856,8 @@ namespace Model private string _Value38; + private string _Value39; + private EntityRef _Base_Project; private EntityRef _Sys_User; @@ -28928,6 +28954,8 @@ namespace Model partial void OnValue37Changed(); partial void OnValue38Changing(string value); partial void OnValue38Changed(); + partial void OnValue39Changing(string value); + partial void OnValue39Changed(); #endregion public Sys_DataInTemp() @@ -29825,6 +29853,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value39", DbType="NVarChar(50)")] + public string Value39 + { + get + { + return this._Value39; + } + set + { + if ((this._Value39 != value)) + { + this.OnValue39Changing(value); + this.SendPropertyChanging(); + this._Value39 = value; + this.SendPropertyChanged("Value39"); + this.OnValue39Changed(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Sys_DataInTemp_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -34549,6 +34597,8 @@ namespace Model private string _PipelineCode; + private string _PipelineId; + private string _PipingClassCode; private string _WeldJointCode; @@ -34867,6 +34917,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")] + public string PipelineId + { + get + { + return this._PipelineId; + } + set + { + if ((this._PipelineId != value)) + { + this._PipelineId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingClassCode", DbType="NVarChar(50)")] public string PipingClassCode { @@ -34883,7 +34949,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(51)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")] public string WeldJointCode { get @@ -42169,6 +42235,8 @@ namespace Model private string _WeldSilkCode; + private string _WeldSilkName; + private string _GrooveTypeCode; private string _Is_hjName; @@ -42201,6 +42269,8 @@ namespace Model private System.Nullable _IsPMI; + private System.Nullable _IsBracket; + private System.Nullable _IsGoldJoint; private string _WPQId; @@ -43095,7 +43165,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilkCode", DbType="VarChar(1) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilkCode", DbType="NVarChar(50)")] public string WeldSilkCode { get @@ -43111,6 +43181,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilkName", DbType="NVarChar(50)")] + public string WeldSilkName + { + get + { + return this._WeldSilkName; + } + set + { + if ((this._WeldSilkName != value)) + { + this._WeldSilkName = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeCode", DbType="NVarChar(50)")] public string GrooveTypeCode { @@ -43367,6 +43453,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBracket", DbType="Bit")] + public System.Nullable IsBracket + { + get + { + return this._IsBracket; + } + set + { + if ((this._IsBracket != value)) + { + this._IsBracket = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsGoldJoint", DbType="Bit")] public System.Nullable IsGoldJoint { diff --git a/HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json b/HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json index f0bb989..a9d0201 100644 --- a/HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json +++ b/HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\WebApi","ProjectFileName":"WebApi.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_Start\\BundleConfig.cs"},{"SourceFile":"App_Start\\FilterConfig.cs"},{"SourceFile":"App_Start\\RouteConfig.cs"},{"SourceFile":"App_Start\\WebApiConfig.cs"},{"SourceFile":"Areas\\HelpPage\\ApiDescriptionExtensions.cs"},{"SourceFile":"Areas\\HelpPage\\App_Start\\HelpPageConfig.cs"},{"SourceFile":"Areas\\HelpPage\\Controllers\\HelpController.cs"},{"SourceFile":"Areas\\HelpPage\\HelpPageAreaRegistration.cs"},{"SourceFile":"Areas\\HelpPage\\HelpPageConfigurationExtensions.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\CollectionModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ComplexTypeModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\DictionaryModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\EnumTypeModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\EnumValueDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\IModelDocumentationProvider.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\KeyValuePairModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ModelDescriptionGenerator.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ModelNameAttribute.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ModelNameHelper.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ParameterAnnotation.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\ParameterDescription.cs"},{"SourceFile":"Areas\\HelpPage\\ModelDescriptions\\SimpleTypeModelDescription.cs"},{"SourceFile":"Areas\\HelpPage\\Models\\HelpPageApiModel.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\HelpPageSampleGenerator.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\HelpPageSampleKey.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\ImageSample.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\InvalidSample.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\ObjectGenerator.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\SampleDirection.cs"},{"SourceFile":"Areas\\HelpPage\\SampleGeneration\\TextSample.cs"},{"SourceFile":"Areas\\HelpPage\\XmlDocumentationProvider.cs"},{"SourceFile":"Controllers\\HomeController.cs"},{"SourceFile":"Controllers\\TaskController.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Antlr.3.5.0.2\\lib\\Antlr3.Runtime.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\\lib\\net45\\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.Web.Infrastructure.1.0.0.0\\lib\\net40\\Microsoft.Web.Infrastructure.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Newtonsoft.Json.11.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebApi.Client.5.2.4\\lib\\net45\\System.Net.Http.Formatting.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.WebRequest.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Web.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.Helpers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebApi.Core.5.2.4\\lib\\net45\\System.Web.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebApi.WebHost.5.2.4\\lib\\net45\\System.Web.Http.WebHost.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.Mvc.5.2.4\\lib\\net45\\System.Web.Mvc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.Web.Optimization.1.1.3\\lib\\net40\\System.Web.Optimization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.Razor.3.2.4\\lib\\net45\\System.Web.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Routing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\packages\\WebGrease.1.6.0\\lib\\WebGrease.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\WebApi\\bin\\WebApi.dll","OutputItemRelativePath":"WebApi.dll"},{"OutputItemFullPath":"E:\\MyProject\\ZJ_BSF\\Basf_TCC7\\HJGL\\WebApi\\bin\\WebApi.pdb","OutputItemRelativePath":"WebApi.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\WebApi","ProjectFileName":"WebApi.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\WebApi\\bin\\WebApi.dll","OutputItemRelativePath":"WebApi.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\婀涙睙宸存柉澶玕\Basf_TCC7\\HJGL\\WebApi\\bin\\WebApi.pdb","OutputItemRelativePath":"WebApi.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index b1fb73c..ec5adfc 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ diff --git a/ReleasePacker - 鍓湰.bat b/ReleasePacker - 鍓湰.bat new file mode 100644 index 0000000..53e7e85 --- /dev/null +++ b/ReleasePacker - 鍓湰.bat @@ -0,0 +1,169 @@ +@echo off +REM --------------- +REM 发布包生成工具 +REM 执行此文件前请先用Release生成publisher项目 +REM -------------- + + + +REM -------------- +REM 环境变量设置 Project_Src为如PUBLISHER4_CODING这样的分支 +REM -------------- +set PROJECT_SRC=%CD% + +REM 源代码publisher项目文件夹 +set PUBLISHER_SRC_ROOT=%PROJECT_SRC%\HJGL\FineUIPro.Web + +REM 源代码版本日志文件夹 +set VerLog_SRC_ROOT=%PROJECT_SRC%\database\版本日志 + +REM 源代码报表文件夹 +set Report_SRC_ROOT=%PROJECT_SRC%\ReportServer + + +REM 包文件夹名 +SET ReleasePack=PackFile + +REM 发布程序包文件夹 +SET ReleasePackFolder=%PROJECT_SRC%\HJGL%ReleasePack% + +REM 发布包publisher文件所在文件夹 +SET RELEASE_PUBLISHER_ROOT=%PROJECT_SRC%\HJGL%ReleasePack%\%ReleasePack% + +REM 发布包版本日志文件所在文件夹 +SET RELEASE_VerLog_ROOT=%PROJECT_SRC%\HJGL%ReleasePack%\版本日志 + + +REM 发布包报表文件所在文件夹 +SET RELEASE_Report_ROOT=%PROJECT_SRC%\HJGL%ReleasePack%\ReportServer + + + + + + +REM -------------- +REM 发布程序包文件夹相关 +REM -------------- + +IF exist %ReleasePackFolder%\nul.ext ( +@echo 删除已存在的发布程序包文件夹 +@echo. +rd %ReleasePackFolder% /S /Q +) +mkdir %ReleasePackFolder% + + +IF exist %RELEASE_VerLog_ROOT%\nul.ext ( +rd %RELEASE_VerLog_ROOT% /S /Q +) +mkdir %RELEASE_VerLog_ROOT% + + +IF exist %RELEASE_Report_ROOT%\nul.ext ( +rd %RELEASE_Report_ROOT% /S /Q +) +mkdir %RELEASE_Report_ROOT% + + + +IF errorlevel 1 goto delReleasePackError + + +@echo 设置.net控制台环境 +@echo. +@call "D:\Visual Studio 2022\Common7\Tools\VsDevCmd.bat" +IF errorlevel 1 goto netEnvironmentError + + +@echo 开始预编译... +@echo. +aspnet_compiler -p %PUBLISHER_SRC_ROOT% %RELEASE_PUBLISHER_ROOT% -u -v / +IF errorlevel 1 goto aspnet_compilerError +@echo 预编译完成 +@echo. + + +@echo 开始合并程序集... +@echo. +Aspnet_merge %RELEASE_PUBLISHER_ROOT% -o UI +IF errorlevel 1 goto Aspnet_mergeError +@echo 合并程序集完成 +@echo. + + +REM -------------- +REM 删除不必要的文件 +REM -------------- + +@echo 开始清理垃圾文件... +@echo. + +del %RELEASE_PUBLISHER_ROOT%\*.cs /s /f +del %RELEASE_PUBLISHER_ROOT%\*.designer.cs /s /f +del %RELEASE_PUBLISHER_ROOT%\*.csproj /s /f +del %RELEASE_PUBLISHER_ROOT%\*.csproj.* /s /f +del %RELEASE_PUBLISHER_ROOT%\*.pdb /s /f +del %RELEASE_PUBLISHER_ROOT%\*.resx /s /f +del %RELEASE_PUBLISHER_ROOT%\*.xml /s /f +del %RELEASE_PUBLISHER_ROOT%\*.db /s /f +del %RELEASE_PUBLISHER_ROOT%\*.bak /s /f +del %RELEASE_PUBLISHER_ROOT%\*.*.bak /s /f +del %RELEASE_PUBLISHER_ROOT%\*.sln /s /f +del %RELEASE_PUBLISHER_ROOT%\*.suo /s /f +del %RELEASE_PUBLISHER_ROOT%\*.scc /s /f +rd %RELEASE_PUBLISHER_ROOT%\obj /s /q + +del %RELEASE_PUBLISHER_ROOT%\ReadMe.txt /s /f +del %RELEASE_PUBLISHER_ROOT%\*.pfx /s /f +del %RELEASE_PUBLISHER_ROOT%\*.StyleCop /s /f + +@echo 清理完成 +@echo. + +REM -------------- +REM 拷贝版本日志 +REM -------------- +@echo 拷贝版本日志... +@echo. + +copy %VerLog_SRC_ROOT%\*.* %RELEASE_VerLog_ROOT% /Y + + +REM -------------- +REM 拷贝报表文件 +REM -------------- +@echo 拷贝表文件... +@echo. + +xcopy %Report_SRC_ROOT%\*.* %RELEASE_Report_ROOT% /s + + + +@echo 发布包已生成,存放路径为%ReleasePackFolder% +@echo. +goto END + + +:delReleasePackError +@echo. +@echo 删除包存储文件夹失败! +goto END + +:netEnvironmentError +@echo. +@echo .net环境设置失败! +goto END + +:aspnet_compilerError +@echo. +@echo 预编译失败! +goto END + +:Aspnet_mergeError +@echo. +@echo 合并程序集失败! +goto END + +:END +pause