diff --git a/plugins/romanah/gokbakja/components/MachineProduction.php b/plugins/romanah/gokbakja/components/MachineProduction.php
index 6c9d6b0..b333d9c 100644
--- a/plugins/romanah/gokbakja/components/MachineProduction.php
+++ b/plugins/romanah/gokbakja/components/MachineProduction.php
@@ -307,6 +307,9 @@ class MachineProduction extends ComponentBase
' . number_format($machineProductions[$x]->produced_weight, 2) . ' kg
|
+ ' . number_format($machineProductions[$x]->brutto_kg, 2) . ' kg
+ |
' . number_format($machineProductions[$x]->produced_length, 2) . ' m
|
@@ -314,7 +317,6 @@ class MachineProduction extends ComponentBase
style="font-size: 14px;">' . number_format($machineProductions[$x]->defective_weight, 2) . ' kg
' . $machineProductions[$x]->employee_name . ' |
- ' . $machineProductions[$x]->mechanic_name . ' |
' . $machineProductions[$x]->note . ' |
'. $editBtn.' |
';
@@ -404,6 +406,7 @@ class MachineProduction extends ComponentBase
$machineProductionsFiltered = $machineProductions->get();
$machineProductionsSum = $machineProductionsCalc->sum("produced_weight");
+ $machineProductionsBruttoSum = $machineProductionsCalc->sum("brutto_kg");
$machineProductionsDefectiveSum = $machineProductionsCalc->sum("defective_weight");
$html_data = '';
@@ -426,6 +429,9 @@ class MachineProduction extends ComponentBase
' . number_format($machineProductionsFiltered[$x]->produced_weight, 2) . ' kg
|
+ ' . number_format($machineProductionsFiltered[$x]->brutto_kg, 2) . ' kg
+ |
' . number_format($machineProductionsFiltered[$x]->produced_length, 2) . ' m
|
@@ -433,7 +439,6 @@ class MachineProduction extends ComponentBase
style="font-size: 14px;">' . number_format($machineProductionsFiltered[$x]->defective_weight, 2) . ' kg
' . $machineProductionsFiltered[$x]->employee_name . ' |
- ' . $machineProductionsFiltered[$x]->mechanic_name . ' |
' . $machineProductionsFiltered[$x]->note . ' |
';
}
@@ -442,14 +447,14 @@ class MachineProduction extends ComponentBase
return [
'#machine_report_datas' => $html_data,
'#all_amount' => '
-
+
Öndürlen Rulon: ' . count($machineProductionsFiltered) .'
-
+
-
+
+
+
+
Brutto Agramy: ' . number_format($machineProductionsBruttoSum, 2) . ' kg
+
+
+
+
Rulon Görnüşi
| Rulon Reňki |
Önen Önüm (kg) |
+ Brutto (kg) |
Önen Önüm (metr) |
Othod (kg) |
Ady Familiýasy |
- Mehanik |
Bellik |
Sazlama |
@@ -255,6 +255,7 @@ function onStart(){
Rulon Görnüşi |
Rulon Reňki |
Önen Önüm (kg) |
+ Brutto (kg) |
Önen Önüm (metr) |
Othod (kg) |
Ady Familiýasy |
diff --git a/themes/gokbakja/pages/machine/report-production-machine.htm b/themes/gokbakja/pages/machine/report-production-machine.htm
index 5c5c4be..30e1036 100644
--- a/themes/gokbakja/pages/machine/report-production-machine.htm
+++ b/themes/gokbakja/pages/machine/report-production-machine.htm
@@ -54,6 +54,7 @@ function onStart(){
№ |
Aýlar |
Öndürlen Önüm |
+ Brutto agramy (kg) |
Öndürlen Önüm metr |
Othod (kg) |
@@ -83,6 +84,7 @@ function onStart(){
№ |
Aýlar |
Öndürlen Önüm |
+ Brutto agramy (kg) |
Öndürlen Önüm metr |
Othod (kg) |
diff --git a/themes/gokbakja/pages/machine/report.htm b/themes/gokbakja/pages/machine/report.htm
index a02a4cf..eec15d1 100644
--- a/themes/gokbakja/pages/machine/report.htm
+++ b/themes/gokbakja/pages/machine/report.htm
@@ -214,10 +214,10 @@ function onStart(){
Rulon Görnüşi |
Rulon Reňki |
Önen Önüm (kg) |
+ Brutto Önüm (kg) |
Önen Önüm (metr) |
Othod (kg) |
Ady Familiýasy |
- Mehanik |
Bellik |
@@ -238,10 +238,10 @@ function onStart(){
Rulon Görnüşi |
Rulon Reňki |
Önen Önüm (kg) |
+ Brutto Önüm (kg) |
Önen Önüm (metr) |
Othod (kg) |
Ady Familiýasy |
- Mehanik |
Bellik |
diff --git a/themes/gokbakja/pages/produced/rulonstock.htm b/themes/gokbakja/pages/produced/rulonstock.htm
index d94c176..d429bd5 100644
--- a/themes/gokbakja/pages/produced/rulonstock.htm
+++ b/themes/gokbakja/pages/produced/rulonstock.htm
@@ -25,6 +25,7 @@ function onStart(){
->where("status_director", "accept")
->sum('amount');
+
$this["actionsSumCount"] = count($this["actions"]);
@@ -84,6 +85,7 @@ function onStart(){
Haryt |
Hereket |
Mukdary (KG) |
+ Brutto agramy (KG) |
Sene |
Sklad |
@@ -97,6 +99,7 @@ function onStart(){
{{record.type}} |
{{record.quantity|number_format(2)}} kg |
+ {{record.product.brutto_kg|number_format(2)}} kg |
{{record.created_at|date('d.m.Y')}} |
{{record.stock.name}} |
@@ -110,6 +113,7 @@ function onStart(){
Haryt |
Hereket |
Mukdary (KG) |
+ Brutto agramy (KG) |
Sene |
Sklad |
diff --git a/themes/gokbakja/partials/reportMachine/row-machine.htm b/themes/gokbakja/partials/reportMachine/row-machine.htm
index 1b0efce..4484629 100644
--- a/themes/gokbakja/partials/reportMachine/row-machine.htm
+++ b/themes/gokbakja/partials/reportMachine/row-machine.htm
@@ -9,6 +9,11 @@ function onStart (){
->whereYear('created_at', $year)
->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)
->whereYear('created_at', $year)
->sum('produced_length');
@@ -24,6 +29,7 @@ function onStart (){
{{no}} |
{{title}} |
{{all_amount|number_format}} kg |
+ {{all_amount_brutto|number_format}} kg |
{{all_amount_length|number_format}} metr |
{{all_amount_defective|number_format}} kg |