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

111

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

8
HJGL/BLL/Common/SysManage/Sys_UserService.cs
View File

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

BIN
HJGL/FineUIPro.Web/File/Image/18a5e9ba-83a6-4039-aed7-ed6cad7244f1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

4
HJGL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>
@ -51,7 +51,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.8">
<compilation debug="true" targetFramework="4.8">
<assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>

4
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
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
{

30
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
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("专业工程师：");

2
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
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());

2
HJGL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>