Skip to content

Commit 36eef10

Browse files
SMEWebifySMEWebify
committed
1 parent e2b4f3b commit 36eef10

File tree

8 files changed

+96
-9
lines changed

8 files changed

+96
-9
lines changed

‎app/Models/Planning/Task.php

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,50 @@ public function getFormattedEndDateAttribute()
240240
return "NULL";
241241
}
242242

243+
// Calculation of availability time
244+
public function getAvailabilityAttribute()
245+
{
246+
$plannedTime = $this->TotalTime();
247+
if ($plannedTime <= 0) {
248+
return 0;
249+
}
250+
$operationalTime = $this->getTotalLogTime();
251+
return $operationalTime / $plannedTime;
252+
}
253+
254+
// Performance calculation
255+
public function getPerformanceAttribute()
256+
{
257+
$producedQty = $this->getTotalLogGoodQt();
258+
$theoreticalQty = $this->GetOrderQtyLine();
259+
if ($theoreticalQty <= 0) {
260+
return 0;
261+
}
262+
return $producedQty / $theoreticalQty;
263+
}
264+
265+
// Quality calculation
266+
public function getQualityAttribute()
267+
{
268+
$goodQty = $this->getTotalLogGoodQt();
269+
$totalQty = $goodQty + $this->getTotalLogBadQt();
270+
if ($totalQty <= 0) {
271+
return 0;
272+
}
273+
return $goodQty / $totalQty;
274+
}
275+
276+
// calculation TRS/OEE
277+
public function getTRSAttribute()
278+
{
279+
$availability = $this->availability;
280+
$performance = $this->performance;
281+
$quality = $this->quality;
282+
$trs = $availability * $performance * $quality * 100;
283+
284+
return number_format($trs, 2);
285+
}
286+
243287
public function GetPrettyCreatedAttribute()
244288
{
245289
return date('d F Y', strtotime($this->created_at));

‎app/Models/Workflow/OrderLines.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,22 @@ public function SubAssembly()
225225
return $this->hasMany(SubAssembly::class, 'order_lines_id')->orderBy('ordre');
226226
}
227227

228+
// Calculation of the Overall Equipment Effectiveness for an order line
229+
public function getTRSAttribute()
230+
{
231+
$tasks = $this->Task;
232+
233+
if ($tasks->isEmpty()) {
234+
return 0;
235+
}
236+
237+
$availability = $tasks->avg('availability');
238+
$performance = $tasks->avg('performance');
239+
$quality = $tasks->avg('quality');
240+
241+
return round($availability * $performance * $quality * 100, 2);
242+
}
243+
228244
public function GetPrettyCreatedAttribute()
229245
{
230246
return date('d F Y', strtotime($this->created_at));

‎resources/lang/en/general_content.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@
216216
'start_date_trans_key' => 'Start date',
217217
'end_date_trans_key' => 'End date',
218218
'date_time_trans_key' => 'Date time',
219-
'hour_trans_key' => 'Your',
220-
'hours_trans_key' => 'Yours',
219+
'hour_trans_key' => 'Hour',
220+
'hours_trans_key' => 'Hours',
221221
'task_trans_key' => 'Task',
222222
'nc_trans_key' => 'NC',
223223
'failure_trans_key' => 'Failure',
@@ -719,6 +719,7 @@
719719
'user_productivity_trans_key' => 'User Productivity',
720720
'task_count_trans_key' => 'Number of tasks',
721721
'total_hours_per_resource_trans_key' => 'Total hours per resource',
722+
'trs_trans_key' => 'OEE',
722723

723724
//DELIVERY
724725
'delivery_notes_trans_key' => 'Delivery notes',
@@ -925,7 +926,6 @@
925926
'add_value_day_offer_trans_key' => 'Additional day of validity of the offer',
926927
'add_value_day_delivery_trans_key' => 'Additional day delivery delay',
927928
'day_trans_key' => 'Day(s)',
928-
'hour_trans_key' => 'Hour(s)',
929929
'header_font_color_trans_key' => 'Header font Color',
930930
'manufacturing_information_trans_key' => 'Manufacturing information',
931931
'bare_code_type_trans_key' => 'Code bare type for declare task',

‎resources/lang/fr/general_content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@
719719
'user_productivity_trans_key' => 'Productivité des utilisateurs',
720720
'task_count_trans_key' => 'Nombre de tâches',
721721
'total_hours_per_resource_trans_key' => 'Heures totales par ressource',
722+
'trs_trans_key' => 'TRS',
722723

723724
//DELIVERY
724725
'delivery_notes_trans_key' => 'Bons de livraisons',
@@ -925,7 +926,6 @@
925926
'add_value_day_offer_trans_key' => 'Jour supplémentaire de validité de l\'offre',
926927
'add_value_day_delivery_trans_key' => 'Délai de livraison d\'un jour supplémentaire',
927928
'day_trans_key' => 'Jour(s)',
928-
'hour_trans_key' => 'Heure(s)',
929929
'header_font_color_trans_key' => 'Couleur d’en-tête',
930930
'manufacturing_information_trans_key' => 'Informations de fabrication',
931931
'bare_code_type_trans_key' => 'Type de code pour la tâche de déclaration',

‎resources/views/livewire/order-lines.blade.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
<i class="fa fa-lg fa-fw fas fa-list"></i>
353353
</button>
354354
<!-- Modal {{ $OrderLine->id }} -->
355-
<x-adminlte-modal id="OrderLineTasks{{ $OrderLine->id }}" title="Task detail for {{ $OrderLine->label }}" theme="warning" icon="fa fa-pen" size='lg' disable-animations>
355+
<x-adminlte-modal id="OrderLineTasks{{ $OrderLine->id }}" title="Task detail for {{ $OrderLine->label }}" theme="warning" icon="fa fa-pen" size='xl' disable-animations>
356356
<div class="card-body">
357357
<div class="row">
358358
<table class="table table-hover">
@@ -366,6 +366,7 @@
366366
<th>{{ __('general_content.cost_trans_key') }}</th>
367367
<th>{{ __('general_content.margin_trans_key') }}</th>
368368
<th>{{ __('general_content.price_trans_key') }}</th>
369+
<th>{{ __('general_content.trs_trans_key') }}</th>
369370
</tr>
370371
</thead>
371372
<tbody>
@@ -389,6 +390,7 @@
389390
<td>{{ $Task->unit_cost }} {{ $Factory->curency }}</td>
390391
<td>{{ $Task->Margin() }} %</td>
391392
<td>{{ $Task->unit_price }} {{ $Factory->curency }}</td>
393+
<td>{{ $Task->getTRSAttribute() }} %</td>
392394
</tr>
393395
@empty
394396
<x-EmptyDataLine col="12" text="{{ __('general_content.no_data_trans_key') }}" />

‎resources/views/livewire/orders-lines-index.blade.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<th>{{ __('general_content.cost_trans_key') }}</th>
157157
<th>{{ __('general_content.margin_trans_key') }}</th>
158158
<th>{{ __('general_content.price_trans_key') }}</th>
159+
<th>{{ __('general_content.trs_trans_key') }}</th>
159160
</tr>
160161
</thead>
161162
<tbody>
@@ -179,6 +180,7 @@
179180
<td>{{ $Task->unit_cost }} {{ $Factory->curency }}</td>
180181
<td>{{ $Task->Margin() }} %</td>
181182
<td>{{ $Task->unit_price }} {{ $Factory->curency }}</td>
183+
<td>{{ $Task->getTRSAttribute() }} %</td>
182184
</tr>
183185
@empty
184186
<x-EmptyDataLine col="12" text="{{ __('general_content.no_data_trans_key') }}" />

‎resources/views/livewire/task-manage.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
@endforeach
158158
</ul>
159159
@endif
160-
161160

162161
<form wire:submit.prevent="importBOMCSV" class="form-inline">
163162
<div class="form-group mb-2">

‎resources/views/livewire/task-statu.blade.php

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,18 @@
155155

156156

157157
<div class="text-muted">
158-
<p class="text-sm">{{ __('general_content.statu_trans_key') }}
159-
<b class="d-block">{{ $Task->status['title'] }}</b>
160-
</p>
158+
<div class="row">
159+
<div class="col-4">
160+
<p class="text-sm">{{ __('general_content.statu_trans_key') }}
161+
<b class="d-block">{{ $Task->status['title'] }}</b>
162+
</p>
163+
</div>
164+
<div class="col-4">
165+
<p class="text-sm">{{ __('general_content.qty_trans_key') }}
166+
<b class="d-block">{{ $Task->GetOrderQtyLine() }}</b>
167+
</p>
168+
</div>
169+
</div>
161170
<div class="row">
162171
<div class="col-4">
163172
<p class="text-sm">{{ __('general_content.cost_trans_key') }}
@@ -193,6 +202,20 @@
193202
</p>
194203
</div>
195204
</div>
205+
<div class="row">
206+
<div class="col-4">
207+
<p class="text-sm">{{ __('general_content.trs_trans_key') }}
208+
<b class="d-block">{{ $Task->getTotalLogTime() }}</b>
209+
</p>
210+
</div>
211+
<div class="col-4">
212+
<p class="text-sm">{{ __('general_content.trs_trans_key') }}
213+
<b class="d-block">{{ $Task->getTRSAttribute() }} %</b>
214+
</p>
215+
</div>
216+
<div class="col-4">
217+
</div>
218+
</div>
196219
@endif
197220
</div>
198221
<div class="row">
@@ -208,6 +231,7 @@
208231
@endif
209232
</div>
210233
</div>
234+
211235
</div>
212236
<div class="col-md-6">
213237
<div class="row">

0 commit comments

Comments
 (0)