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

提交代码

This commit is contained in:
高飞 2025-04-19 16:19:13 +08:00
parent 96eb7fa070
commit f2291317a7
6 changed files with 6 additions and 6 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>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

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

@ -527,7 +527,7 @@ namespace FineUIPro.Web.HJGL.DataIn
decimal? sch = Funs.GetNewDecimal(joint.JOT_Sch); decimal? sch = Funs.GetNewDecimal(joint.JOT_Sch);
string wmeCode = weldMethod.WME_Code; string wmeCode = weldMethod.WME_Code;
string[] wmeCodes = wmeCode.Split('/'); string[] wmeCodes = wmeCode.Split('+');
string location = locationItem.Value; string location = locationItem.Value;
string ste = joint.STE_ID; string ste = joint.STE_ID;

2
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -359,7 +359,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
wmeCode = wm.WME_Code; wmeCode = wm.WME_Code;
} }
string[] wmeCodes = wmeCode.Split('/'); string[] wmeCodes = wmeCode.Split('+');
string location = item.JOT_Location; string location = item.JOT_Location;
string ste = jot.STE_ID; string ste = jot.STE_ID;

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

@ -50,7 +50,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="false" targetFramework="4.6.1"> <compilation debug="true" 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>

2
HJGL_DS/WebAPI/Controllers/JointInfoController.cs
View File

@ -148,7 +148,7 @@ namespace WebAPI.Controllers
decimal? sch = Funs.GetNewDecimal(joint.JOT_Sch); decimal? sch = Funs.GetNewDecimal(joint.JOT_Sch);
string wmeCode = weldMethod.WME_Code; string wmeCode = weldMethod.WME_Code;
string[] wmeCodes = wmeCode.Split('/'); string[] wmeCodes = wmeCode.Split('+');
string location = locationItem.Value; string location = locationItem.Value;
string ste = joint.STE_ID; string ste = joint.STE_ID;

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>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />