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

1

This commit is contained in:
高飞 2025-07-15 15:17:08 +08:00
parent c60217f8cd
commit 3ca4e2349b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,12 @@
<f:RenderField Width="150px" ColumnID="UsingDate" DataField="UsingDate" FieldType="String" <f:RenderField Width="150px" ColumnID="UsingDate" DataField="UsingDate" FieldType="String"
HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </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" <f:RenderField Width="90px" ColumnID="WelderCode" DataField="WelderCode" FieldType="String"
HeaderText="焊工号" HeaderTextAlign="Center" TextAlign="Center" SortField="WelderCode"> HeaderText="焊工号" HeaderTextAlign="Center" TextAlign="Center" SortField="WelderCode">
</f:RenderField> </f:RenderField>

7
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, string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition,
UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount, UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount,
ISNULL(UsingMat.TwoAmount,0) AS TwoAmount,UsingMat.UsingMan, UsingMat.UsingDate, 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 (CASE WHEN stockIn.Warrantybook IS NOT NULL THEN stockIn.Warrantybook
ELSE UsingMat.Warrantybook END) AS Warrantybook,UsingPlan.STE_Name, ELSE UsingMat.Warrantybook END) AS Warrantybook,UsingPlan.STE_Name,
UsingMat.Number,Project.ProjectCode,Project.ProjectName,WeldInfo.WeldCode, 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.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.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.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 LEFT JOIN dbo.Weld_UnitStore unitStore ON unitStore.UnitStoreId = stockIn.UnitStoreId
WHERE 1=1"; WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
@ -341,7 +342,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
BindGrid(); BindGrid();
foreach (GridColumn column in grid.Columns) foreach (GridColumn column in grid.Columns)
{ {
if (column.ColumnIndex < 20) if (column.ColumnIndex < 22)
{ {
sb.AppendFormat("<td>{0}</td>", column.HeaderText); sb.AppendFormat("<td>{0}</td>", column.HeaderText);
} }
@ -353,7 +354,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
sb.Append("<tr>"); sb.Append("<tr>");
foreach (GridColumn column in grid.Columns) foreach (GridColumn column in grid.Columns)
{ {
if (column.ColumnIndex < 20) if (column.ColumnIndex < 22)
{ {
string html = row.Values[column.ColumnIndex].ToString(); string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber") if (column.ColumnID == "tfNumber")