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

Compare commits

base: gaofei:264b9548b2d56cbaab77937e807c16b7327e67c8
Branches Tags
gaofei:master
..
compare: gaofei:34455c007d7ca2025aa9a3d3babc2733c48c8f5c
Branches Tags
gaofei:master

No commits in common. "264b9548b2d56cbaab77937e807c16b7327e67c8" and "34455c007d7ca2025aa9a3d3babc2733c48c8f5c" have entirely different histories.
264b9548b2 ... 34455c007d

2 changed files with 0 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -73,9 +73,6 @@
<f:RenderField Width="80px" ColumnID="Amount" DataField="Amount" FieldType="Float"
HeaderText="移入数量" HeaderTextAlign="Center" TextAlign="Center">
</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"
HeaderText="操作时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>

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

@ -53,7 +53,6 @@ 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
@ -62,7 +61,6 @@ 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<SqlParameter> listStr = new List<SqlParameter>();