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

11

Browse Source
This commit is contained in:
佘春生
2024-06-28 14:13:03 +08:00
parent 29a6bad939 4b5699aee3
commit ee964afac3
15 changed files with 185 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
+65 -19
View File
@@ -2291,6 +2291,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
//模拟数据
string sql = @"select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User";
SqlParameter[] parms = new SqlParameter[] { new SqlParameter("@PTP_ID", this.tvControlItem.SelectedNodeID) };
@@ -2405,6 +2408,18 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
ws.GetRow(rowIndex + 12).GetCell(6).CellStyle = style2;
ws.GetRow(rowIndex + 12).GetCell(6).SetCellValue(" 施工班组长：\n Foreman:\n 质量检查员：\n Quality Inspector:\n 专业工程师：\n Discipline Engineer: \n 日期(DATE)： 年 月 日");
if (!string.IsNullOrEmpty(getInfo.Item1) && !string.IsNullOrEmpty(getInfo.Item2))
{
switch (getInfo.Item2)
{
case "建设方":
InsertImage(hssfworkbook, ws, rowIndex + 12, 1, rowIndex + 12, 2, Server.MapPath(getInfo.Item1), 1, 0.2,3,30);
break;
case "总承包商":
InsertImage(hssfworkbook, ws, rowIndex + 12, 5, rowIndex + 12, 5, Server.MapPath(getInfo.Item1), 1,0.2,3, 30);
break;
}
}
#endregion
rowIndex += 13;
@@ -2417,28 +2432,14 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
//垂直水平居中
ws.VerticallyCenter = true;
ws.HorizontallyCenter = true;
//ws.PrintSetup.FitWidth = 1;
//ws.PrintSetup.FitHeight = 0;
//ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;
//ws.FitToPage = true;
////垂直水平居中
//ws.VerticallyCenter = true;
//ws.HorizontallyCenter = true;
////打印边距设置 厘米/3
//ws.SetMargin(MarginType.RightMargin, (double)2.4 / 3);
//ws.SetMargin(MarginType.LeftMargin, (double)2.9 / 3);
//ws.SetMargin(MarginType.TopMargin, (double)2.4 / 3);
//ws.SetMargin(MarginType.BottomMargin, (double)2.4 / 3);
////页眉页脚间距
//ws.SetMargin(MarginType.HeaderMargin, 0);
//ws.SetMargin(MarginType.FooterMargin, 0);
}
//14-滑动固定管托安装检验记录SHT 3503-J404
private void template14(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
//模拟数据
string sql = @"select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User";
@@ -2560,7 +2561,18 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
ws.GetRow(rowIndex + 13).GetCell(6).SetCellValue(" 施工班组长：\n Foreman:\n 质量检查员：\n Quality Inspector:\n 专业工程师：\n Discipline Engineer: \n 日期(DATE)： 年 月 日");
#endregion
if (!string.IsNullOrEmpty(getInfo.Item1) && !string.IsNullOrEmpty(getInfo.Item2))
{
switch (getInfo.Item2)
{
case "建设方":
InsertImage(hssfworkbook, ws, rowIndex + 13, 1, rowIndex + 13, 2, Server.MapPath(getInfo.Item1), 1, 0.2, 3, 30);
break;
case "总承包商":
InsertImage(hssfworkbook, ws, rowIndex + 13, 5, rowIndex + 13, 5, Server.MapPath(getInfo.Item1), 1, 0.2, 3, 30);
break;
}
}
rowIndex += 14;
}
@@ -2593,6 +2605,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template15(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
//模拟数据
string sql = @"select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User";
@@ -2754,7 +2768,18 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
ws.GetRow(rowIndex + 26).HeightInPoints = 5f;
ws.GetRow(rowIndex + 27).HeightInPoints = 5f;
ws.GetRow(rowIndex + 28).HeightInPoints = 30f;
if (!string.IsNullOrEmpty(getInfo.Item1) && !string.IsNullOrEmpty(getInfo.Item2))
{
switch (getInfo.Item2)
{
case "建设方":
InsertImage(hssfworkbook, ws, rowIndex + 25, 1, rowIndex + 25, 2, Server.MapPath(getInfo.Item1), 1, 0.2, 3, 30);
break;
case "总承包商":
InsertImage(hssfworkbook, ws, rowIndex + 25, 5, rowIndex + 25, 5, Server.MapPath(getInfo.Item1), 1, 0.2, 3, 30);
break;
}
}
#endregion
rowIndex += 29;
@@ -4521,7 +4546,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template23(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
//模拟数据
string sql = @"select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User";
SqlParameter[] parms = new SqlParameter[] { new SqlParameter("@PTP_ID", this.tvControlItem.SelectedNodeID) };
@@ -4813,6 +4840,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template24(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
//模拟数据
string sql = @"select '模拟数据' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '模拟数据' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User union all select '模拟数据' as PTP_ID, '' as TestPackageNo, '' WorkAreaId, '' WorkAreaCode, '' PipelineId, '' PipelineCode, '' SystemNumber, '' as TestHeat, '' as TestType, '' SingleNumber, '' DrawingsNum, '' as Remark, '' as PageNum from Sys_User";
@@ -5075,6 +5104,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template25_1(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
//模拟数据
@@ -6504,6 +6535,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
int rowIndex = 0;
var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
#region 头部
@@ -6630,6 +6663,10 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template33(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
int rowIndex = 0;
var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
@@ -6865,6 +6902,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
int rowIndex = 0;
var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
#region 头部
ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + 5, style, 0, 8, true);
@@ -7023,6 +7063,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template35_sheet1(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
int rowIndex = 0;
var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
@@ -7168,6 +7211,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private void template35_sheet2(XSSFWorkbook hssfworkbook, XSSFSheet ws)
{
var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID);
//获取签名
var getInfo = BLL.Sys_UserService.GetSingtrueImageUrl(info?.Auditer);
int rowIndex = 0;
var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
var style1 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 10, true, false, "Arial Unicode MS");
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
+2 -2
View File
@@ -815,7 +815,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 25, 13, 10, 40);
}
else
{
@@ -823,7 +823,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1.1, 1, 25, 13, 10, 40);
}
else
{
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
+20 -10
View File
@@ -788,6 +788,11 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
if (tb.Rows.Count > 0 && tbTitle.Rows.Count > 0)
{
string jlAuditer = tb.Rows[0]["JLAuditID"].ToString();
string glgsAuditer = tb.Rows[0]["GLGSAuditID"].ToString();
var getJLInfo = BLL.Sys_UserService.GetSingtrueImageUrl(jlAuditer);
var getGLGSInfo = BLL.Sys_UserService.GetSingtrueImageUrl(glgsAuditer);
var tbNum = tb.Rows.Count;
var pageNum =
tbNum < 17 ? 1
@@ -1012,6 +1017,16 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.GetRow(rowIndex + 8).GetCell(12).SetCellValue("年 月 日");
ws.GetRow(rowIndex + 8).GetCell(18).SetCellValue("年 月 日");
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 5, 20, 10);
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 5, 20, 10);
}
#endregion
ws = ClExcelCreateRow(ws, hssfworkbook, rowIndex + 9, rowIndex + 9, style, 0, 20, false, true);
@@ -1343,20 +1358,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
}
else
{
ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 25,13,10,40);
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
}
else
{
ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1.1, 1, 25, 13,10, 40);
}
ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
//尾部行6
ws.GetRow(rowIndex + 6).GetCell(0).SetCellValue("专业工程师：");
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
+1 -1
View File
@@ -1058,7 +1058,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
BLL.ErrLogInfo.WriteLog($"未检测到发送人邮箱,请先配置邮箱地址");
return;
}
mailSubject = $"焊接日报—{emailTemplate.EailTiaoJian}"; //发送主题
mailSubject = $"焊接日报—{txtStarTime.Text.Trim()}{emailTemplate.EailTiaoJian}"; //发送主题
templateContent = emailTemplate.EmailContext;
templateContent = templateContent.Replace("{{day}}", txtStarTime.Text.Trim());