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

1

This commit is contained in:
高飞 2025-12-23 09:28:20 +08:00
parent b6489d01f0
commit 79948bf676
3 changed files with 5 additions and 5 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"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

6
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
View File

@ -240,7 +240,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(wmeCode)) //焊接方法 if (!string.IsNullOrEmpty(wmeCode)) //焊接方法
{ {
if (wmeCode.Contains(welderQualify.WeldingMethodId)) if (welderQualify.WeldingMethodId.Contains(wmeCode))
{ {
okNum++; okNum++;
} }
@ -373,14 +373,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
var floorQ = from x in floorWelderQualifys var floorQ = from x in floorWelderQualifys
where wmeCode1.Contains(x.WeldingMethodId) where x.WeldingMethodId.Contains(wmeCode1)
&& (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin<=dia) // && (dia == null || x.SizesMin<=dia)
select x; select x;
var cellQ = from x in cellWelderQualifys var cellQ = from x in cellWelderQualifys
where wmeCode2.Contains(x.WeldingMethodId) where x.WeldingMethodId.Contains(wmeCode2)
&& (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)

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