diff --git a/CreateModel.bat b/CreateModel.bat
index 27ceb4a..2f27853 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS150%"
+@call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 87a9b09..47f53da 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj
index 7458eeb..9aaa6e5 100644
--- a/HJGL/BLL/BLL.csproj
+++ b/HJGL/BLL/BLL.csproj
@@ -178,6 +178,7 @@
     <Compile Include="WeldingProcess\TrustManage\Batch_BatchTrustService.cs" />
     <Compile Include="WeldingProcess\TrustManage\Batch_PointBatchItemService.cs" />
     <Compile Include="WeldingProcess\TrustManage\Batch_PointBatchService.cs" />
+    <Compile Include="WeldingProcess\WelderTest\WelderTestService.cs" />
     <Compile Include="WeldingProcess\WeldingManage\DailyReportCompleteService.cs" />
     <Compile Include="WeldingProcess\WeldingManage\Pipeline_PipelineDetectionTypeService.cs" />
     <Compile Include="WeldingProcess\WeldingManage\Pipeline_PipelineService.cs" />
diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs
index ad1dabc..2392655 100644
--- a/HJGL/BLL/Common/Const.cs
+++ b/HJGL/BLL/Common/Const.cs
@@ -332,8 +332,12 @@ namespace BLL
         /// </summary>
         public const string WelderManageMenuId = "1908E4C9-4A63-4A6C-6666-DA4910C2A8C7";
 
+        /// <summary>
+        /// 鐒婂伐璧勮川
+        /// </summary>
         public const string Welder_QualifiedProjectMenuId = "2F21257A-8CC4-4712-A954-A7F690CC68C5";
 
+        public const string WelderTestInfoMenuId = "BB114B9B-E10D-4C96-AD12-C36CAA08E4D2";
         /// <summary>
         /// 鍗曚綅淇℃伅
         /// </summary>
@@ -543,8 +547,20 @@ namespace BLL
 
 
         #region PMI 澶勭悊
+        /// <summary>
+        /// PMI濮旀墭
+        /// </summary>
+        public const string PMIDelegationMenuId = "49DFB8F3-B370-4028-9748-864A420347E1";
 
-        public const string PMIDelegationId = "A6FB44C3-0920-4F77-862F-D814FD5E5D23";
+        /// <summary>
+        /// PMI妫�娴嬪綍鍏�
+        /// </summary>
+        public const string PMIDetectionEntryMenuId = "DB9BE665-0F6A-46E0-8FFF-3D95ADD76B9E";
+
+        /// <summary>
+        /// PMI妫�娴嬫姤鍛�
+        /// </summary>
+        public const string PMIDetectionReportMenuId = "6250390B-2F37-4E8A-8724-5FCE877F60DA";
         #endregion
 
 
diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs
index 227b95b..67bc8a2 100644
--- a/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs
+++ b/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs
@@ -29,6 +29,7 @@ namespace BLL
             newR.DailyReportCompleteId = complete.DailyReportCompleteId;
             newR.ProjectId =complete.ProjectId;
             newR.UnitId = complete.UnitId;
+            newR.ReportMan = complete.ReportMan;    
             newR.TeamGroupId =complete.TeamGroupId;
             newR.DailyReportDate = complete.DailyReportDate;
             newR.IsComplete = complete.IsComplete;
@@ -47,6 +48,7 @@ namespace BLL
             Model.Pipeline_DailyReportComplete newR = db.Pipeline_DailyReportComplete.First(e => e.DailyReportCompleteId == complete.DailyReportCompleteId);
             newR.ProjectId = complete.ProjectId;
             newR.UnitId = complete.UnitId;
+            newR.ReportMan = complete.ReportMan;
             newR.TeamGroupId = complete.TeamGroupId;
             newR.DailyReportDate = complete.DailyReportDate;
             newR.IsComplete = complete.IsComplete;
diff --git a/HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json b/HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
index 137f869..e4fe33f 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\\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":"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\\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\\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\\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\\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\\BLL\\bin\\Debug\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"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":"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
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index 0c94359..deb1e63 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1274,6 +1274,7 @@
     <Content Include="WeldingProcess\WeldingManage\PipelineManageEdit.aspx" />
     <Content Include="WeldingProcess\WeldingManage\PipelineShowColumn.aspx" />
     <Content Include="WeldingProcess\WeldingManage\PreWeldReportAudit.aspx" />
+    <Content Include="WeldingProcess\WeldingManage\SuperQueWelding.aspx" />
     <Content Include="WeldingProcess\WeldingManage\WeldReport.aspx" />
     <Content Include="WeldingProcess\WeldingManage\WeldReportEdit.aspx" />
     <Content Include="WeldingProcess\WeldingManage\WeldReportItemEdit.aspx" />
@@ -5704,6 +5705,13 @@
     <Compile Include="WeldingProcess\WeldingManage\PreWeldReportAudit.aspx.designer.cs">
       <DependentUpon>PreWeldReportAudit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="WeldingProcess\WeldingManage\SuperQueWelding.aspx.cs">
+      <DependentUpon>SuperQueWelding.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WeldingProcess\WeldingManage\SuperQueWelding.aspx.designer.cs">
+      <DependentUpon>SuperQueWelding.aspx</DependentUpon>
+    </Compile>
     <Compile Include="WeldingProcess\WeldingManage\WeldReport.aspx.cs">
       <DependentUpon>WeldReport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -5918,6 +5926,10 @@
     <Folder Include="upload\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\BLL\BLL.csproj">
+      <Project>{bbc7282a-9e2b-4bd6-9c6d-333cefc6f332}</Project>
+      <Name>BLL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Model\Model.csproj">
       <Project>{FD1E1931-1688-4B4A-BCD6-335A81465343}</Project>
       <Name>Model</Name>
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8d0cdf2..d0ff50b 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index 9ecdad1..baa8804 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>
diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs
index 834e21b..9330994 100644
--- a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs
+++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs
@@ -187,7 +187,7 @@ namespace FineUIPro.Web.WelderManage
         #region 鍙抽敭缂栬緫
         protected void btnMenuEdit_Click(object sender, EventArgs e)
         {
-            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.Welder_QualifiedProjectMenuId, BLL.Const.BtnModify))
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.WelderTestInfoMenuId, BLL.Const.BtnModify))
             {
                 if (Grid1.SelectedRowIndexArray.Length == 0)
                 {
@@ -210,7 +210,7 @@ namespace FineUIPro.Web.WelderManage
         /// <param name="e"></param>
         protected void btnMenuDelete_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnDelete))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.WelderTestInfoMenuId, Const.BtnDelete))
             {
                 if (Grid1.SelectedRowIndexArray.Length == 0)
                 {
@@ -319,100 +319,107 @@ namespace FineUIPro.Web.WelderManage
 
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            string message = string.Empty;
-            errorInfos = string.Empty;
-            try
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.WelderTestInfoMenuId, Const.BtnIn))
             {
-                if (this.fileUpload.HasFile == false)
+                string message = string.Empty;
+                errorInfos = string.Empty;
+                try
                 {
-                    ShowNotify("璇烽�夋嫨Excel鏂囦欢!", MessageBoxIcon.Warning);
-                    return;
-                }
-                string IsXls = Path.GetExtension(this.fileUpload.FileName).ToString().Trim().ToLower();
-                if (IsXls != ".xls" && IsXls != ".xlsx")
-                {
-                    ShowNotify("鍙兘閫夋嫨Excel鏂囦欢!", MessageBoxIcon.Warning);
-                    return;
-                }
-
-                string rootPath = Server.MapPath("~/");
-                string initFullPath = rootPath + initPath;
-                if (!Directory.Exists(initFullPath))
-                {
-                    Directory.CreateDirectory(initFullPath);
-                }
-                //鎸囧畾涓婁紶鏂囦欢鍚嶇О
-                this.hidFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
-                //涓婁紶鏂囦欢璺緞
-                string filePath = initFullPath + this.hidFileName.Text;
-                //鏂囦欢涓婁紶鏈嶅姟鍣�
-                this.fileUpload.PostedFile.SaveAs(filePath);
-                //鏂囦欢涓婁紶鏈嶅姟鍣ㄥ悗鐨勫悕绉�
-                string fileName = rootPath + initPath + this.hidFileName.Text;
-                //璇诲彇Excel
-                DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
-                //楠岃瘉Excel璇诲彇鏄惁鏈夎
-                if (!string.IsNullOrEmpty(errorInfos))
-                {
-                    ShowNotify(errorInfos, MessageBoxIcon.Warning);
-                    return;
-                }
-                DataTable dt = ds.Tables[0];
-                if (dt.Rows.Count > 0)
-                {
-                    List<Model.Welder_TestInfo> listData = new List<Model.Welder_TestInfo>();
-                    var validate = ValidateImportFileds(dt);
-                    if(validate!=null && validate.Count > 0)
+                    if (this.fileUpload.HasFile == false)
                     {
-                        Cache["errLog"] = validate;
-                        //鎻愮ず閿欒淇℃伅
-                        PageContext.RegisterStartupScript(Window2.GetShowReference("WelderTestInfoImportError.aspx"));
+                        ShowNotify("璇烽�夋嫨Excel鏂囦欢!", MessageBoxIcon.Warning);
+                        return;
+                    }
+                    string IsXls = Path.GetExtension(this.fileUpload.FileName).ToString().Trim().ToLower();
+                    if (IsXls != ".xls" && IsXls != ".xlsx")
+                    {
+                        ShowNotify("鍙兘閫夋嫨Excel鏂囦欢!", MessageBoxIcon.Warning);
+                        return;
+                    }
+
+                    string rootPath = Server.MapPath("~/");
+                    string initFullPath = rootPath + initPath;
+                    if (!Directory.Exists(initFullPath))
+                    {
+                        Directory.CreateDirectory(initFullPath);
+                    }
+                    //鎸囧畾涓婁紶鏂囦欢鍚嶇О
+                    this.hidFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                    //涓婁紶鏂囦欢璺緞
+                    string filePath = initFullPath + this.hidFileName.Text;
+                    //鏂囦欢涓婁紶鏈嶅姟鍣�
+                    this.fileUpload.PostedFile.SaveAs(filePath);
+                    //鏂囦欢涓婁紶鏈嶅姟鍣ㄥ悗鐨勫悕绉�
+                    string fileName = rootPath + initPath + this.hidFileName.Text;
+                    //璇诲彇Excel
+                    DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
+                    //楠岃瘉Excel璇诲彇鏄惁鏈夎
+                    if (!string.IsNullOrEmpty(errorInfos))
+                    {
+                        ShowNotify(errorInfos, MessageBoxIcon.Warning);
+                        return;
+                    }
+                    DataTable dt = ds.Tables[0];
+                    if (dt.Rows.Count > 0)
+                    {
+                        List<Model.Welder_TestInfo> listData = new List<Model.Welder_TestInfo>();
+                        var validate = ValidateImportFileds(dt);
+                        if (validate != null && validate.Count > 0)
+                        {
+                            Cache["errLog"] = validate;
+                            //鎻愮ず閿欒淇℃伅
+                            PageContext.RegisterStartupScript(Window2.GetShowReference("WelderTestInfoImportError.aspx"));
+                        }
+                        else
+                        {
+                            foreach (DataRow dr in dt.Rows)
+                            {
+                                Model.Welder_TestInfo model = new Model.Welder_TestInfo();
+                                string welderCode = dr[0].ToString();
+                                string weldMethod = dr[1].ToString();
+                                string weldMeatrail = dr[2].ToString();
+                                string isPass = dr[3].ToString();
+                                string testDate = dr[4].ToString();
+                                string remark = dr[5].ToString();
+
+                                var welderId = Funs.DB.Welder_Welder.FirstOrDefault(t => t.WelderCode == welderCode)?.WelderId;
+                                var methodId = Funs.DB.Base_WeldingMethod.FirstOrDefault(t => t.WeldingMethodCode == weldMethod)?.WeldingMethodId;
+                                var materId = Funs.DB.Base_Material.FirstOrDefault(t => t.MaterialCode == weldMeatrail)?.MaterialId;
+                                model.Id = SQLHelper.GetNewID(typeof(Model.Welder_TestInfo));
+                                model.WeldMethodId = methodId;
+                                model.MaterialId = materId;
+                                model.IsPass = isPass == "鏄�" ? true : false;
+                                model.ProjectId = this.CurrUser.LoginProjectId;
+                                model.WelderId = welderId;
+                                model.CreatedDate = DateTime.Parse(testDate);
+                                model.Remark = remark;
+                                listData.Add(model);
+                            }
+                        }
+
+                        if (listData.Count > 0)
+                        {
+                            Funs.DB.Welder_TestInfo.InsertAllOnSubmit(listData);
+                            Funs.DB.SubmitChanges();
+                            ShowNotify("瀵煎叆鎴愬姛", MessageBoxIcon.Success);
+                            this.BindGrid();
+                        }
                     }
                     else
                     {
-                        foreach (DataRow dr in dt.Rows)
-                        {
-                            Model.Welder_TestInfo model = new Model.Welder_TestInfo();
-                            string welderCode = dr[0].ToString();
-                            string weldMethod = dr[1].ToString();
-                            string weldMeatrail = dr[2].ToString();
-                            string isPass = dr[3].ToString();
-                            string testDate = dr[4].ToString();
-                            string remark = dr[5].ToString();
-
-                            var welderId = Funs.DB.Welder_Welder.FirstOrDefault(t => t.WelderCode == welderCode)?.WelderId;
-                            var methodId = Funs.DB.Base_WeldingMethod.FirstOrDefault(t => t.WeldingMethodCode == weldMethod)?.WeldingMethodId;
-                            var materId = Funs.DB.Base_Material.FirstOrDefault(t => t.MaterialCode == weldMeatrail)?.MaterialId;
-                            model.Id = SQLHelper.GetNewID(typeof(Model.Welder_TestInfo));
-                            model.WeldMethodId= methodId;
-                            model.MaterialId= materId;
-                            model.IsPass = isPass == "鏄�" ? true : false;
-                            model.ProjectId = this.CurrUser.LoginProjectId;
-                            model.WelderId= welderId;
-                            model.CreatedDate = DateTime.Parse(testDate);
-                            model.Remark = remark;
-                            listData.Add(model);
-                        }
+                        ShowAlert("娌℃湁鏁版嵁!", MessageBoxIcon.Warning);
+                        return;
                     }
 
-                    if(listData.Count > 0)
-                    {
-                        Funs.DB.Welder_TestInfo.InsertAllOnSubmit(listData);
-                        Funs.DB.SubmitChanges();
-                        ShowNotify("瀵煎叆鎴愬姛", MessageBoxIcon.Success);
-                        this.BindGrid();
-                    }
                 }
-                else
+                catch (Exception ex)
                 {
-                    ShowAlert("娌℃湁鏁版嵁!", MessageBoxIcon.Warning);
-                    return;
+                    ShowAlert("'" + ex.Message + "'", MessageBoxIcon.Warning);
                 }
-
             }
-            catch (Exception ex)
+            else
             {
-                ShowAlert("'" + ex.Message + "'", MessageBoxIcon.Warning);
+                ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
             }
         }
         
@@ -485,7 +492,7 @@ namespace FineUIPro.Web.WelderManage
         /// <param name="e"></param>
         protected void btnAdd_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnAdd))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.WelderTestInfoMenuId, Const.BtnAdd))
             {
                 if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
                 {
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
index 7c2658d..6c1976c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
@@ -277,7 +277,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationMenuId, Const.BtnAdd))
             {
                 this.SetTextTemp();
                 string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", string.Empty, "鏂板 - ") ;
@@ -327,7 +327,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         /// <param name="e"></param>
         protected void btnDelete_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnDelete))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationMenuId, Const.BtnDelete))
             {
                 var trustManage =Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId);
                 if (trustManage != null)
@@ -384,6 +384,18 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         #endregion
         #endregion
 
-       
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private bool GetButtonPower(string button)
+        {
+            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DailyReportCompleteMenuId, button);
+        }
+        #endregion
+
+
     }
 }
\ No newline at end of file
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
index 3739f7b..cb2e8ca 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
@@ -191,7 +191,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnSave))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationMenuId, Const.BtnSave))
             {
                 
                 try
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
index f4c6376..3b890c9 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             }
             if (this.drpIsALl.SelectedValue=="鎶ヨ")
             {
-                query = query.Where(t=>(t.RateBys<=2 && t.PMIBySNum<=2) || (t.RateByf<=2 && t.PMIByFNum<=2));
+                query = query.Where(t=>(t.RateBys<=2 || t.PMIBySNum<=2) || (t.RateByf<=2 || t.PMIByFNum<=2));
             }
             if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
             {
@@ -98,7 +98,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             itemLable.Text = rates.ToString() + "%";
             int PMIByFNum = Convert.ToInt32(labPMIByFNum.Text);
             labRateByf.Text = ratef.ToString() + "%";
-            if ((rates <= 2 && PMIBySNum <= 2) || (ratef <= 2 && PMIByFNum <= 2))
+            if ((rates <= 2 || PMIBySNum <= 2) || (ratef <= 2 || PMIByFNum <= 2))
             {
                 e.RowCssClass = "color1";
             }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
index 025f486..ce1b87c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
@@ -330,11 +330,11 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            //if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.BItemEndCheckMenuId, Const.BtnSave))
-            //{
-            //    ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒");
-            //    return;
-            //}
+            if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDetectionEntryMenuId, Const.BtnSave))
+            {
+                ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒");
+                return;
+            }
 
             if (Grid1.GetModifiedData().Count > 0)
             {
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
index a1167ec..4e74784 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
@@ -888,6 +888,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                 //    }
                 //}
                 Alert.ShowInTop(info);
+                BindGrid();
             }
             else
             {
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx
index b94e01a..8e62f2d 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="鏃ユ姤瀹屾垚鎯呭喌" DataIDField="DailyReportCompleteId"
                     EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" 
-                    AllowSorting="true" OnSort="Grid1_Sort"
+                    AllowSorting="true" OnSort="Grid1_Sort" DataKeyNames="DailyReportCompleteId"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
@@ -39,6 +39,7 @@
                         <f:RenderField HeaderText="鍗曚綅浠ｇ爜" ColumnID="UnitCode" DataField="UnitCode" Width="150"></f:RenderField>
                         <f:RenderField HeaderText="鏂藉伐鐝粍" ColumnID="TeamGroupName" DataField="TeamGroupName" Width="180"></f:RenderField>
                         <f:RenderField HeaderText="鏃ユ姤鏃ユ湡" ColumnID="DailyReportDate" DataField="DailyReportDate" Width="200"></f:RenderField>
+                        <f:RenderField HeaderText="濉姤浜�" ColumnID="ReportMan" DataField="ReportMan" Width="150"></f:RenderField>
                         <f:CheckBoxField Width="160px" RenderAsStaticField="true" TextAlign="Center"  DataField="IsComplete" HeaderText="鏄惁瀹屾垚" />
                     </Columns>
                     <Listeners>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx.cs
index e5dad60..455ed62 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportComplete.aspx.cs
@@ -41,10 +41,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT daily.DailyReportCompleteId,unit.UnitCode,team.TeamGroupName,daily.DailyReportDate,daily.IsComplete
+            string strSql = @"SELECT daily.DailyReportCompleteId,unit.UnitCode,team.TeamGroupName,
+                                     daily.DailyReportDate,daily.IsComplete,u.UserName AS ReportMan
                                FROM dbo.Pipeline_DailyReportComplete daily
                                LEFT JOIN dbo.Welder_TeamGroup team ON team.TeamGroupId = daily.TeamGroupId
                                LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = daily.UnitId
+							   LEFT JOIN dbo.Sys_User u ON u.UserId=daily.ReportMan
                                WHERE 1=1";
             List<SqlParameter> parms = new List<SqlParameter>();
             if (this.drpTeamGroup.SelectedValue != "" && this.drpTeamGroup.SelectedValue!=Const._Null)
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx
index 688194d..5a32bbb 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx
@@ -19,6 +19,12 @@
                     </f:DropDownList>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtReportMan" runat="server" Label="濉姤浜�" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:DropDownList ID="drpTeamGroup" runat="server" Label="鏂藉伐鐝粍" Required="true" ShowRedStar="true">
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.cs
index e88f8fe..509182c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.cs
@@ -30,7 +30,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     var daily = BLL.DailyReportCompleteService.GetDailyReportComplete(completeId);
                     if (daily != null)
                     {
-                        drpUnit.SelectedValue=daily.UnitId;
+                        var user = BLL.Sys_UserService.GetUsersByUserId(daily.ReportMan);
+                        drpUnit.SelectedValue = daily.UnitId;
+                        if (user != null)
+                        {
+                            txtReportMan.Text = user.UserName;
+                        }
+                        else
+                        {
+                            txtReportMan.Text = this.CurrUser.UserName;
+                        }
+                        
                         drpTeamGroup.SelectedValue = daily.TeamGroupId;
                         if (daily.DailyReportDate.HasValue)
                         {
@@ -46,6 +56,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         }
 
                     }
+                    else
+                    {
+                        txtReportMan.Text = this.CurrUser.UserName;
+                    }
                 }
             }
         }
@@ -65,7 +79,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.RoleMenuId, Const.BtnSave))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.DailyReportCompleteMenuId, Const.BtnSave))
             {
                 string completeId = Request.Params["completeId"];
                 if (drpTeamGroup.SelectedValue == null || drpTeamGroup.SelectedValue == "")
@@ -85,6 +99,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     Model.Pipeline_DailyReportComplete newR = new Model.Pipeline_DailyReportComplete();
                     newR.ProjectId = this.CurrUser.LoginProjectId;
                     newR.UnitId = drpUnit.SelectedValue;
+                    newR.ReportMan=this.CurrUser.UserId;
                     newR.TeamGroupId = drpTeamGroup.SelectedValue;  
                     newR.DailyReportDate=Convert.ToDateTime(txtDailyReportDate.Text).Date;
                     newR.IsComplete=chkIsComplete.Checked;
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.designer.cs
index 9845d14..357c88f 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/DailyReportCompleteEdit.aspx.designer.cs
@@ -50,6 +50,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
 
+        /// <summary>
+        /// txtReportMan 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtReportMan;
+
         /// <summary>
         /// drpTeamGroup 鎺т欢銆�
         /// </summary>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx
new file mode 100644
index 0000000..41e2dc5
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx
@@ -0,0 +1,133 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SuperQueWelding.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingManage.SuperQueWelding" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <style>
+        .f-grid-row-summary .f-grid-cell-inner {
+            font-weight: bold;
+            color: red;
+        }
+    </style> 
+    <title>瓒呰祫璐ㄧ剨鎺ラ璀�</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="瓒呰祫璐ㄧ剨鎺ラ璀�"
+                EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" 
+                AllowSorting="true" SortField="PipelineCode,WeldJointCode" OnSort="Grid1_Sort"
+                AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items>
+                            <f:RadioButtonList ID="rbWarn" runat="server" Width="120px">
+                                <f:RadioItem Text="鍏ㄩ儴" Value="0" Selected="true" />
+                                <f:RadioItem Text="棰勮" Value="1" />
+                            </f:RadioButtonList>
+                            <f:TextBox ID="txtPipeLineCode" runat="server" Label="绠＄嚎鍙�" LabelAlign="Right"
+                                LabelWidth="90px" Width="260px"></f:TextBox>
+                            <f:DatePicker runat="server" Label="鐒婃帴鏃ユ湡" ID="txtStarTime" LabelAlign="Right"
+                                LabelWidth="90px" Width="210px">
+                            </f:DatePicker>
+                            <f:Label ID="Label1" runat="server" Text="<%$ Resources:Lan,To %>">
+                            </f:Label>
+                            <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
+                                Width="110px">
+                            </f:DatePicker>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                            <f:Button ID="BtnAnalyse" Text="鏌ヨ" Icon="ChartPie"
+                                runat="server" OnClick="BtnAnalyse_Click">
+                            </f:Button>
+                            <f:Button ID="btnExtract" Text="鎻愬彇鏁版嵁" Icon="ChartPie"
+                                runat="server" OnClick="BtnExtract_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" HeaderText="搴忓彿<br>S/N"
+                        Width="70px" HeaderTextAlign="Center" TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                    <f:RenderField HeaderText="鍖哄煙鍙�" ColumnID="WorkAreaCode"
+                        DataField="WorkAreaCode" SortField="WorkAreaCode" FieldType="String" HeaderTextAlign="Center"
+                        Width="180px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="绠＄嚎鍙�" ColumnID="PipelineCode"
+                        DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
+                        Width="120px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鐒婂彛鍙�" ColumnID="WeldJointCode"
+                        DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
+                        Width="120px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鏉愯川1" ColumnID="MaterialCode1"
+                        DataField="MaterialCode1" SortField="MaterialCode1" FieldType="String"
+                        HeaderTextAlign="Center" Width="150px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鏉愯川2" ColumnID="MaterialCode2"
+                        DataField="MaterialCode2" SortField="MaterialCode2" FieldType="String"
+                        HeaderTextAlign="Center" Width="150px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鐒婃帴褰㈠紡" ColumnID="WeldTypeCode"
+                        DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
+                        Width="120px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鐒婃帴浣嶇疆" ColumnID="WeldingLocationCode"
+                        DataField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
+                        Width="100px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鐒婃帴鏂规硶<br>Weld Process" ColumnID="WeldingMethodName"
+                        DataField="WeldingMethodName" SortField="WeldingMethodName" FieldType="String"
+                        HeaderTextAlign="Center" Width="120px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="瀵稿緞" ColumnID="Size" DataField="Size"
+                        SortField="Size" FieldType="String" HeaderTextAlign="Center" Width="100px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="瑙勬牸" ColumnID="Specification" DataField="Specification"
+                        SortField="Specification" FieldType="String" HeaderTextAlign="Center" Width="130px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鎵撳簳鐒婂伐鍙�" ColumnID="BackingWelderCode"
+                        DataField="BackingWelderCode" SortField="BackingWelderCode" FieldType="String"
+                        HeaderTextAlign="Center" Width="120px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鐩栭潰鐒婂伐鍙�" ColumnID="CoverWelderCode"
+                        DataField="CoverWelderCode" SortField="CoverWelderCode" FieldType="String"
+                        HeaderTextAlign="Center" Width="120px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="鐒婃帴鏃ユ湡<br>Welding Date" ColumnID="WeldingDate"
+                        DataField="WeldingDate" SortField="WeldingDate" FieldType="String" HeaderTextAlign="Center"
+                        Width="170px">
+                    </f:RenderField>
+                    <f:RenderCheckField Width="80px" ColumnID="IsSuperQueWelding" DataField="IsSuperQueWelding" HeaderText="鏄惁瓒呰祫璐�" EnableColumnEdit="false">
+                    </f:RenderCheckField>
+                </Columns>
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="10" Value="10" />
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx.cs
new file mode 100644
index 0000000..8bbfc88
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx.cs
@@ -0,0 +1,142 @@
+锘縰sing BLL;
+using NPOI.XSSF.UserModel;
+using NPOI.SS.UserModel;
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using BorderStyle = NPOI.SS.UserModel.BorderStyle;
+
+namespace FineUIPro.Web.WeldingProcess.WeldingManage
+{
+    public partial class SuperQueWelding : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindGrid();
+            }
+        }
+
+        private void BindGrid()
+        {
+
+            DataTable tb = GetDataTable();
+            this.Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 鏁版嵁琛�
+        /// </summary>
+        private DataTable GetDataTable()
+        {
+            string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,WorkArea.WorkAreaId,
+	                                 WorkArea.WorkAreaCode,pipeline.SingleNumber,pipeline.PipelineCode,weldJoint.WeldJointCode,
+	                                 weldType.WeldTypeCode,wl.WeldingLocationCode,weldJoint.Size,weldJoint.Thickness,
+	                                 weldJoint.Specification,mat1.MaterialCode AS MaterialCode1,mat2.MaterialCode AS MaterialCode2,
+                                     WeldMethod.WeldingMethodName,cw.WelderCode AS CoverWelderCode,fw.WelderCode AS BackingWelderCode,
+	                                 weldJoint.BackingWelderId,weldJoint.CoverWelderId,weldingDaily.WeldingDate,
+	                                 weldJoint.IsSuperQueWelding
+                                FROM Pipeline_WeldJoint AS weldJoint
+	                            LEFT JOIN Pipeline_Pipeline AS pipeline ON pipeline.PipelineId = weldJoint.PipelineId	
+	                            LEFT JOIN Project_WorkArea AS WorkArea ON WorkArea.WorkAreaId = pipeline.WorkAreaId
+	                            LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = weldJoint.Material1Id
+	                            LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = weldJoint.Material2Id
+	                            LEFT JOIN Base_WeldingMethod AS WeldMethod ON WeldMethod.WeldingMethodId = weldJoint.WeldingMethodId
+	                            LEFT JOIN dbo.Base_WeldType weldType ON weldType.WeldTypeId = weldJoint.WeldTypeId
+	                            LEFT JOIN dbo.Base_WeldingLocation wl ON wl.WeldingLocationId = weldJoint.WeldingLocationId	
+	                            LEFT JOIN Pipeline_WeldingDaily AS weldingDaily ON weldingDaily.WeldingDailyId = weldJoint.WeldingDailyId
+	                            left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId
+	                            left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId
+                               WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+
+            if (!string.IsNullOrEmpty(txtPipeLineCode.Text))
+            {
+                strSql += " AND pipeline.PipelineCode LIKE @PipelineCode";
+                listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipeLineCode.Text.Trim() + "%"));
+            }
+            if (rbWarn.SelectedValue != "0")
+            {
+                strSql += " AND weldJoint.IsSuperQueWelding=1";
+            }
+            if (txtStarTime.Text != "")
+            {
+                strSql += " AND weldingDaily.WeldingDate> = @WeldingStartDate";
+                listStr.Add(new SqlParameter("@WeldingStartDate", txtStarTime.Text.Trim()));
+            }
+            if (txtEndTime.Text != "")
+            {
+                strSql += " AND weldingDaily.WeldingDate< = @WeldingEndDate";
+                listStr.Add(new SqlParameter("@WeldingEndDate", txtEndTime.Text.Trim()));
+            }
+
+            strSql += " ORDER BY pipeline.PipelineCode,WeldJointCode";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return dt;
+        }
+
+        #region 鎸夐挳浜嬩欢
+        /// <summary>
+        /// 缁熻
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void BtnExtract_Click(object sender, EventArgs e)
+        {
+            DataTable dt = GetDataTable();
+            foreach()
+        }
+        #endregion
+
+        #region
+        /// <summary>
+        /// 鏀瑰彉绱㈠紩浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx.designer.cs
new file mode 100644
index 0000000..7f3ede4
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/SuperQueWelding.aspx.designer.cs
@@ -0,0 +1,170 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.WeldingProcess.WeldingManage
+{
+
+
+    public partial class SuperQueWelding
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// rbWarn 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbWarn;
+
+        /// <summary>
+        /// txtPipeLineCode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipeLineCode;
+
+        /// <summary>
+        /// txtStarTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+
+        /// <summary>
+        /// Label1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// txtEndTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// BtnAnalyse 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// btnExtract 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnExtract;
+
+        /// <summary>
+        /// labNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
index 3807ef3..c5d1a99 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
@@ -73,12 +73,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
             Grid1.DataSource = table;
             Grid1.DataBind();
 
-            var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineCode")).Select(group => group.First());
+            var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineId")).Select(group => group.First());
             var distinctSingleNumber = tb.AsEnumerable().GroupBy(row => row.Field<string>("SingleNumber")).Select(group => group.First());
             var backingWelder = tb.AsEnumerable().Where(row => row.Field<string>("BackingWelderCode")!=null).GroupBy(row => row.Field<string>("BackingWelderCode")).Select(group => group.First());
             var coverWelder = tb.AsEnumerable().Where(row => row.Field<string>("CoverWelderCode")!= null).GroupBy(row => row.Field<string>("CoverWelderCode")).Select(group => group.First());
             var jotNum = from x in tb.AsEnumerable()
-                         group x by new { pipe = x.Field<string>("PipelineCode"), jot = x.Field<string>("WeldJointCode"), Size = x.Field<string>("JOT_Size") }
+                         group x by new { pipe = x.Field<string>("PipelineId"), jot = x.Field<string>("WeldJointCode"), Size = x.Field<string>("JOT_Size") }
                          into g
                          select new { pipe=g.Key.pipe,jot=g.Key.jot, Size=g.Key.Size };
             JObject summary = new JObject();
@@ -389,12 +389,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
                     rowIndex++;
                 }
 
-                var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineCode")).Select(group => group.First());
+                var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineId")).Select(group => group.First());
                 var distinctSingleNumber = tb.AsEnumerable().GroupBy(row => row.Field<string>("SingleNumber")).Select(group => group.First());
                 var backingWelder = tb.AsEnumerable().GroupBy(row => row.Field<string>("BackingWelderCode")).Select(group => group.First());
                 var coverWelder = tb.AsEnumerable().GroupBy(row => row.Field<string>("CoverWelderCode")).Select(group => group.First());
                 var jotNum = from x in tb.AsEnumerable()
-                             group x by new { pipe = x.Field<string>("PipelineCode"), jot = x.Field<string>("WeldJointCode"), Size = x.Field<string>("JOT_Size") }
+                             group x by new { pipe = x.Field<string>("PipelineId"), jot = x.Field<string>("WeldJointCode"), Size = x.Field<string>("JOT_Size") }
                              into g
                              select new { pipe = g.Key.pipe, jot = g.Key.jot, Size = g.Key.Size };
 
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
index 2dd3c21..43c09d6 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
         /// </summary>
         private DataTable GetDataTable()
         {
-            string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,ins.InstallationCode,unit.UnitName,pipeline.PipelineCode,
+            string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,ins.InstallationCode,unit.UnitName,weldJoint.PipelineId,pipeline.PipelineCode,
                                     (CASE WHEN weldJoint.PageNum IS NOT NULL AND weldJoint.PageNum<>'' THEN pipeline.SingleNumber+'-'+weldJoint.PageNum ELSE  pipeline.SingleNumber END) AS SingleNumber,
                                      pipeline.DrawingsNum,CONVERT(NVARCHAR(10),weldingDaily.WeldingDate,120) AS WeldingDate,rate.DetectionRateCode,weldJoint.WeldJointCode,
 	                                CAST(ISNULL(weldJoint.Size,0) AS REAL) AS Size,(CAST(ISNULL(weldJoint.Thickness,0) AS REAL)) AS Thickness,weldJoint.Specification,
@@ -138,7 +138,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
             if (tb.Rows.Count > 0)
             {
                 // 鍚堣
-                var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineCode")).Select(group => group.First());
+                var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineId")).Select(group => group.First());
                 var distinctWelder = tb.AsEnumerable().GroupBy(row => row.Field<string>("WelderCode")).Select(group => group.First());
                 decimal sumSize = decimal.Parse(tb.Compute("sum(Size)", "").ToString());
                 string weldingDate = string.Empty;
@@ -371,7 +371,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
                 var style4 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 9, true,true, "Arial");
 
                 ws = ExcelCreateRow(ws, hssfworkbook, dt.Rows.Count + 3, dt.Rows.Count + 3, style4, 0, 19);
-                var distinctPipelineCode = dt.AsEnumerable().GroupBy(row => row.Field<string>("PipelineCode")).Select(group => group.First());
+                var distinctPipelineCode = dt.AsEnumerable().GroupBy(row => row.Field<string>("PipelineId")).Select(group => group.First());
                 var distinctWelder = dt.AsEnumerable().GroupBy(row => row.Field<string>("WelderCode")).Select(group => group.First());
                 decimal sumSize = decimal.Parse(dt.Compute("sum(Size)", "").ToString());
                 
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index ab6bcaa..cda10b9 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -29,10 +29,6 @@ namespace Model
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnCreated();
-		partial void OnCreated()
-		{
-			this.CommandTimeout = 600;
-		}
     partial void InsertAttachFile(AttachFile instance);
     partial void UpdateAttachFile(AttachFile instance);
     partial void DeleteAttachFile(AttachFile instance);
@@ -17733,6 +17729,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsComplete;
 		
+		private string _ReportMan;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -17749,6 +17747,8 @@ namespace Model
     partial void OnDailyReportDateChanged();
     partial void OnIsCompleteChanging(System.Nullable<bool> value);
     partial void OnIsCompleteChanged();
+    partial void OnReportManChanging(string value);
+    partial void OnReportManChanged();
     #endregion
 		
 		public Pipeline_DailyReportComplete()
@@ -17876,6 +17876,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportMan", DbType="NVarChar(50)")]
+		public string ReportMan
+		{
+			get
+			{
+				return this._ReportMan;
+			}
+			set
+			{
+				if ((this._ReportMan != value))
+				{
+					this.OnReportManChanging(value);
+					this.SendPropertyChanging();
+					this._ReportMan = value;
+					this.SendPropertyChanged("ReportMan");
+					this.OnReportManChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -20910,6 +20930,8 @@ namespace Model
 		
 		private System.Nullable<int> _AuditStatus;
 		
+		private System.Nullable<bool> _IsSuperQueWelding;
+		
 		private EntitySet<Batch_BatchTrustItem> _Batch_BatchTrustItem;
 		
 		private EntitySet<Batch_PointBatchItem> _Batch_PointBatchItem;
@@ -21052,6 +21074,8 @@ namespace Model
     partial void OnIsPMIChanged();
     partial void OnAuditStatusChanging(System.Nullable<int> value);
     partial void OnAuditStatusChanged();
+    partial void OnIsSuperQueWeldingChanging(System.Nullable<bool> value);
+    partial void OnIsSuperQueWeldingChanged();
     #endregion
 		
 		public Pipeline_WeldJoint()
@@ -22126,6 +22150,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSuperQueWelding", DbType="Bit")]
+		public System.Nullable<bool> IsSuperQueWelding
+		{
+			get
+			{
+				return this._IsSuperQueWelding;
+			}
+			set
+			{
+				if ((this._IsSuperQueWelding != value))
+				{
+					this.OnIsSuperQueWeldingChanging(value);
+					this.SendPropertyChanging();
+					this._IsSuperQueWelding = value;
+					this.SendPropertyChanged("IsSuperQueWelding");
+					this.OnIsSuperQueWeldingChanged();
+				}
+			}
+		}
+		
 		[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> Batch_BatchTrustItem
 		{
diff --git a/HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json b/HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json
index 336f06f..f0bb989 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\\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\\BLL\\bin\\Debug\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"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":"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
diff --git a/HJGL/WebApi/Web.config b/HJGL/WebApi/Web.config
index 12d6c7e..f9abf6f 100644
--- a/HJGL/WebApi/Web.config
+++ b/HJGL/WebApi/Web.config
@@ -27,7 +27,7 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="false" targetFramework="4.8"/>
+    <compilation debug="true" targetFramework="4.8"/>
     <httpRuntime targetFramework="4.6.1"/>
   </system.web>
   <system.webServer>
diff --git a/HJGL/WebApi/WebApi.csproj b/HJGL/WebApi/WebApi.csproj
index 85ea304..08d202c 100644
--- a/HJGL/WebApi/WebApi.csproj
+++ b/HJGL/WebApi/WebApi.csproj
@@ -253,6 +253,10 @@
     <Content Include="Scripts\jquery-3.3.1.min.map" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\BLL\BLL.csproj">
+      <Project>{bbc7282a-9e2b-4bd6-9c6d-333cefc6f332}</Project>
+      <Name>BLL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Model\Model.csproj">
       <Project>{fd1e1931-1688-4b4a-bcd6-335a81465343}</Project>
       <Name>Model</Name>
diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
index 1a274f0..f42f14d 100644
Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ