diff --git a/DataBase/版本日志/HJGLDB_2024.05.12.sql b/DataBase/版本日志/HJGLDB_2024.05.12.sql
index c62f498..da44f3e 100644
--- a/DataBase/版本日志/HJGLDB_2024.05.12.sql
+++ b/DataBase/版本日志/HJGLDB_2024.05.12.sql
@@ -202,5 +202,14 @@ FROM Pipeline_WeldJoint AS weldJoint
GO
+UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','')
+GO
+
+UPDATE dbo.Template_Files SET SortIndex=SortIndex+1 where SortIndex>24
+GO
+
+INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex])
+VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','ܵӽͷPMIȷϱ','',25)
+GO
diff --git a/HJGL/BLL/Common/ReportPrint/Common_ReportPrintService.cs b/HJGL/BLL/Common/ReportPrint/Common_ReportPrintService.cs
index 1f51f99..2226f9b 100644
--- a/HJGL/BLL/Common/ReportPrint/Common_ReportPrintService.cs
+++ b/HJGL/BLL/Common/ReportPrint/Common_ReportPrintService.cs
@@ -28,7 +28,7 @@ namespace BLL
dic.Add("管道无损检测结果汇总表", BLL.Const.NdtTotalReport1);
dic.Add("管道无损检测结果汇总表(续)", BLL.Const.NdtTotalReport2);
dic.Add("管道无损检测比例统计表", BLL.Const.NdtRateReport1);
-
+
return dic;
}
@@ -36,9 +36,17 @@ namespace BLL
/// 试压包打印下拉项
///
///
- public static List TestPackageSelectPrint()
+ public static object TestPackageSelectPrint()
{
- var result = Funs.DB.Template_Files.OrderBy(t=>t.SortIndex).ToList();
+ //var result = Funs.DB.Template_Files.OrderBy(t=>t.SortIndex).ToList();
+ var result = (from x in Funs.DB.Template_Files
+ select new
+ {
+ Id = x.Id,
+ FilePath = x.FilePath,
+ SortIndex = x.SortIndex,
+ Title = (x.SortIndex ?? 0).ToString() + "-" + x.Title,
+ }).OrderBy(t => t.SortIndex).ToList();
return result;
}
}
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
index cc9719d..3025cb9 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
@@ -6244,6 +6244,11 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
XSSFSheet sheet24 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title);
template24(hssfworkbook, sheet24);
break;
+ //25-1-管道无损检测结果汇总表SHT 3503-J412-2017
+ case "95125974-3DD4-4E16-B4F0-A9D9C9A1406D":
+ XSSFSheet sheet25_1 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title);
+ template25_1(hssfworkbook, sheet25_1);
+ break;
//25-管道无损检测结果汇总表SHT 3503-J412-2017
case "4C45ABAB-89E9-4874-8F55-5050CDE98DFC":
XSSFSheet sheet25 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title);