From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Wed, 18 Dec 2024 21:29:38 +0000 (+0300)
Subject: replacement fix
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2Ffeature_filippov_20241218_replacement_fix;p=erp24_rep%2Fyii-erp24%2F.git

replacement fix
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index c6273662..5bb507d3 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -585,6 +585,20 @@ class DataController extends BaseController {
                     }
                 }
 
+                $replacementInvoiceTemp = $replacementInvoice;
+                foreach ($replacementInvoiceTemp as $key => $row) {
+                    $replacementInvoiceProductsRow = [];
+                    if (!isset($replacementInvoice[$key]['items'])) {
+                        $replacementInvoice[$key]['items'] = [];
+                    }
+                    if (array_key_exists($row['id'], $replacementInvoiceProducts)) {
+                        $replacementInvoiceProductsRow = $replacementInvoiceProducts[$row['id']];
+                    }
+                    if (!empty($replacementInvoiceProductsRow)) {
+                        $replacementInvoice[$key]['items'] = $replacementInvoiceProductsRow;
+                    }
+                }
+
                 foreach ($replacementInvoice as $row) {
                     $cause = 'Документ пересортица при передаче смены в ERP ' . $row['number'];
                     $replacementInvoiceResult[] = [
@@ -601,7 +615,7 @@ class DataController extends BaseController {
         } catch (Exception $e3) {
             file_put_contents(self::OUT_DIR . '/log_created_replacement_invoice_error.txt', PHP_EOL . date("d.m.Y H:i:s", time()) . $e3->getMessage() . ' file: ' . $e3->getFile() . ' line: ' . $e3->getLine(), FILE_APPEND);
         }
-        return compact('replacementInvoice', 'replacementInvoicesIds', 'replacementInvoiceResult');
+        return compact('replacementInvoice', 'replacementInvoiceIds', 'replacementInvoiceResult');
     }