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

1

This commit is contained in:
高飞 2026-01-30 17:13:04 +08:00
parent 37eaf51569
commit 7189a15d65
5 changed files with 30 additions and 3 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 />

9
HJGL_DS/FineUIPro.Web/Global.asax.cs
View File

@ -628,6 +628,11 @@
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else else
{ {
if (queProject[1].Trim().Contains("Ni")) if (queProject[1].Trim().Contains("Ni"))
@ -700,6 +705,10 @@
{ {
location = "2FG,4FG"; location = "2FG,4FG";
} }
else if (queProject[1].Contains("5G"))
{
location = "1G,3G,4G,5G";
}
else else
{ {
location = queProject[2].Trim(); location = queProject[2].Trim();

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

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

18
HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
View File

@ -529,6 +529,11 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else else
{ {
if (queProject[1].Trim().Contains("Ni")) if (queProject[1].Trim().Contains("Ni"))
@ -591,6 +596,10 @@ namespace FineUIPro.Web.Welder
{ {
location = "2FG,4FG"; location = "2FG,4FG";
} }
else if (queProject[1].Contains("5G"))
{
location = "1G,3G,4G,5G";
}
else else
{ {
location = queProject[2]; location = queProject[2];
@ -838,6 +847,11 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else else
{ {
if (queProject[1].Trim().Contains("Ni")) if (queProject[1].Trim().Contains("Ni"))
@ -900,6 +914,10 @@ namespace FineUIPro.Web.Welder
{ {
location = "2FG,4FG"; location = "2FG,4FG";
} }
else if (queProject[1].Contains("5G"))
{
location = "1G,3G,4G,5G";
}
else else
{ {
location = queProject[2]; location = queProject[2];

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />