From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 13 Dec 2024 15:00:21 +0000 (+0300)
Subject: Проблема копипасты
X-Git-Tag: 1.7~166^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=db6fa7d4ac18604d98351889db9494297779cfd6;p=erp24_rep%2Fyii-erp24%2F.git

Проблема копипасты
---

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 4c1e8b96..fb0cdf2b 100644
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -171,6 +171,10 @@ class ShiftTransferController extends Controller
                     empty($postShiftTransfer['groups2']) ? [] : $postShiftTransfer['groups2']), $postShiftTransfer['store_guid']);
                 $loadDataShiftRemains = $data['loadDataShiftRemains'];
                 $productGuids = $data['productGuids'];
+
+                $data2 = self::buildLoadDataShiftRemains(array_merge(empty($postShiftTransfer['groups1']) ? [] : $postShiftTransfer['groups1'],
+                    empty($postShiftTransfer['groups2']) ? [] : $postShiftTransfer['groups2']), $postShiftTransfer['store_guid'], false);
+                $productGuidsUnnormal = $data2['productGuids'];
             } else {
                 $loadDataShiftRemains = ArrayHelper::getValue($postShiftTransfer, 'shiftRemainsCopy');
 
@@ -216,6 +220,9 @@ class ShiftTransferController extends Controller
             $data = self::buildLoadDataShiftRemains(explode(',', $shiftTransfer->product_groups), $shiftTransfer->store_guid);
             $productGuids = $data['productGuids'];
             $shiftTransfer->setGroups();
+
+            $data2 = self::buildLoadDataShiftRemains(explode(',', $shiftTransfer->product_groups), $shiftTransfer->store_guid, false);
+            $productGuidsUnnormal = $data2['productGuids'];
         }
 
         $isCreate = false;
@@ -230,9 +237,6 @@ class ShiftTransferController extends Controller
 
         $shiftTransfer->shiftRemainsCopy = $loadDataShiftRemains ?? $shiftTransfer->shiftRemains;
 
-        $data = self::buildLoadDataShiftRemains($shiftTransfer->groups2, $firstId, false);
-        $productGuidsUnnormal = $data['productGuids'];
-
         $existingKeys = ArrayHelper::getColumn($shiftTransfer->shiftRemainsCopy, 'product_guid');
         $productGuidsForRest = [];
         foreach ($productGuidsUnnormal as $key => $value) {