From 6b0d5e3edb88e02bdb86717e04018079c2470c8f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 11 Sep 2024 17:10:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=E4=BB=A5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=80=BB=E9=87=8F=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/statistics/StoreProductLists.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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;