fix bug: 花材统计要考虑虚拟库存与剔除删除的

app-hd/controllers/ConsoleController.php

@@ -35,11 +35,14 @@ class ConsoleController extends BaseController
 		}
 
 		// 缓存未命中时计算
-		$itemList = ItemClass::getAllByCondition(['mainId' => $this->mainId], null, 'id,stock,cost', null, true);
+		$itemList = ItemClass::getAllByCondition(['mainId' => $this->mainId], null, 'id,stock,cost,virtualStock,delStatus', null, true);
 		$totalItemNum = 0;
 		$totalCost = 0;
 		if (!empty($itemList)) {
 			foreach ($itemList as $item) {
+                if ($item->virtualStock != 0 && $item->delStatus != 0) {
+                    continue;
+                }
 				$stock = $item->stock ?? 0;
 				$cost = $item->cost ?? 0;
 				$totalItemNum = bcadd($stock, $totalItemNum, 2);

app-hd/controllers/ShopAdminController.php

@@ -4,7 +4,6 @@ namespace hd\controllers;
 
 use biz\admin\classes\AdminClass;
 use biz\shop\classes\ShopClass;
-use bizGhs\admin\services\AdminService;
 use bizGhs\shop\classes\ShopAdminClass;
 use bizHd\admin\services\AdminRoleService;
 use bizHd\admin\services\ShopAdminService;