From f588df8b2243876c93a2d033544530480030889d Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 16 Dec 2024 20:17:38 +0300
Subject: [PATCH] =?utf8?q?[ERP-261]=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20?=
 =?utf8?q?=D1=81=D0=B5=D0=B1=D0=B5=D1=81=D1=82=D0=BE=D0=B8=D0=BC=D0=BE?=
 =?utf8?q?=D1=81=D1=82=D1=8C,=20=D1=88=D1=82=D1=83=D0=BA=D0=B8,=20=D0=B4?=
 =?utf8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B0=D1=80=D1=82=D0=B8?=
 =?utf8?q?=D0=BA=D1=83=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/ShiftTransferController.php | 13 +++++------
 erp24/views/shift-transfer/_transfer.php      | 23 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index fb0cdf2b..1812db84 100644
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -65,9 +65,9 @@ class ShiftTransferController extends Controller
     public function buildLoadDataShiftRemains($groups, $storeGuid, $normal = true)
     {
         $productsClass = ProductsClass::find()->select(['category_id'])->where(['tip' => $groups])->column();
-        $products = ArrayHelper::map(
+        $products =
             Products1c::find()->alias('p')
-                ->select(['p.id', 'p.name'])
+                ->select(['p.id', 'p.name', 'p.articule'])
                 ->leftJoin('products_class pc', 'pc.category_id = p.parent_id')
                 ->where(['parent_id' => $productsClass])
                 ->orderBy([
@@ -78,18 +78,17 @@ class ShiftTransferController extends Controller
                     // Обычная алфавитная сортировка
                     'p.name' => SORT_ASC,
                 ])
-                ->all(), 'id', 'name'
-        );
+                ->indexBy('id')->asArray()->all();
         $balance = ArrayHelper::map(Balances::find()->select(['quantity', 'product_id'])
             ->where(['store_id' => $storeGuid])->all(), 'product_id', 'quantity');
         $productGuids = [];
-        foreach ($products as $key => $name) {
+        foreach ($products as $key => $data) {
             if (isset($balance[$key]) && $balance[$key] > 0) {
-                $productGuids[$key] = $name . ' (' . $balance[$key] . ' шт.)';
+                $productGuids[$key] = $data['name'] . ' (арт. ' . $data['articule'] . ')';
             }
             else {
                 if (!$normal) {
-                    $productGuids[$key] = $name;
+                    $productGuids[$key] = $data['name'];
                 }
             }
         }
diff --git a/erp24/views/shift-transfer/_transfer.php b/erp24/views/shift-transfer/_transfer.php
index bd721647..f69332c2 100644
--- a/erp24/views/shift-transfer/_transfer.php
+++ b/erp24/views/shift-transfer/_transfer.php
@@ -17,7 +17,6 @@ echo \kartik\grid\GridView::widget([
         'allModels' => $shiftTransfer->shiftRemains,
         'pagination' => false,
     ]),
-//                'showFooter' => true,
     'columns' => [
         ['class' => 'yii\grid\SerialColumn'],
         [
@@ -25,10 +24,10 @@ echo \kartik\grid\GridView::widget([
             'label' => 'Продукт',
             'pageSummary' => 'Итого:',
             'value' => function($data) {
-                $products = ArrayHelper::map(Products1c::find()->select(['id', 'name'])
-                    ->where(['id' => $data['product_guid']])->all(), 'id', 'name');
+                $products = Products1c::find()->select(['id', 'name', 'articule'])
+                    ->where(['id' => $data['product_guid']])->indexBy('id')->asArray()->all();
 
-                return ($products[$data['product_guid']] ?? '') . ' (' . ($data['retail_price'] ?? '') . ' руб.)';
+                return ($products[$data['product_guid']]['name'] ?? '') . ' (арт.' . ($products[$data['product_guid']]['articule'] ?? '') . ')';
             },
         ],
         [
@@ -68,14 +67,14 @@ echo \kartik\grid\GridView::widget([
                 return number_format($data['remains_summ'] ?? '', 2, '.', ' ');
             },
         ],
-        [
-            'attribute'  => 'self_cost',
-            'label' => 'Себестоимость, руб',
-            'pageSummary' => true,
-            'value' => function($data) {
-                return number_format($data['self_cost'] ?? '', 2, '.', ' ');
-            },
-        ],
+//        [
+//            'attribute'  => 'self_cost',
+//            'label' => 'Себестоимость, руб',
+//            'pageSummary' => true,
+//            'value' => function($data) {
+//                return number_format($data['self_cost'] ?? '', 2, '.', ' ');
+//            },
+//        ],
     ],
     'layout' => '{items}',
     'showPageSummary' => true,
-- 
2.39.5