]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
[ERP-261] name -> number_1c + held
authorAlexander Smirnov <fredeom@mail.ru>
Thu, 19 Dec 2024 10:30:12 +0000 (13:30 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Thu, 19 Dec 2024 10:30:12 +0000 (13:30 +0300)
erp24/api2/controllers/DataController.php

index c6273662df0e715d258a3e3da8a0abd19f4049a7..36a578d6c77eb0f15ae55d7fee6c8d6e8bf6e89b 100644 (file)
@@ -1192,25 +1192,24 @@ class DataController extends BaseController {
                                     }
                                 }
                             }
-                            if (!empty($waybillIncoming)) {
-                                /** @var WaybillIncoming $waybillIncoming */
-                                $waybillIncoming->status = WriteOffsErp::STATUS_ERROR_1С;
-                                $waybillIncoming->error_text = $errorText;
-                                $waybillIncoming->save();
-                                if ($waybillIncoming->getErrors()) {
-                                    LogService::apiErrorLog(
-                                        json_encode(
-                                            ["error_id" => 11.5, "error" => $waybillIncoming->getErrors()],
-                                            JSON_UNESCAPED_UNICODE
-                                        )
-                                    );
-                                }
+
+                            /** @var WaybillIncoming $waybillIncoming */
+                            $waybillIncoming->status = WriteOffsErp::STATUS_ERROR_1С;
+                            $waybillIncoming->error_text = $errorText;
+                            $waybillIncoming->save();
+                            if ($waybillIncoming->getErrors()) {
+                                LogService::apiErrorLog(
+                                    json_encode(
+                                        ["error_id" => 11.5, "error" => $waybillIncoming->getErrors()],
+                                        JSON_UNESCAPED_UNICODE
+                                    )
+                                );
                             }
                         } else {
-                            if (!empty($waybillIncoming)) {
+                            if (isset($arr["held"]) && $arr["held"]) {
                                 /** @var WaybillIncoming $waybillIncoming */
                                 $waybillIncoming->status = WriteOffsErp::STATUS_CREATED_1С;
-                                $waybillIncoming->number_1c = $arr["number"] ?? '';
+                                $waybillIncoming->number_1c = $arr["name"] ?? '';
                                 $waybillIncoming->save();
                                 if ($waybillIncoming->getErrors()) {
                                     LogService::apiErrorLog(