|
@@ -46,6 +46,7 @@ class StatItemController extends BaseController
|
|
|
$stat = [];
|
|
$stat = [];
|
|
|
$totalAmount = 0;
|
|
$totalAmount = 0;
|
|
|
$totalNum = 0;
|
|
$totalNum = 0;
|
|
|
|
|
+ $totalMl = 0;
|
|
|
foreach ($list as $order) {
|
|
foreach ($list as $order) {
|
|
|
$orderSn = $order['orderSn'] ?? '';
|
|
$orderSn = $order['orderSn'] ?? '';
|
|
|
$itemList = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
|
|
$itemList = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
|
|
@@ -65,6 +66,8 @@ class StatItemController extends BaseController
|
|
|
$totalNum = bcadd($totalNum, $num, 2);
|
|
$totalNum = bcadd($totalNum, $num, 2);
|
|
|
$totalAmount = bcadd($totalAmount, $currentAmount, 2);
|
|
$totalAmount = bcadd($totalAmount, $currentAmount, 2);
|
|
|
|
|
|
|
|
|
|
+ $totalMl = bcadd($totalMl, $currentGross, 2);
|
|
|
|
|
+
|
|
|
$stat[$productId]['productId'] = $productId;
|
|
$stat[$productId]['productId'] = $productId;
|
|
|
$stat[$productId]['name'] = $name;
|
|
$stat[$productId]['name'] = $name;
|
|
|
$stat[$productId]['py'] = $py;
|
|
$stat[$productId]['py'] = $py;
|
|
@@ -110,7 +113,8 @@ class StatItemController extends BaseController
|
|
|
$rank = 'mll';
|
|
$rank = 'mll';
|
|
|
}
|
|
}
|
|
|
$stat = arrayUtil::arraySort($stat, $rank);
|
|
$stat = arrayUtil::arraySort($stat, $rank);
|
|
|
- util::success(['list' => $stat, 'totalAmount' => floatval($totalAmount), 'totalNum' => floatval($totalNum),]);
|
|
|
|
|
|
|
+ util::success(['list' => $stat, 'totalAmount' => floatval($totalAmount), 'totalNum' => floatval($totalNum), 'totalMl' => $totalMl,]);
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//花材销量 ssh 20211021
|
|
//花材销量 ssh 20211021
|