|
|
@@ -38,6 +38,8 @@ class StatKindController extends BaseController
|
|
|
|
|
|
$kindStat = [];
|
|
|
|
|
|
+ $workTotalUseSmallNum = 0;
|
|
|
+
|
|
|
$where = ['mainId' => $mainId, 'status' => 1];
|
|
|
$where['finishTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
$workList = WorkClass::getAllByCondition($where, null, '*', null, true);
|
|
|
@@ -51,6 +53,7 @@ class StatKindController extends BaseController
|
|
|
$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']);
|
|
|
@@ -101,7 +104,8 @@ class StatKindController extends BaseController
|
|
|
$itemList = ItemClass::getAllByCondition(['mainId' => $mainId, 'delStatus' => 0], null, 'id,name,mainId,delStatus,ratio', 'id');
|
|
|
|
|
|
$partStat = [];
|
|
|
-
|
|
|
+ $partTotalSmallNum = 0;
|
|
|
+ $partTotalNum = 0;
|
|
|
$partList = PartClass::getAllByCondition(['mainId' => $mainId, 'addTime' => ['between', [$currentStartTime, $currentEndTime]]], null, '*', null, true);
|
|
|
if (!empty($partList)) {
|
|
|
foreach ($partList as $part) {
|
|
|
@@ -118,7 +122,9 @@ class StatKindController extends BaseController
|
|
|
$name = $itemList[$productId]['name'] ?? '';
|
|
|
$num = $pItem->itemNum ?? 0;
|
|
|
$num = floatval($num);
|
|
|
+ $partTotalNum = bcadd($partTotalNum, $num);
|
|
|
$smallNum = bcmul($ratio, $num);
|
|
|
+ $partTotalSmallNum = bcadd($partTotalSmallNum, $smallNum);
|
|
|
if (isset($partStat[$productId]['num'])) {
|
|
|
$partStat[$productId]['num'] = bcadd($partStat[$productId]['num'], $num);
|
|
|
$partStat[$productId]['smallNum'] = bcadd($partStat[$productId]['smallNum'], $smallNum);
|
|
|
@@ -131,8 +137,7 @@ class StatKindController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- util::success(['kindStat' => $kindStat, 'partStat' => $partStat]);
|
|
|
+ util::success(['kindStat' => $kindStat, 'partStat' => $partStat, 'workTotalUseSmallNum' => $workTotalUseSmallNum, 'partTotalSmallNum' => $partTotalSmallNum, 'partTotalNum' => $partTotalNum]);
|
|
|
}
|
|
|
|
|
|
}
|
shish