diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs index 8d6570e..f5627b9 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs @@ -73,7 +73,7 @@ namespace FineUIPro.Web.WeldMat.Stock LEFT JOIN dbo.Sys_User AS Users ON Users.UserId=StockIn.Materialman LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = store.UnitId - WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0))>0 "; + WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0 "; List listStr = new List(); if (!cbShowAll.Checked) {