diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index a6b1c54..8aa7c11 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,8 +1,8 @@
-<?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">
   <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 f85cb83..3ea3adc 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -68,7 +68,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/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
index 06b6a30..83ae35c 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
@@ -65,8 +65,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
 									 (CASE WHEN UsingPlan.InPutMan IS NOT NULL THEN (CASE WHEN userInput.UserName IS NOT NULL THEN userInput.UserName ELSE welderInput.WED_Name END)
 									           ELSE '' END) AS InPutMan,
 									 --man.UserName AS InPutMan,
-                                     ((SELECT ISNULL(SUM(ISNULL(us.Amount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId)-
-                                     (SELECT ISNULL(SUM(ISNULL(re.RecycleAmount,0)),0) FROM dbo.Weld_RecycleMat re WHERE re.UsingPlanId=UsingPlan.UsingPlanId))
+                                     ((SELECT ISNULL(SUM(ISNULL(us.Amount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId)+
+                                     (SELECT ISNULL(SUM(ISNULL(us.TwoAmount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId))
                                      AS UsedAmount,(CASE UsingPlan.IsFinish WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE NULL END) AS IsFinish
                               FROM dbo.Weld_UsingPlan AS UsingPlan
                                    LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs
index 2b24571..72d32f2 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs
@@ -11,7 +11,7 @@ using System.Web.UI;
 
 namespace FineUIPro.Web.WeldMat.UsingSentMat
 {
-    public partial class FaceRecognition : Page
+    public partial class FaceRecognition : PageBase
     {
         protected void Page_Load(object sender, EventArgs e)
         { 
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index ef14066..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"?>
+<?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 />