diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 1963de0..e47cfd0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj index 9aaa6e5..b031343 100644 --- a/HJGL/BLL/BLL.csproj +++ b/HJGL/BLL/BLL.csproj @@ -45,6 +45,9 @@ ..\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll + + ..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll + ..\FineUIPro.Web\bin\EmitMapper.dll @@ -58,6 +61,9 @@ False ..\Lib\Microsoft.SQLServer.ManagedDTS.dll + + ..\packages\MimeKit.4.6.0\lib\net48\MimeKit.dll + ..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll @@ -74,12 +80,36 @@ ..\packages\NPOI.2.5.3\lib\net45\NPOI.OpenXmlFormats.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Formats.Asn1.8.0.0\lib\net462\System.Formats.Asn1.dll + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + diff --git a/HJGL/BLL/Common/SysManage/Sys_UserService.cs b/HJGL/BLL/Common/SysManage/Sys_UserService.cs index 1ec5a8f..2c26e64 100644 --- a/HJGL/BLL/Common/SysManage/Sys_UserService.cs +++ b/HJGL/BLL/Common/SysManage/Sys_UserService.cs @@ -19,13 +19,15 @@ namespace BLL { var result = (from a in Funs.DB.Sys_User join - b in Funs.DB.Base_Unit on a.UnitId equals b.UnitId - join c in Funs.DB.Base_UnitType on b.UnitTypeId equals c.UnitTypeId + b in Funs.DB.Base_Unit on a.UnitId equals b.UnitId + into bb from bu in bb.DefaultIfEmpty() + join c in Funs.DB.Base_UnitType on bu.UnitTypeId equals c.UnitTypeId + into dd from ss in dd.DefaultIfEmpty() where a.UserId == userId select new { a.SigntrueImage, - c.UnitTypeName + ss.UnitTypeName }).FirstOrDefault(); if (result != null) diff --git a/HJGL/BLL/app.config b/HJGL/BLL/app.config index c764f53..f5e1eae 100644 --- a/HJGL/BLL/app.config +++ b/HJGL/BLL/app.config @@ -1,11 +1,15 @@ - + - - + + + + + + - + diff --git a/HJGL/BLL/packages.config b/HJGL/BLL/packages.config index 489eb34..56eac9d 100644 --- a/HJGL/BLL/packages.config +++ b/HJGL/BLL/packages.config @@ -1,7 +1,16 @@  + + + + + + + + + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/File/Image/18a5e9ba-83a6-4039-aed7-ed6cad7244f1.png b/HJGL/FineUIPro.Web/File/Image/18a5e9ba-83a6-4039-aed7-ed6cad7244f1.png new file mode 100644 index 0000000..a588f07 Binary files /dev/null and b/HJGL/FineUIPro.Web/File/Image/18a5e9ba-83a6-4039-aed7-ed6cad7244f1.png differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 9f303df..0899ec1 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -61,6 +61,9 @@ ..\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll + + ..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll + ..\FineUIPro\FineUIPro.dll @@ -90,6 +93,9 @@ ..\packages\Microsoft.SqlServer.Types.14.0.1016.290\lib\net40\Microsoft.SqlServer.Types.dll + + ..\packages\MimeKit.4.6.0\lib\net48\MimeKit.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -105,11 +111,35 @@ ..\packages\NPOI.2.5.3\lib\net45\NPOI.OpenXmlFormats.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Formats.Asn1.8.0.0\lib\net462\System.Formats.Asn1.dll + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 0baedd9..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ProjectFiles - Release|Any CPU + Debug|Any CPU true diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index 23f0894..f802d4f 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + @@ -51,7 +51,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs index 49e3a63..72cfead 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs @@ -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"); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs index 7d2a107..47a3bd7 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs @@ -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 { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs index 61f4190..ffdfa34 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs @@ -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("专业工程师："); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index 4ce1df2..9658ba8 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -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()); diff --git a/HJGL/FineUIPro.Web/packages.config b/HJGL/FineUIPro.Web/packages.config index f61d02d..2f3dd60 100644 --- a/HJGL/FineUIPro.Web/packages.config +++ b/HJGL/FineUIPro.Web/packages.config @@ -1,9 +1,18 @@  + + + + + + + + + \ No newline at end of file diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 33091aa..6db81e9 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile