From 689707bfd169db9b0231a1193396c7557c5bf306 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 9 Jun 2026 17:50:38 +0800
Subject: [PATCH] =?UTF-8?q?20260609=20=E6=97=A5=E6=8A=A5=E7=84=8A=E6=9D=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FineUIPro.Web/FineUIPro.Web.csproj.user   |   2 +-
 .../HJGL/WeldingManage/WeldReportEdit.aspx.cs |  25 ++--
 HJGL_DS/FineUIPro.Web/Web.config              | 134 +++++++++---------
 HJGL_DS/WebAPI/WebAPI.csproj.user             |   2 +-
 4 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index e3436b8..6e29203 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -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 />
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index 4fbb4a5..57adb0b 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -1,11 +1,12 @@
-using System;
+using BLL;
+using Model;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Web.UI;
-using BLL;
-using Newtonsoft.Json.Linq;
 
 namespace FineUIPro.Web.HJGL.WeldingManage
 {
@@ -349,13 +350,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 string status = mergedRow.Value<string>("status");
                 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();
-                //if (weldMat == null)
-                //{
-                //    ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
-                //    return;
-                //}
-                var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") 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)
+                {
+                    ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
+                    return;
+                }
+                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)
                 {
                     ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
@@ -1256,7 +1257,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     //    item.JOT_WeldMat = 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)
                     {
                         item.JOT_WeldMat = weldMat.WeldId;
@@ -1279,7 +1280,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     //    item.JOT_WeldSilk = 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)
                     {
                         item.JOT_WeldSilk = weldSilk.WeldId;
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index bf11678..557f12f 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细消息，请访问
 
@@ -6,39 +6,39 @@
   -->
 <configuration>
   <configSections>
-    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
+    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
-  <FineUIPro DebugMode="false" Theme="Cupertino" />
+  <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <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=.\SQL2022;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="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
-    <add key="aspnet:MaxHttpCollectionKeys" value="50000" />
-    <add key="HJGLUrl" value="http://localhost:61590/" />
-    <add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001" />
-    <add key="ADomainUrl" value="10.151.130.1" />
-    <add key="APPUrl" value="https://www.pgyer.com/pWSd" />
+    <add key="SystemName" value="诺必达焊接管理系统"/>
+    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
+    <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
+    <add key="HJGLUrl" value="http://localhost:61590/"/>
+    <add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001"/>
+    <add key="ADomainUrl" value="10.151.130.1"/>
+    <add key="APPUrl" value="https://www.pgyer.com/pWSd"/>
     <!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
-    <add key="SystemCode" value="HJCLGL" />
-    <add key="http" value="http://localhost/test/" />
+    <add key="SystemCode" value="HJCLGL"/>
+    <add key="http" value="http://localhost/test/"/>
     <!--BAIDU AI配置-->
-    <add key="APP_ID" value="119624563" />
-    <add key="API_KEY" value="qm0iFO9OTHqx5dt5dNIKuvIE" />
-    <add key="SECRET_KEY" value="NwA68AnLM9SwEcbB2ONCu6cagy2czzVc" />
+    <add key="APP_ID" value="119624563"/>
+    <add key="API_KEY" value="qm0iFO9OTHqx5dt5dNIKuvIE"/>
+    <add key="SECRET_KEY" value="NwA68AnLM9SwEcbB2ONCu6cagy2czzVc"/>
     <!--人脸检测参数-->
     <!--人脸活体检测参数1最好，0最差 建议0.995 -->
-    <add key="BD_face_liveness" value="0.3" />
+    <add key="BD_face_liveness" value="0.3"/>
     <!--人脸高宽建议100-200-->
     <!--<add key="BD_width" value="200" />-->
     <!--<add key="BD_height" value="200" />-->
     <!--人脸角度-->
-    <add key="BD_roll" value="40" />
+    <add key="BD_roll" value="40"/>
     <!--人脸遮档度0最好，1最不好-->
-    <add key="BD_occlusion" value="1" />
+    <add key="BD_occlusion" value="1"/>
     <!--人脸模糊度0最好，1最不好-->
-    <add key="BD_blur" value="0.1" />
+    <add key="BD_blur" value="0.1"/>
   </appSettings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -50,113 +50,113 @@
   -->
   <system.web>
     <!--  会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
-    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200" />
+    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
     <!--<processModel enable="true" requestQueueLimit="100000"/>-->
     <pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
       <controls>
-        <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro" />
-        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/>
+        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
       </controls>
     </pages>
     <httpModules>
-      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
     </httpModules>
     <httpHandlers>
-      <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" 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 verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" 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"/>
     </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" />
+        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>
     </compilation>
-    <httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000" />
+    <httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000"/>
     <authentication mode="Forms">
-      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/" />
+      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
     </authentication>
     <membership>
       <providers>
-        <clear />
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
+        <clear/>
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
       </providers>
     </membership>
     <profile>
       <providers>
-        <clear />
-        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
+        <clear/>
+        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
       </providers>
     </profile>
     <roleManager enabled="false">
       <providers>
-        <clear />
-        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
-        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
+        <clear/>
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
+        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
       </providers>
     </roleManager>
-    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx" />
+    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
     <webServices>
       <protocols>
-        <add name="HttpSoap" />
-        <add name="HttpPost" />
-        <add name="HttpGet" />
-        <add name="Documentation" />
+        <add name="HttpSoap"/>
+        <add name="HttpPost"/>
+        <add name="HttpGet"/>
+        <add name="Documentation"/>
       </protocols>
     </webServices>
   </system.web>
-  <location path="res.axd" />
+  <location path="res.axd"/>
   <system.webServer>
     <staticContent>
-      <mimeMap fileExtension=".mjs" mimeType="application/javascript" />
-      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
-      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
+      <mimeMap fileExtension=".mjs" mimeType="application/javascript"/>
+      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
+      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
     </staticContent>
-    <validation validateIntegratedModeConfiguration="false" />
+    <validation validateIntegratedModeConfiguration="false"/>
     <modules runAllManagedModulesForAllRequests="true">
-      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
-      <remove name="ScriptModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
+      <remove name="ScriptModule"/>
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
     </modules>
     <handlers>
-      <remove name="ChartImageHandler" />
-      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" />
-      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <add name="FastReportHandler" path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport" />
+      <remove name="ChartImageHandler"/>
+      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
+      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+      <add name="FastReportHandler" path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </handlers>
     <defaultDocument>
       <files>
-        <add value="Login.aspx" />
+        <add value="Login.aspx"/>
       </files>
     </defaultDocument>
     <security>
       <requestFiltering>
-        <requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647" />
+        <requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647"/>
       </requestFiltering>
     </security>
   </system.webServer>
   <!-- SERVER -->
   <system.serviceModel>
-    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
+    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
     <services>
       <service name="BLL.OpenService.HSSEService" behaviorConfiguration="HSSEServiceBehavior">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService" />
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
       </service>
     </services>
     <behaviors>
       <serviceBehaviors>
         <behavior name="HSSEServiceBehavior">
-          <serviceMetadata httpGetEnabled="true" />
-          <serviceDebug includeExceptionDetailInFaults="false" />
-          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" />
+          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
         </behavior>
       </serviceBehaviors>
     </behaviors>
     <bindings>
       <wsHttpBinding>
         <binding name="HSSEServiceBinding" maxReceivedMessageSize="2147483647" useDefaultWebProxy="false" maxBufferPoolSize="2147483647" closeTimeout="20:00:00" openTimeout="00:01:10" receiveTimeout="20:00:00" sendTimeout="20:00:00">
-          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647" />
-          <security mode="None" />
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647"/>
+          <security mode="None"/>
         </binding>
       </wsHttpBinding>
     </bindings>
@@ -164,8 +164,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 8cd7f1f..ef14066 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -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 />