Compare commits
13 Commits
c17dc86d48
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91cad60e02 | ||
| e0cfe7ccea | |||
|
|
7244028d02 | ||
| 3c8bcb2e9e | |||
|
|
8104da98d4 | ||
| ef62ca360b | |||
|
|
1d51067355 | ||
| 16d7f74115 | |||
|
|
1fd2538048 | ||
| 9fe342df80 | |||
|
|
d8fdf02417 | ||
| b421692560 | |||
|
|
1031a972de |
@@ -51,7 +51,8 @@ class ProductionPlanExport implements FromArray, WithHeadings, WithMapping
|
|||||||
|
|
||||||
// Add daily target and produced quantity for each date
|
// Add daily target and produced quantity for each date
|
||||||
foreach ($this->dates as $date) {
|
foreach ($this->dates as $date) {
|
||||||
$mapped[] = $row['daily_target'] ?? 0;
|
// $mapped[] = $row['daily_target_dynamic'] ?? 0;
|
||||||
|
$mapped[] = $row['daily_target_dynamic'][$date] ?? '-';
|
||||||
$mapped[] = $row['produced_quantity'][$date] ?? 0;
|
$mapped[] = $row['produced_quantity'][$date] ?? 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -606,6 +606,7 @@ class ProductionPlanResource extends Resource
|
|||||||
$query->where('shift_id', $data['Shift']);
|
$query->where('shift_id', $data['Shift']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (! empty($data['Line'])) {// if ($line = $data['Line'] ?? null) {
|
if (! empty($data['Line'])) {// if ($line = $data['Line'] ?? null) {
|
||||||
$query->where('line_id', $data['Line']);
|
$query->where('line_id', $data['Line']);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user