shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

123

This commit is contained in:
李云虎 2024-05-12 11:56:13 +08:00
parent 1edc2cce70
commit 258866a8a5
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataBase/版本日志/HJGLDB_2024.05.12.sql
View File

@ -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

14
HJGL/BLL/Common/ReportPrint/Common_ReportPrintService.cs
View File

@ -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
/// 试压包打印下拉项
/// </summary>
/// <returns></returns>
public static List<Template_Files> 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;
}
}

5
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
View File

@ -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);