diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx index 6f8a5d3..b64ddf4 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx @@ -73,6 +73,9 @@ + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs index 053b737..7d6d40f 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs @@ -53,6 +53,7 @@ namespace FineUIPro.Web.WeldMat.Stock WeldType.WeldTypeName, (unit2.UnitName+'('+unitStoreMoveIn.UnitStoreName+')') as UnitStoreMoveInName, StockIn.Amount, + us.UserName as MoveInMan, StockIn.MoveInDate from Weld_StockIn as stockIn 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 Weld_UnitStore as unitStoreMoveIn on unitStoreMoveIn.UnitStoreId=stockIn.UnitStoreId 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' and MoveInStoreId is not null "; List listStr = new List();