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

111

Browse Source
This commit is contained in:
jackchenyang
2024-06-28 11:11:51 +08:00
parent 99d396981e
commit 4b5699aee3
8 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
@@ -1059,7 +1059,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());