From cb61dbb76d09103ed76302cb507b12d3376ecb51 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 18 Dec 2024 12:29:22 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?utf8?q?=D1=81=D0=BC=D0=B5=D0=BD=D1=83=20=D1=81=D1=82=D0=B0=D1=82=D1=83?=
 =?utf8?q?=D1=81=D0=B0=20=D0=B2=20$result['write=5Foffs']=20=D0=B4=D0=BB?=
 =?utf8?q?=D1=8F=20waybill=5Fwrite=5Foffs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/DataController.php | 59 +++++++++++++++--------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index f8ed5f60..7819bccf 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -1028,12 +1028,25 @@ class DataController extends BaseController {
                     if (empty($arr["error"]) && !empty($arr["id"])) {
                         $writeOffsErp = WriteOffsErp::find()->where(['guid' => $arr["id"]])->one();
                         if ($writeOffsErp) {
-                            $writeOffsErp->status = 4;
+                            $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));
                             }
+                        } else {
+                            $waybillWriteOffsErp = WaybillWriteOffs::find()->where(['guid' => $arr["id"]])->one();
+                            if ($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)
+                                    );
+                                }
+                            }
                         }
                     }
 
@@ -1989,25 +2002,29 @@ class DataController extends BaseController {
 
 
 
-    private function insertDataSales($values, $tableName, $columns, $chunks = 1000 ) {
-    $chunkValues = array_chunk($values, $chunks);
-
-    foreach ($chunkValues as $key => $rows) {
-
-        try {
-            $transaction = \Yii::$app->db->beginTransaction();
-            Yii::$app->db->createCommand()->batchInsert($tableName, $columns, $rows)->execute();
-            $transaction->commit();
-        } catch (Exception $e) {
-            $errorString = substr($e->getMessage(), 0, 2000);
-            file_put_contents(self::OUT_DIR . '/error_upload.txt',
-                PHP_EOL . $errorString, FILE_APPEND);
-            $transaction->rollBack();
-            InfoLogService::setInfoLog(__FILE__, __LINE__, $tableName , 'error_id_25');
-            InfoLogService::setInfoLog(__FILE__, __LINE__, $errorString , 'error_id_25_22');
-            LogService::apiErrorLog(json_encode(["error_id" => 25, "error" => $errorString], JSON_UNESCAPED_UNICODE));
-
+    private function insertDataSales($values, $tableName, $columns, $chunks = 1000)
+        {
+            $chunkValues = array_chunk($values, $chunks);
+
+            foreach ($chunkValues as $key => $rows) {
+                try {
+                    $transaction = \Yii::$app->db->beginTransaction();
+                    Yii::$app->db->createCommand()->batchInsert($tableName, $columns, $rows)->execute();
+                    $transaction->commit();
+                } catch (Exception $e) {
+                    $errorString = substr($e->getMessage(), 0, 2000);
+                    file_put_contents(
+                        self::OUT_DIR . '/error_upload.txt',
+                        PHP_EOL . $errorString,
+                        FILE_APPEND
+                    );
+                    $transaction->rollBack();
+                    InfoLogService::setInfoLog(__FILE__, __LINE__, $tableName, 'error_id_25');
+                    InfoLogService::setInfoLog(__FILE__, __LINE__, $errorString, 'error_id_25_22');
+                    LogService::apiErrorLog(
+                        json_encode(["error_id" => 25, "error" => $errorString], JSON_UNESCAPED_UNICODE)
+                    );
+                }
+            }
         }
-    }
-    }
 }
-- 
2.39.5