poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Changed logic in production target plan' (#1088) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 15s
Details

Browse Source 
Reviewed-on: #1088
This commit was merged in pull request #1088.
This commit is contained in:
jothi
2026-09-24 06:02:12 +00:00
parent 959bda3d49 478ae96df1
commit b832306e37
1 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/Livewire/ProductionTargetPlan.php
View File

@@ -222,28 +222,59 @@ class ProductionTargetPlan extends Component
$this->leaveDates = $leaveDates;
// $producedData = QualityValidation::selectRaw("
// plant_id,
// line_id,
// sticker_master_id,
// DATE(created_at) as prod_date,
// COUNT(*) as total_qty
// ")
// ->where('plant_id', $plantId)
// ->where('line_id', $lineId)
// ->whereMonth('created_at', $month)
// ->whereYear('created_at', $year)
// ->when($category, function ($query) use ($category) {
// $query->whereHas('item', function ($q) use ($category) {
// $q->where('category', $category);
// });
// })
// ->groupBy('plant_id', 'line_id', 'sticker_master_id', DB::raw('DATE(created_at)'))
// ->get()
// ->groupBy(fn($row) =>
// $row->plant_id . '_' . $row->line_id . '_' . $row->item_id
// )
// ->map(fn($group) => $group->keyBy('prod_date'));
$producedData = QualityValidation::selectRaw("
plant_id,
line_id,
item_id,
DATE(created_at) as prod_date,
COUNT(*) as total_qty
")
->where('plant_id', $plantId)
->where('line_id', $lineId)
->whereMonth('created_at', $month)
->whereYear('created_at', $year)
->when($category, function ($query) use ($category) {
$query->whereHas('item', function ($q) use ($category) {
$q->where('category', $category);
});
})
->groupBy('plant_id', 'line_id', 'item_id', DB::raw('DATE(created_at)'))
->get()
->groupBy(fn($row) =>
$row->plant_id . '_' . $row->line_id . '_' . $row->item_id
)
->map(fn($group) => $group->keyBy('prod_date'));
quality_validations.plant_id,
quality_validations.line_id,
quality_validations.sticker_master_id,
sticker_masters.item_id,
DATE(quality_validations.created_at) as prod_date,
COUNT(*) as total_qty
")
->join('sticker_masters', 'sticker_masters.id', '=', 'quality_validations.sticker_master_id')
->where('quality_validations.plant_id', $plantId)
->where('quality_validations.line_id', $lineId)
->whereMonth('quality_validations.created_at', $month)
->whereYear('quality_validations.created_at', $year)
->when($category, function ($query) use ($category) {
$query->whereHas('item', function ($q) use ($category) {
$q->where('category', $category);
});
})
->groupBy(
'quality_validations.plant_id',
'quality_validations.line_id',
'quality_validations.sticker_master_id',
'sticker_masters.item_id',
DB::raw('DATE(quality_validations.created_at)')
)
->get()
->groupBy(fn($row) =>
$row->plant_id . '_' . $row->line_id . '_' . $row->item_id
)
->map(fn($group) => $group->keyBy('prod_date'));
$records = [];