From 50f8324bfca02058c42aaada697cf8bdb6917905 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sat, 23 Aug 2025 15:20:30 +0800
Subject: [PATCH] 1

---
 .../FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx    | 3 +++
 .../FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
index 76e31e5..35813ae 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
@@ -73,6 +73,9 @@
                     <f:RenderField Width="150px" ColumnID="RecycleDate" DataField="RecycleDate" FieldType="String"
                          HeaderText="退回时间" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
+                    <f:RenderField Width="100px" ColumnID="RecycleAmount" DataField="RecycleAmount" FieldType="Float"
+                        HeaderText="退回焊材" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
                     <f:RenderField Width="120px" ColumnID="ReturnMatTop" DataField="ReturnMatTop" FieldType="Float"
                         HeaderText="退回焊条头" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
index c4e6887..f1607fe 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition, 
                                      UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount, 
                                      ISNULL(UsingMat.TwoAmount,0) AS TwoAmount,UsingMat.UsingMan, UsingMat.UsingDate,
-                                     CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime,RecycleMat.RecycleDate,RecycleMat.ReturnMatTop,
+                                     CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime,RecycleMat.RecycleDate,RecycleMat.ReturnMatTop,RecycleMat.RecycleAmount,
 									 (CASE WHEN stockIn.Warrantybook IS NOT NULL THEN stockIn.Warrantybook
 									      ELSE UsingMat.Warrantybook END) AS Warrantybook,UsingPlan.STE_Name,
                                      UsingMat.Number,Project.ProjectCode,Project.ProjectName,WeldInfo.WeldCode,