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

20260609 日报焊条更新

Browse Source
This commit is contained in:
毕文静
2026-06-09 17:50:38 +08:00
parent 6235fe8f3c
commit 689707bfd1
4 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
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 />
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+13 -12
View File
@@ -1,11 +1,12 @@
using System; using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq; using System.Linq;
using System.Web.UI; using System.Web.UI;
using BLL;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.HJGL.WeldingManage namespace FineUIPro.Web.HJGL.WeldingManage
{ {
@@ -349,13 +350,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
string status = mergedRow.Value<string>("status"); string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values"); JObject values = mergedRow.Value<JObject>("values");
//var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault(); var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊条") && x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
//if (weldMat == null) if (weldMat == null)
//{ {
// ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning); ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
// return; return;
//} }
var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault(); var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊丝") && x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
if (weldSilk == null) if (weldSilk == null)
{ {
ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning); ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
@@ -1256,7 +1257,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
// item.JOT_WeldMat = null; // item.JOT_WeldMat = null;
// item.WeldMatCode = null; // item.WeldMatCode = null;
//} //}
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault(); var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊条") && x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
if (weldMat != null) if (weldMat != null)
{ {
item.JOT_WeldMat = weldMat.WeldId; item.JOT_WeldMat = weldMat.WeldId;
@@ -1279,7 +1280,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
// item.JOT_WeldSilk = null; // item.JOT_WeldSilk = null;
// item.WeldSilkCode = null; // item.WeldSilkCode = null;
//} //}
var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault(); var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊丝") && x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
if (weldSilk != null) if (weldSilk != null)
{ {
item.JOT_WeldSilk = weldSilk.WeldId; item.JOT_WeldSilk = weldSilk.WeldId;
HJGL_DS/FineUIPro.Web/Web.config
+2 -2
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0"?>
<!-- <!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问 有关如何配置 ASP.NET 应用程序的详细消息，请访问
@@ -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="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>
HJGL_DS/WebAPI/WebAPI.csproj.user
+1 -1
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 />