brutto kg
This commit is contained in:
parent
ab41a972b7
commit
d8a20184a3
|
|
@ -307,6 +307,9 @@ class MachineProduction extends ComponentBase
|
||||||
<td><span class="badge badge-soft-success"
|
<td><span class="badge badge-soft-success"
|
||||||
style="font-size: 14px;">' . number_format($machineProductions[$x]->produced_weight, 2) . ' kg</span>
|
style="font-size: 14px;">' . number_format($machineProductions[$x]->produced_weight, 2) . ' kg</span>
|
||||||
</td>
|
</td>
|
||||||
|
<td><span class="badge badge-soft-warning"
|
||||||
|
style="font-size: 14px;">' . number_format($machineProductions[$x]->brutto_kg, 2) . ' kg</span>
|
||||||
|
</td>
|
||||||
<td><span class="badge badge-soft-primary"
|
<td><span class="badge badge-soft-primary"
|
||||||
style="font-size: 14px;">' . number_format($machineProductions[$x]->produced_length, 2) . ' m</span>
|
style="font-size: 14px;">' . number_format($machineProductions[$x]->produced_length, 2) . ' m</span>
|
||||||
</td>
|
</td>
|
||||||
|
|
@ -314,7 +317,6 @@ class MachineProduction extends ComponentBase
|
||||||
style="font-size: 14px;">' . number_format($machineProductions[$x]->defective_weight, 2) . ' kg</span>
|
style="font-size: 14px;">' . number_format($machineProductions[$x]->defective_weight, 2) . ' kg</span>
|
||||||
</td>
|
</td>
|
||||||
<td>' . $machineProductions[$x]->employee_name . '</td>
|
<td>' . $machineProductions[$x]->employee_name . '</td>
|
||||||
<td>' . $machineProductions[$x]->mechanic_name . '</td>
|
|
||||||
<td>' . $machineProductions[$x]->note . '</td>
|
<td>' . $machineProductions[$x]->note . '</td>
|
||||||
<td> '. $editBtn.' </td>
|
<td> '. $editBtn.' </td>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
|
@ -404,6 +406,7 @@ class MachineProduction extends ComponentBase
|
||||||
|
|
||||||
$machineProductionsFiltered = $machineProductions->get();
|
$machineProductionsFiltered = $machineProductions->get();
|
||||||
$machineProductionsSum = $machineProductionsCalc->sum("produced_weight");
|
$machineProductionsSum = $machineProductionsCalc->sum("produced_weight");
|
||||||
|
$machineProductionsBruttoSum = $machineProductionsCalc->sum("brutto_kg");
|
||||||
$machineProductionsDefectiveSum = $machineProductionsCalc->sum("defective_weight");
|
$machineProductionsDefectiveSum = $machineProductionsCalc->sum("defective_weight");
|
||||||
|
|
||||||
$html_data = '';
|
$html_data = '';
|
||||||
|
|
@ -426,6 +429,9 @@ class MachineProduction extends ComponentBase
|
||||||
<td><span class="badge badge-soft-success"
|
<td><span class="badge badge-soft-success"
|
||||||
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->produced_weight, 2) . ' kg</span>
|
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->produced_weight, 2) . ' kg</span>
|
||||||
</td>
|
</td>
|
||||||
|
<td><span class="badge badge-soft-warning"
|
||||||
|
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->brutto_kg, 2) . ' kg</span>
|
||||||
|
</td>
|
||||||
<td><span class="badge badge-soft-primary"
|
<td><span class="badge badge-soft-primary"
|
||||||
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->produced_length, 2) . ' m</span>
|
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->produced_length, 2) . ' m</span>
|
||||||
</td>
|
</td>
|
||||||
|
|
@ -433,7 +439,6 @@ class MachineProduction extends ComponentBase
|
||||||
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->defective_weight, 2) . ' kg</span>
|
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->defective_weight, 2) . ' kg</span>
|
||||||
</td>
|
</td>
|
||||||
<td>' . $machineProductionsFiltered[$x]->employee_name . '</td>
|
<td>' . $machineProductionsFiltered[$x]->employee_name . '</td>
|
||||||
<td>' . $machineProductionsFiltered[$x]->mechanic_name . '</td>
|
|
||||||
<td>' . $machineProductionsFiltered[$x]->note . '</td>
|
<td>' . $machineProductionsFiltered[$x]->note . '</td>
|
||||||
</tr>';
|
</tr>';
|
||||||
}
|
}
|
||||||
|
|
@ -442,14 +447,14 @@ class MachineProduction extends ComponentBase
|
||||||
return [
|
return [
|
||||||
'#machine_report_datas' => $html_data,
|
'#machine_report_datas' => $html_data,
|
||||||
'#all_amount' => '
|
'#all_amount' => '
|
||||||
<div class="col-md-4">
|
<div class="col-md-3">
|
||||||
<div class="card bg-info text-white-50">
|
<div class="card bg-info text-white-50">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;">Öndürlen Rulon: ' . count($machineProductionsFiltered) .'</h5>
|
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;">Öndürlen Rulon: ' . count($machineProductionsFiltered) .'</h5>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-3">
|
||||||
<div class="card bg-info text-white-50">
|
<div class="card bg-info text-white-50">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;"><i
|
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;"><i
|
||||||
|
|
@ -457,7 +462,15 @@ class MachineProduction extends ComponentBase
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-3">
|
||||||
|
<div class="card bg-warning text-white-50">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;"><i
|
||||||
|
class="mdi mdi-bullseye-arrow me-3"></i>Brutto Agramy: ' . number_format($machineProductionsBruttoSum, 2) . ' kg</h5>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3">
|
||||||
<div class="card bg-danger text-white-50">
|
<div class="card bg-danger text-white-50">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;"><i
|
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;"><i
|
||||||
|
|
|
||||||
|
|
@ -231,10 +231,10 @@ function onStart(){
|
||||||
<th>Rulon Görnüşi</th>
|
<th>Rulon Görnüşi</th>
|
||||||
<th>Rulon Reňki</th>
|
<th>Rulon Reňki</th>
|
||||||
<th>Önen Önüm (kg)</th>
|
<th>Önen Önüm (kg)</th>
|
||||||
|
<th>Brutto (kg)</th>
|
||||||
<th>Önen Önüm (metr)</th>
|
<th>Önen Önüm (metr)</th>
|
||||||
<th>Othod (kg)</th>
|
<th>Othod (kg)</th>
|
||||||
<th>Ady Familiýasy</th>
|
<th>Ady Familiýasy</th>
|
||||||
<th>Mehanik</th>
|
|
||||||
<th>Bellik</th>
|
<th>Bellik</th>
|
||||||
<th>Sazlama</th>
|
<th>Sazlama</th>
|
||||||
<!-- <th>Настройки</th> -->
|
<!-- <th>Настройки</th> -->
|
||||||
|
|
@ -255,6 +255,7 @@ function onStart(){
|
||||||
<th>Rulon Görnüşi</th>
|
<th>Rulon Görnüşi</th>
|
||||||
<th>Rulon Reňki</th>
|
<th>Rulon Reňki</th>
|
||||||
<th>Önen Önüm (kg)</th>
|
<th>Önen Önüm (kg)</th>
|
||||||
|
<th>Brutto (kg)</th>
|
||||||
<th>Önen Önüm (metr)</th>
|
<th>Önen Önüm (metr)</th>
|
||||||
<th>Othod (kg)</th>
|
<th>Othod (kg)</th>
|
||||||
<th>Ady Familiýasy</th>
|
<th>Ady Familiýasy</th>
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,7 @@ function onStart(){
|
||||||
<th style="width: 5%;">№</th>
|
<th style="width: 5%;">№</th>
|
||||||
<th>Aýlar</th>
|
<th>Aýlar</th>
|
||||||
<th>Öndürlen Önüm</th>
|
<th>Öndürlen Önüm</th>
|
||||||
|
<th>Brutto agramy (kg)</th>
|
||||||
<th>Öndürlen Önüm metr</th>
|
<th>Öndürlen Önüm metr</th>
|
||||||
<th>Othod (kg)</th>
|
<th>Othod (kg)</th>
|
||||||
|
|
||||||
|
|
@ -83,6 +84,7 @@ function onStart(){
|
||||||
<th style="width: 5%;">№</th>
|
<th style="width: 5%;">№</th>
|
||||||
<th>Aýlar</th>
|
<th>Aýlar</th>
|
||||||
<th>Öndürlen Önüm</th>
|
<th>Öndürlen Önüm</th>
|
||||||
|
<th>Brutto agramy (kg)</th>
|
||||||
<th>Öndürlen Önüm metr</th>
|
<th>Öndürlen Önüm metr</th>
|
||||||
<th>Othod (kg)</th>
|
<th>Othod (kg)</th>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -214,10 +214,10 @@ function onStart(){
|
||||||
<th>Rulon Görnüşi</th>
|
<th>Rulon Görnüşi</th>
|
||||||
<th>Rulon Reňki</th>
|
<th>Rulon Reňki</th>
|
||||||
<th>Önen Önüm (kg)</th>
|
<th>Önen Önüm (kg)</th>
|
||||||
|
<th>Brutto Önüm (kg)</th>
|
||||||
<th>Önen Önüm (metr)</th>
|
<th>Önen Önüm (metr)</th>
|
||||||
<th>Othod (kg)</th>
|
<th>Othod (kg)</th>
|
||||||
<th>Ady Familiýasy</th>
|
<th>Ady Familiýasy</th>
|
||||||
<th>Mehanik</th>
|
|
||||||
<th>Bellik</th>
|
<th>Bellik</th>
|
||||||
<!-- <th>Настройки</th> -->
|
<!-- <th>Настройки</th> -->
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -238,10 +238,10 @@ function onStart(){
|
||||||
<th>Rulon Görnüşi</th>
|
<th>Rulon Görnüşi</th>
|
||||||
<th>Rulon Reňki</th>
|
<th>Rulon Reňki</th>
|
||||||
<th>Önen Önüm (kg)</th>
|
<th>Önen Önüm (kg)</th>
|
||||||
|
<th>Brutto Önüm (kg)</th>
|
||||||
<th>Önen Önüm (metr)</th>
|
<th>Önen Önüm (metr)</th>
|
||||||
<th>Othod (kg)</th>
|
<th>Othod (kg)</th>
|
||||||
<th>Ady Familiýasy</th>
|
<th>Ady Familiýasy</th>
|
||||||
<th>Mehanik</th>
|
|
||||||
<th>Bellik</th>
|
<th>Bellik</th>
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ function onStart(){
|
||||||
->where("status_director", "accept")
|
->where("status_director", "accept")
|
||||||
->sum('amount');
|
->sum('amount');
|
||||||
|
|
||||||
|
|
||||||
$this["actionsSumCount"] = count($this["actions"]);
|
$this["actionsSumCount"] = count($this["actions"]);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -84,6 +85,7 @@ function onStart(){
|
||||||
<th>Haryt</th>
|
<th>Haryt</th>
|
||||||
<th>Hereket</th>
|
<th>Hereket</th>
|
||||||
<th>Mukdary (KG)</th>
|
<th>Mukdary (KG)</th>
|
||||||
|
<th>Brutto agramy (KG)</th>
|
||||||
<th>Sene</th>
|
<th>Sene</th>
|
||||||
<th>Sklad</th>
|
<th>Sklad</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -97,6 +99,7 @@ function onStart(){
|
||||||
<td style="text-align: center;">
|
<td style="text-align: center;">
|
||||||
<span class="badge badge-soft-{% if record.type == 'inbox' %}success {% else %}danger {% endif %}" style="font-size: 14px;">{{record.type}}</span></td>
|
<span class="badge badge-soft-{% if record.type == 'inbox' %}success {% else %}danger {% endif %}" style="font-size: 14px;">{{record.type}}</span></td>
|
||||||
<td style="color: #500101;font-weight: bold;">{{record.quantity|number_format(2)}} kg</td>
|
<td style="color: #500101;font-weight: bold;">{{record.quantity|number_format(2)}} kg</td>
|
||||||
|
<td style="color: #500101;font-weight: bold;">{{record.product.brutto_kg|number_format(2)}} kg</td>
|
||||||
<td>{{record.created_at|date('d.m.Y')}}</td>
|
<td>{{record.created_at|date('d.m.Y')}}</td>
|
||||||
<td>{{record.stock.name}}</td>
|
<td>{{record.stock.name}}</td>
|
||||||
|
|
||||||
|
|
@ -110,6 +113,7 @@ function onStart(){
|
||||||
<th>Haryt</th>
|
<th>Haryt</th>
|
||||||
<th>Hereket</th>
|
<th>Hereket</th>
|
||||||
<th>Mukdary (KG)</th>
|
<th>Mukdary (KG)</th>
|
||||||
|
<th>Brutto agramy (KG)</th>
|
||||||
<th>Sene</th>
|
<th>Sene</th>
|
||||||
<th>Sklad</th>
|
<th>Sklad</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,11 @@ function onStart (){
|
||||||
->whereYear('created_at', $year)
|
->whereYear('created_at', $year)
|
||||||
->sum('produced_weight');
|
->sum('produced_weight');
|
||||||
|
|
||||||
|
|
||||||
|
$this["all_amount_brutto"] = Romanah\Gokbakja\Models\ProductionMachine::whereMonth('created_at', $no)
|
||||||
|
->whereYear('created_at', $year)
|
||||||
|
->sum('brutto_kg');
|
||||||
|
|
||||||
$this["all_amount_length"] = Romanah\Gokbakja\Models\ProductionMachine::whereMonth('created_at', $no)
|
$this["all_amount_length"] = Romanah\Gokbakja\Models\ProductionMachine::whereMonth('created_at', $no)
|
||||||
->whereYear('created_at', $year)
|
->whereYear('created_at', $year)
|
||||||
->sum('produced_length');
|
->sum('produced_length');
|
||||||
|
|
@ -24,6 +29,7 @@ function onStart (){
|
||||||
<td style="font-weight: bold;width: 5%;">{{no}}</td>
|
<td style="font-weight: bold;width: 5%;">{{no}}</td>
|
||||||
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;color: #0005c5;"> {{title}} </a></td>
|
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;color: #0005c5;"> {{title}} </a></td>
|
||||||
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount|number_format}} kg</a></td>
|
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount|number_format}} kg</a></td>
|
||||||
|
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount_brutto|number_format}} kg</a></td>
|
||||||
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount_length|number_format}} metr</a></td>
|
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount_length|number_format}} metr</a></td>
|
||||||
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount_defective|number_format}} kg</a></td>
|
<td><a href="/get-all-machine-production-month/{{no}}" style="font-weight: bold;"> {{all_amount_defective|number_format}} kg</a></td>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue