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

1

This commit is contained in:
高飞 2025-12-06 16:11:56 +08:00
parent 21e4bfb9bd
commit 48d9299f1b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx
View File

@ -73,6 +73,9 @@
<f:RenderField Width="80px" ColumnID="Amount" DataField="Amount" FieldType="Float" <f:RenderField Width="80px" ColumnID="Amount" DataField="Amount" FieldType="Float"
HeaderText="移入数量" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="移入数量" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="90px" ColumnID="MoveInMan" DataField="MoveInMan" FieldType="String"
HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MoveInDate" DataField="MoveInDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" <f:RenderField Width="150px" ColumnID="MoveInDate" DataField="MoveInDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"
HeaderText="操作时间" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="操作时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>

2
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs
View File

@ -53,6 +53,7 @@ namespace FineUIPro.Web.WeldMat.Stock
WeldType.WeldTypeName, WeldType.WeldTypeName,
(unit2.UnitName+'('+unitStoreMoveIn.UnitStoreName+')') as UnitStoreMoveInName, (unit2.UnitName+'('+unitStoreMoveIn.UnitStoreName+')') as UnitStoreMoveInName,
StockIn.Amount, StockIn.Amount,
us.UserName as MoveInMan,
StockIn.MoveInDate StockIn.MoveInDate
from Weld_StockIn as stockIn from Weld_StockIn as stockIn
left join Weld_UnitStore as unitStore on unitStore.UnitStoreId=stockIn.MoveInStoreId left join Weld_UnitStore as unitStore on unitStore.UnitStoreId=stockIn.MoveInStoreId
@ -61,6 +62,7 @@ namespace FineUIPro.Web.WeldMat.Stock
LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId
left join Weld_UnitStore as unitStoreMoveIn on unitStoreMoveIn.UnitStoreId=stockIn.UnitStoreId left join Weld_UnitStore as unitStoreMoveIn on unitStoreMoveIn.UnitStoreId=stockIn.UnitStoreId
left join Base_Unit as unit2 on unit2.UnitId = unitStoreMoveIn.UnitId left join Base_Unit as unit2 on unit2.UnitId = unitStoreMoveIn.UnitId
left join Sys_User as us on us.UserId=stockIn.MoveInManId
where stockIn.Flag='1' where stockIn.Flag='1'
and MoveInStoreId is not null "; and MoveInStoreId is not null ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();