不包含调拨

app-ghs/controllers/ConsoleController.php

@@ -129,6 +129,9 @@ class ConsoleController extends BaseController
         $todaySale = 0;
         if (!empty($incomeList)) {
             foreach ($incomeList as $item) {
+                if (isset($item['id']) && $item['id'] == 'allot') {
+                    continue;
+                }
                 $todaySale = bcadd($todaySale, $item['amount'], 2);
             }
         }
@@ -160,9 +163,18 @@ class ConsoleController extends BaseController
             ["name" => "库存预警", "img" => "ghs/home/kcyjs.png", "url" => "/admin/item/list?warning=1"],
         ];
 
-        util::success(['asset' => $this->main, 'notice' => $notice,
-            'todayData' => ['income' => $todaySale, 'order' => $orderNum, 'expend' => $todayOut, 'visitCustom' => $visitCustom, 'wastage' => $wastage],
-            'menu' => $menu,]);
+        util::success([
+            'asset' => $this->main,
+            'notice' => $notice,
+            'todayData' => [
+                'income' => $todaySale,
+                'order' => $orderNum,
+                'expend' => $todayOut,
+                'visitCustom' => $visitCustom,
+                'wastage' => $wastage
+            ],
+            'menu' => $menu
+        ]);
     }
 
     //常用初始化

biz-ghs/stat/classes/StatSaleClass.php

@@ -131,17 +131,17 @@ class StatSaleClass extends BaseClass
         }
 
         $income = [
-            ['name' => '批发', 'amount' => floatval($pfIncome)],
-            ['name' => '零售', 'amount' => floatval($lsIncome)],
-            ['name' => '调拨出库', 'amount' => floatval($stockOut)],
+            ['name' => '批发', 'id' => 'pf', 'amount' => floatval($pfIncome)],
+            ['name' => '零售', 'id' => 'ls', 'amount' => floatval($lsIncome)],
+            ['name' => '调拨出库', 'id' => 'allot', 'amount' => floatval($stockOut)],
         ];
         $expend = [
-            ['name' => '批发运费', 'amount' => floatval($pfSendCost)],
-            ['name' => '零售运费', 'amount' => floatval($lsSendCost)],
-            ['name' => '美团手续费', 'amount' => floatval($lsServiceFee)],
-            ['name' => '采购', 'amount' => floatval($cg)],
-            ['name' => '调拨入库', 'amount' => floatval($stockIn)],
-            ['name' => '员工工资', 'amount' => floatval($salary)],
+            ['name' => '批发运费', 'id' => 'pfSendCost', 'amount' => floatval($pfSendCost)],
+            ['name' => '零售运费', 'id' => 'lsSendCost', 'amount' => floatval($lsSendCost)],
+            ['name' => '美团手续费', 'id' => 'mtFee', 'amount' => floatval($lsServiceFee)],
+            ['name' => '采购', 'id' => 'cg', 'amount' => floatval($cg)],
+            ['name' => '调拨入库', 'id' => 'allot', 'amount' => floatval($stockIn)],
+            ['name' => '员工工资', 'id'=>'salary', 'amount' => floatval($salary)],
         ];
         if (!empty($expendAmount)) {
             foreach ($expendAmount as $it) {