diff --git a/app/Livewire/ProductionTargetPlan.php b/app/Livewire/ProductionTargetPlan.php index 99f56bae..c5965816 100644 --- a/app/Livewire/ProductionTargetPlan.php +++ b/app/Livewire/ProductionTargetPlan.php @@ -698,12 +698,18 @@ class ProductionTargetPlan extends Component foreach ($plans as $plan) { - $row = $plan->toArray(); + //$row = $plan->toArray(); + + $row['plan_quantity'] = (int) round($row['plan_quantity']); $workingDays = (int) ($row['working_days'] ?? 0); + // $normalDailyTarget = $workingDays > 0 + // ? round((float) $row['plan_quantity'] / $workingDays, 2) + // : 0; + $normalDailyTarget = $workingDays > 0 - ? round((float) $row['plan_quantity'] / $workingDays, 2) + ? (int) round((float) $row['plan_quantity'] / $workingDays) : 0; $pendingQty = 0; @@ -728,10 +734,12 @@ class ProductionTargetPlan extends Component continue; } - $todayTarget = round( - $normalDailyTarget + $pendingQty, - 2 - ); + // $todayTarget = round( + // $normalDailyTarget + $pendingQty, + // 2 + // ); + + $todayTarget = (int) round($normalDailyTarget + $pendingQty); $producedQty = $producedData[$key][$date]->total_qty ?? 0; diff --git a/resources/views/livewire/production-target-plan.blade.php b/resources/views/livewire/production-target-plan.blade.php index 46240e86..31be24d0 100644 --- a/resources/views/livewire/production-target-plan.blade.php +++ b/resources/views/livewire/production-target-plan.blade.php @@ -138,8 +138,13 @@ {{--