shish 8 mesi fa
parent
commit
08df7d02f8

+ 3 - 1
app-ghs/controllers/StatController.php

@@ -141,8 +141,10 @@ class StatController extends BaseController
         $wastageRespond = StatSaleClass::wastage($mainId);
         $wastagePrice = $wastageRespond['totalPrice'] ?? 0;
         $wastagePrice = floatval($wastagePrice);
+        $wastageCost = $wastageRespond['totalCost'] ?? 0;
+        $wastageCost = floatval($wastageCost);
 
-        util::success(['income' => $income, 'expend' => $expend, 'balance' => floatval($balance), 'wastagePrice' => $wastagePrice, 'payCodeIncome' => $payCodeIncome]);
+        util::success(['income' => $income, 'expend' => $expend, 'balance' => floatval($balance), 'wastagePrice' => $wastagePrice,'wastageCost'=>$wastageCost, 'payCodeIncome' => $payCodeIncome]);
     }
 
     //按月统计损耗情况

+ 4 - 1
biz-ghs/stat/classes/StatSaleClass.php

@@ -51,14 +51,17 @@ class StatSaleClass extends BaseClass
         $where['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
         $list = StockWastageOrderClass::getAllByCondition($where, null, '*');
         $totalPrice = 0;
+        $totalCost = 0;
         if (!empty($list)) {
             foreach ($list as $order) {
                 $price = $order['price'] ?? 0;
                 $totalPrice = bcadd($totalPrice, $price, 2);
+                $cost = $order['cost'] ?? 0;
+                $totalCost = bcadd($totalCost, $cost, 2);
             }
         }
         $totalPrice = floatval($totalPrice);
-        return ['totalPrice' => $totalPrice];
+        return ['totalPrice' => $totalPrice, 'totalCost' => $totalCost];
     }
 
     //结账跟踪 ssh 20230503