gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-12-16 14:19:30 +08:00
parent 7fd2f90fce
commit 20353d1286
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

14
HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
View File

@ -495,17 +495,23 @@ namespace FineUIPro.Web.HJGL.DataIn
result += "第" + (i + 2).ToString() + "行," + "该焊接方法不存在" + "\n";
}
}
if (!string.IsNullOrEmpty(col13) && weldMat == null)
if (!string.IsNullOrEmpty(col13))
{
result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n";
if (weldMat == null)
{
result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n";
}
}
//else
//{
// result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n";
//}
if (!string.IsNullOrEmpty(col14) && weldSilk == null)
if (!string.IsNullOrEmpty(col14))
{
result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n";
if (weldSilk == null)
{
result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n";
}
}
else
{

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -67,7 +67,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="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1">
<compilation debug="true" targetFramework="4.6.1">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies>

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />