From db6fa7d4ac18604d98351889db9494297779cfd6 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Fri, 13 Dec 2024 18:00:21 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0?= =?utf8?q?=20=D0=BA=D0=BE=D0=BF=D0=B8=D0=BF=D0=B0=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/ShiftTransferController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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) { -- 2.39.5