From 3ca4e2349b7f12be2396f9a520b989630adc8f63 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 15 Jul 2025 15:17:08 +0800
Subject: [PATCH] 1

---
 .../WeldMat/UsingSentMat/UsingtMatSelect.aspx              | 6 ++++++
 .../WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs           | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
index a56700c..5330bbc 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
@@ -70,6 +70,12 @@
                     <f:RenderField Width="150px" ColumnID="UsingDate" DataField="UsingDate" FieldType="String"
                          HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="RecycleDate" DataField="RecycleDate" FieldType="String"
+                         HeaderText="退回时间" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="ReturnMatTop" DataField="ReturnMatTop" FieldType="Float"
+                        HeaderText="退回焊条头" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
                     <f:RenderField Width="90px" ColumnID="WelderCode" DataField="WelderCode" FieldType="String"
                         HeaderText="焊工号" HeaderTextAlign="Center" TextAlign="Center" SortField="WelderCode">
                     </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 64deb1b..c4e6887 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,
+                                     CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime,RecycleMat.RecycleDate,RecycleMat.ReturnMatTop,
 									 (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,
@@ -56,6 +56,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
 							   LEFT JOIN dbo.Sys_User AS userInput ON userInput.UserId=UsingPlan.InPutMan
 							   LEFT JOIN dbo.HJGL_BS_Welder AS welderInput ON welderInput.WED_ID=UsingPlan.InPutMan
 							   LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=UsingPlan.UsingUnit
+                               LEFT JOIN dbo.Weld_RecycleMat RecycleMat ON RecycleMat.UsingMatId=UsingMat.UsingMatId
 							   LEFT JOIN dbo.Weld_UnitStore unitStore ON unitStore.UnitStoreId = stockIn.UnitStoreId
                                WHERE 1=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
@@ -341,7 +342,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             BindGrid();
             foreach (GridColumn column in grid.Columns)
             {
-                if (column.ColumnIndex < 20)
+                if (column.ColumnIndex < 22)
                 {
                     sb.AppendFormat("<td>{0}</td>", column.HeaderText);
                 }
@@ -353,7 +354,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                 sb.Append("<tr>");
                 foreach (GridColumn column in grid.Columns)
                 {
-                    if (column.ColumnIndex < 20)
+                    if (column.ColumnIndex < 22)
                     {
                         string html = row.Values[column.ColumnIndex].ToString();
                         if (column.ColumnID == "tfNumber")