diff --git a/plugins/romanah/gokbakja/components/LoadTransport.php b/plugins/romanah/gokbakja/components/LoadTransport.php index e202a4b..472ef8f 100644 --- a/plugins/romanah/gokbakja/components/LoadTransport.php +++ b/plugins/romanah/gokbakja/components/LoadTransport.php @@ -222,8 +222,8 @@ class LoadTransport extends ComponentBase ->where('color_id', $color); }) ->where("stock_id", $stock->id) - ->where("status_accountant", "accept") - ->where("status_director", "accept") + //->where("status_accountant", "accept") + //->where("status_director", "accept") ->sum('amount'); $products = ''; @@ -241,8 +241,8 @@ class LoadTransport extends ComponentBase $q->with(['bag_type', 'bag_size', 'color']); }]) ->where("stock_id", $stock->id) - ->where("status_accountant", "accept") - ->where("status_director", "accept") + //->where("status_accountant", "accept") + //->where("status_director", "accept") ->addSelect(DB::raw("SUM(amount) as quantity")) ->groupBy('romanah_gokbakja_rulon_action.product_id') ->orderBy('id', 'DESC') @@ -283,8 +283,8 @@ class LoadTransport extends ComponentBase $qqq->where('width', $bag_width)->where('height', $bag_height); }) ->where("stock_id", $stock->id) - ->where("status_accountant", "accept") - ->where("status_director", "accept") + //->where("status_accountant", "accept") + //->where("status_director", "accept") ->sum('amount'); @@ -307,8 +307,8 @@ class LoadTransport extends ComponentBase $qqq->where('width', $bag_width)->where('height', $bag_height); }) ->where("stock_id", $stock->id) - ->where("status_accountant", "accept") - ->where("status_director", "accept") + //->where("status_accountant", "accept") + //->where("status_director", "accept") ->addSelect(DB::raw("SUM(amount) as quantity")) ->groupBy('romanah_gokbakja_bag_actions.product_id') ->orderBy('id', 'DESC') diff --git a/plugins/romanah/gokbakja/components/Order.php b/plugins/romanah/gokbakja/components/Order.php index a88a1db..24532bb 100644 --- a/plugins/romanah/gokbakja/components/Order.php +++ b/plugins/romanah/gokbakja/components/Order.php @@ -91,6 +91,7 @@ class Order extends ComponentBase ' . ($x + 1) . ' Sargyt #' . $ordersFiltered[$x]->id . ' ' . $ordersFiltered[$x]->client->name . ' + ' . $ordersFiltered[$x]->contract_no . ' ' . $ordersFiltered[$x]->client->country . ' ' . number_format($ordersFiltered[$x]->order_all_amount) . ' kg get()->pluck("id")->toArray(); $sewerProductionsSumBagQty = $sewerProductions->sum("produced_bag_qty"); + $sewerProductionsSumDefectiveBagQty = $sewerProductions->sum("defective_bag_qty"); $sewerProductionsamount = PivotSewer::whereIn("sewer_production_id", $sewerIds)->sum("spent_amount"); // dd($sewerProductionsamount->spentAmount); @@ -407,6 +408,7 @@ class Sewer extends ComponentBase style="font-size: 14px;">' . number_format($sewerDatas[$x]->pivot_sewer[0]->amount, 2) . ' kg ' . $sewerDatas[$x]->produced_bag_qty . ' + ' . ($sewerDatas[$x]->defective_bag_qty ?? ''). ' ' . number_format($sewerDatas[$x]->pivot_sewer[0]->spent_amount, 2) . ' kg ' . number_format($sewerDatas[$x]->pivot_sewer[0]->left_amount, 2) . ' kg $html_data, - '#all_amount' => '
+ '#all_amount' => '

Tikinçiler Boýunça Umumy

Hasabat

@@ -430,6 +432,13 @@ class Sewer extends ComponentBase
+
+
+
+
Jemi BRAK Halta: ' . number_format($sewerProductionsSumDefectiveBagQty) . ' sany
+
+
+
diff --git a/themes/gokbakja/pages/orders/report.htm b/themes/gokbakja/pages/orders/report.htm index de2e747..dc14e44 100644 --- a/themes/gokbakja/pages/orders/report.htm +++ b/themes/gokbakja/pages/orders/report.htm @@ -104,6 +104,7 @@ function onStart(){ № Sargyt No Klent + Şertnama nomer Ýurdy Mukdary Bahasy @@ -122,6 +123,7 @@ function onStart(){ № Sargyt No Klent + Şertnama nomer Ýurdy Mukdary Bahasy diff --git a/themes/gokbakja/pages/sewer/report.htm b/themes/gokbakja/pages/sewer/report.htm index 39f9ad1..f57308d 100644 --- a/themes/gokbakja/pages/sewer/report.htm +++ b/themes/gokbakja/pages/sewer/report.htm @@ -160,6 +160,7 @@ function onStart(){ Gram Çig mal mukdary Tikilen Halta + BRAK Halta Ulanylan Galyndy Status @@ -182,6 +183,7 @@ function onStart(){ Gram Çig mal mukdary Tikilen Halta + BRAK Halta Ulanylan Galyndy Status