数量

app-hd/controllers/StatKindController.php

@@ -19,6 +19,7 @@ use common\components\util;
 class StatKindController extends BaseController
 {
 
+    //包花数量统计 ssh 20230320
     public function actionStatMake()
     {
         $get = Yii::$app->request->get();
@@ -36,13 +37,9 @@ class StatKindController extends BaseController
 
         $mainId = $this->mainId;
 
-        $kindList = KindClass::getAllByCondition(['mainId' => $mainId, 'flower' => 1], null, '*', 'id');
-
-        $staffList = StaffClass::getAllByCondition(['mainId' => $mainId, 'flower' => 1], null, '*', 'id');
-
-        $kindStat = [];
+        $staffList = StaffClass::getAllByCondition(['mainId' => $mainId], null, '*', 'id');
 
-        $workTotalUseSmallNum = 0;
+        $makeStat = [];
 
         $where = ['mainId' => $mainId, 'status' => 1];
         $where['finishTime'] = ['between', [$currentStartTime, $currentEndTime]];
@@ -53,27 +50,19 @@ class StatKindController extends BaseController
                 if (empty($kindId)) {
                     continue;
                 }
-                $kindName = $kindList[$kindId]['name'] ?? '';
+                $staffId = $work->finishStaffId ?? 0;
                 $num = $work->num ?? 0;
-                $smallNumber = $work->flowerNum ?? 0;
-                $totalMakeSmallNum = bcmul($smallNumber, $num);
-                $workTotalUseSmallNum = bcadd($workTotalUseSmallNum, $totalMakeSmallNum);
-                if (isset($kindStat[$kindId]['makeNum'])) {
-                    $kindStat[$kindId]['makeNum'] = bcadd($kindStat[$kindId]['makeNum'], $num);
-                    $kindStat[$kindId]['makeSmallNum'] = bcadd($totalMakeSmallNum, $kindStat[$kindId]['makeSmallNum']);
+                $flowerNum = $work->flowerNum ?? 0;
+                $staffName = $staffList[$staffId]['name'] ?? '';
+                if (isset($makeStat[$staffId]['list'][$flowerNum]['num'])) {
+                    $makeStat[$staffId]['list'][$flowerNum]['num'] = bcadd($makeStat[$staffId]['list'][$flowerNum]['num'], $num);
                 } else {
-                    $kindStat[$kindId]['makeNum'] = $num;
-                    $kindStat[$kindId]['makeSmallNum'] = $totalMakeSmallNum;
-                    $kindStat[$kindId]['kindName'] = $kindName;
-                    if (isset($kindStat[$kindId]['saleNum']) == false) {
-                        $kindStat[$kindId]['saleNum'] = 0;
-                    }
+                    $makeStat[$staffId]['list'][$flowerNum]['num'] = $num;
+                    $makeStat[$staffId]['name'] = $staffName;
                 }
             }
         }
-
-
-
+        util::success(['makeStat' => $makeStat]);
     }
 
     //花束相关统计 ssh 20230320