diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index bf54086..8aa7c11 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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index ede14f6..bf404b8 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -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="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Recycle/RecycleMatEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Recycle/RecycleMatEdit.aspx.cs
index 3a21757..b60181e 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Recycle/RecycleMatEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Recycle/RecycleMatEdit.aspx.cs
@@ -87,9 +87,9 @@ namespace FineUIPro.Web.WeldMat.Recycle
                 if (type.WeldTypeName == "焊条")
                 {
                     this.txtRecycleTopAmount.Hidden = false;
-                    decimal oneNum= mat.Amount != null ? mat.Amount.Value : 0;
+                    decimal oneNum = mat.Amount != null ? mat.Amount.Value : 0;
                     decimal twoNum = mat.TwoAmount != null ? mat.TwoAmount.Value : 0;
-                    this.txtRecycleTopAmount.Text = (oneNum+twoNum).ToString();
+                    this.txtRecycleTopAmount.Text = (oneNum + twoNum).ToString();
                 }
                 else
                 {
@@ -107,7 +107,7 @@ namespace FineUIPro.Web.WeldMat.Recycle
         {
             string usingMatId = Request.Params["usingMatId"];
             string isOnTime = Request.Params["isOnTime"];  // 是否准时 0-否
-            
+
             var mat = BLL.UsingMatService.GetUsingMatById(usingMatId);
             var recycleMat = BLL.RecycleMatService.GetRecycleMatByUsingMatId(usingMatId);
             if (this.txtRecycleAmount.Text == string.Empty)
@@ -137,7 +137,7 @@ namespace FineUIPro.Web.WeldMat.Recycle
             newRecycleMat.IsStoreManConfirm = true;
             newRecycleMat.IsWelderConfirm = true;
 
-            if (newRecycleMat.RecycleAmount > mat.Amount)
+            if (newRecycleMat.RecycleAmount > (mat.Amount + (mat.TwoAmount ?? 0)))
             {
                 ShowNotify("退回数量不能大于领用数量！");
                 return;
diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 17a9a86..5450e39 100644
--- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -79,13 +79,13 @@
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>03/12/2025 10:55:18</publishTime>
+      <publishTime>04/19/2025 16:21:52</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>07/03/2024 11:01:05</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>03/12/2025 10:55:18</publishTime>
+      <publishTime>04/19/2025 16:21:52</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/17/2020 21:32:28</publishTime>
@@ -115,10 +115,10 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>03/12/2025 10:55:15</publishTime>
+      <publishTime>04/19/2025 16:21:52</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>03/12/2025 10:55:15</publishTime>
+      <publishTime>04/19/2025 16:21:52</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>02/18/2018 09:44:54</publishTime>
@@ -316,10 +316,10 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>03/12/2025 10:55:21</publishTime>
+      <publishTime>04/19/2025 16:21:53</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>03/12/2025 10:55:21</publishTime>
+      <publishTime>04/19/2025 16:21:53</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -445,7 +445,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>03/12/2025 10:55:47</publishTime>
+      <publishTime>04/19/2025 16:22:01</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index a48b337..28be9c4 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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />