From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 19 Dec 2024 10:21:32 +0000 (+0300)
Subject: Коды ошибок
X-Git-Tag: 1.7~130^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b44020a49fa4374bccd452339d584b5a68507d5b;p=erp24_rep%2Fyii-erp24%2F.git

Коды ошибок
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 525eee59..c40518af 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -416,6 +416,13 @@ class DataController extends BaseController {
 
                 foreach ($waybillWriteOffs as $row) {
                     $waybillProductsRow = $waybillWriteOffProducts[$row['id']] ?? [];
+                    if (!empty($waybillProductsRow)) {
+                        $key = array_search($row['id'], $waybillWriteOffIds);
+                        if ($key !== false) {
+                            unset($waybillWriteOffIds[$key]);
+                        }
+                        continue;
+                    }
                     $cause = 'Документ ревизии при передаче смены в ERP ' . $row['number'];
                     $writeOffResult[] = [
                         'id' => $row['guid'],
@@ -1062,7 +1069,7 @@ class DataController extends BaseController {
                                 if ($writeOffsErp->getErrors()) {
                                     LogService::apiErrorLog(
                                         json_encode(
-                                            ["error_id" => 11, "error" => $writeOffsErp->getErrors()],
+                                            ["error_id" => 11.1, "error" => $writeOffsErp->getErrors()],
                                             JSON_UNESCAPED_UNICODE
                                         )
                                     );
@@ -1076,7 +1083,7 @@ class DataController extends BaseController {
                                 if ($waybillWriteOffsErp->getErrors()) {
                                     LogService::apiErrorLog(
                                         json_encode(
-                                            ["error_id" => 11, "error" => $waybillWriteOffsErp->getErrors()],
+                                            ["error_id" => 11.2, "error" => $waybillWriteOffsErp->getErrors()],
                                             JSON_UNESCAPED_UNICODE
                                         )
                                     );
@@ -1093,7 +1100,7 @@ class DataController extends BaseController {
                                     LogService::apiErrorLog(
                                         json_encode(
                                             [
-                                                "error_id" => 11,
+                                                "error_id" => 11.3,
                                             "error" => $writeOffsErp->getErrors()
                                             ],
                                             JSON_UNESCAPED_UNICODE
@@ -1110,7 +1117,7 @@ class DataController extends BaseController {
                                     LogService::apiErrorLog(
                                         json_encode(
                                             [
-                                                "error_id" => 11,
+                                                "error_id" => 11.4,
                                                 "error" => $waybillWriteOffsErp->getErrors()
                                             ],
                                             JSON_UNESCAPED_UNICODE
@@ -1257,7 +1264,7 @@ class DataController extends BaseController {
                             $writeOffsErp->number_1c = $arr["number"];
                             $writeOffsErp->save();
                             if ($writeOffsErp->getErrors()) {
-                                LogService::apiErrorLog(json_encode(["error_id" => 11, "error" => $writeOffsErp->getErrors()], JSON_UNESCAPED_UNICODE));
+                                LogService::apiErrorLog(json_encode(["error_id" => 11.6, "error" => $writeOffsErp->getErrors()], JSON_UNESCAPED_UNICODE));
                             }
                         } else {
                             $waybillWriteOffsErp = WaybillWriteOffs::find()->where(['guid' => $arr["id"]])->one();
@@ -1267,7 +1274,7 @@ class DataController extends BaseController {
                                 $waybillWriteOffsErp->save();
                                 if ($waybillWriteOffsErp->getErrors()) {
                                     LogService::apiErrorLog(
-                                        json_encode(["error_id" => 11, "error" => $waybillWriteOffsErp->getErrors()],
+                                        json_encode(["error_id" => 11.7, "error" => $waybillWriteOffsErp->getErrors()],
                                             JSON_UNESCAPED_UNICODE)
                                     );
                                 }