From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 18 Dec 2024 06:59:47 +0000 (+0300)
Subject: Получение из 1с
X-Git-Tag: 1.7~151^2~5
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=dd93f37f4afd5c83a6b7ca2cbda59138eecdbd4b;p=erp24_rep%2Fyii-erp24%2F.git

Получение из 1с
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 85756fb8..4297befe 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -873,9 +873,12 @@ class DataController extends BaseController {
                 foreach ($result["created_write_offs"] as $arr) {
                     if (!empty($arr["id"])) {
                         $writeOffsErp = WriteOffsErp::find()->where(['guid' => $arr["id"]])->one();
+                        if (!empty($writeOffsErp)) {
+                            $waybillWriteOffsErp = WaybillWriteOffs::find()->where(['guid' => $arr["id"]])->one();
+                        }
                     }
 
-                    if (!empty($writeOffsErp)) {
+                    if (!empty($writeOffsErp) || !empty($waybillWriteOffsErp)) {
                         if (!empty($arr["errors"]) || !empty($arr["errors_items"])) {
                             $errorText = '';
                             if (!empty($arr["errors"])) {
@@ -928,32 +931,69 @@ class DataController extends BaseController {
                                     }
                                 }
                             }
-
-                            /** @var WriteOffsErp $writeOffsErp */
-                            $writeOffsErp->status = WriteOffsErp::STATUS_ERROR_1С;
-                            $writeOffsErp->error_text = $errorText;
-                            $writeOffsErp->save();
-                            if ($writeOffsErp->getErrors()) {
-                                LogService::apiErrorLog(
-                                    json_encode(
-                                        ["error_id" => 11, "error" => $writeOffsErp->getErrors()],
-                                        JSON_UNESCAPED_UNICODE
-                                    )
-                                );
+                            if (!empty($writeOffsErp)) {
+                                /** @var WriteOffsErp $writeOffsErp */
+                                $writeOffsErp->status = WriteOffsErp::STATUS_ERROR_1С;
+                                $writeOffsErp->error_text = $errorText;
+                                $writeOffsErp->save();
+                                if ($writeOffsErp->getErrors()) {
+                                    LogService::apiErrorLog(
+                                        json_encode(
+                                            ["error_id" => 11, "error" => $writeOffsErp->getErrors()],
+                                            JSON_UNESCAPED_UNICODE
+                                        )
+                                    );
+                                }
+                            }
+                            if (!empty($waybillWriteOffsErp)) {
+                                /** @var WaybillWriteOffs $waybillWriteOffsErp */
+                                $waybillWriteOffsErp->status = WriteOffsErp::STATUS_ERROR_1С;
+                                $waybillWriteOffsErp->error_text = $errorText;
+                                $waybillWriteOffsErp->save();
+                                if ($waybillWriteOffsErp->getErrors()) {
+                                    LogService::apiErrorLog(
+                                        json_encode(
+                                            ["error_id" => 11, "error" => $waybillWriteOffsErp->getErrors()],
+                                            JSON_UNESCAPED_UNICODE
+                                        )
+                                    );
+                                }
                             }
+
                         } else {
-                            /** @var WriteOffsErp $writeOffsErp */
-                            $writeOffsErp->status = WriteOffsErp::STATUS_CREATED_1С;
-                            $writeOffsErp->number_1c = $arr["number"] ?? '';
-                            $writeOffsErp->save();
-                            if ($writeOffsErp->getErrors()) {
-                                LogService::apiErrorLog(
-                                    json_encode(
-                                        ["error_id" => 11,
-                                        "error" => $writeOffsErp->getErrors()],
-                                        JSON_UNESCAPED_UNICODE
-                                    )
-                                );
+                            if (!empty($writeOffsErp)) {
+                                /** @var WriteOffsErp $writeOffsErp */
+                                $writeOffsErp->status = WriteOffsErp::STATUS_CREATED_1С;
+                                $writeOffsErp->number_1c = $arr["number"] ?? '';
+                                $writeOffsErp->save();
+                                if ($writeOffsErp->getErrors()) {
+                                    LogService::apiErrorLog(
+                                        json_encode(
+                                            [
+                                                "error_id" => 11,
+                                                "error" => $writeOffsErp->getErrors()
+                                            ],
+                                            JSON_UNESCAPED_UNICODE
+                                        )
+                                    );
+                                }
+                            }
+                            if (!empty($waybillWriteOffsErp)) {
+                                /** @var WaybillWriteOffs $waybillWriteOffsErp */
+                                $waybillWriteOffsErp->status = WriteOffsErp::STATUS_CREATED_1С;
+                                $waybillWriteOffsErp->number_1c = $arr["number"] ?? '';
+                                $waybillWriteOffsErp->save();
+                                if ($waybillWriteOffsErp->getErrors()) {
+                                    LogService::apiErrorLog(
+                                        json_encode(
+                                            [
+                                                "error_id" => 11,
+                                                "error" => $waybillWriteOffsErp->getErrors()
+                                            ],
+                                            JSON_UNESCAPED_UNICODE
+                                        )
+                                    );
+                                }
                             }
 
                         }