diff --git a/app/admin/lists/statistics/StoreProductLists.php b/app/admin/lists/statistics/StoreProductLists.php index d80652d02..af5b65560 100644 --- a/app/admin/lists/statistics/StoreProductLists.php +++ b/app/admin/lists/statistics/StoreProductLists.php @@ -92,6 +92,11 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa ->each(function ($item) { // 计算总库存 $unit_name=StoreProductUnit::where('id',$item->unit)->value('name'); + if($item->total_stock){ + $item->total_stock=bcadd($item->total_stock??0,$item->warehouse_stock??0,2).'|'.$unit_name; + }else{ + $item->total_stock=''; + } $item->sales=$item->sales.'|'.$unit_name; $item->store_stock=$item->store_stock.'|'.$unit_name; $item->warehouse_stock=$item->warehouse_stock.'|'.$unit_name; @@ -115,11 +120,6 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa }else{ $item->total_price='0元'; } - if($item->total_stock){ - $item->total_stock=bcadd($item->total_stock,$item->warehouse_stock,2).'|'.$unit_name; - }else{ - $item->total_stock=''; - } }) ->toArray(); return $list;