gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-08-23 15:20:30 +08:00
parent 912eb5401f
commit 50f8324bfc
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
View File

@ -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>

2
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
View File

@ -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,