From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 16 Oct 2025 13:50:36 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_erp-484_upload_data_to_queue
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=64a92a23021f86c6d51b053db909be9d0b803055;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_erp-484_upload_data_to_queue

# Conflicts:
#	erp24/api2/controllers/DataController.php
---

64a92a23021f86c6d51b053db909be9d0b803055
diff --cc erp24/api2/controllers/DataController.php
index 37d03d4a,25474724..febd38ff
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@@ -8,8 -8,9 +8,10 @@@ use Yii
  use yii\helpers\ArrayHelper;
  use yii\helpers\Json;
  use yii_app\helpers\ClientHelper;
+ use yii_app\helpers\DataHelper;
+ use yii_app\helpers\DateHelper;
  use yii_app\helpers\SalaryHelper;
 +use yii_app\jobs\SendRequestUploadDataToJob;
  use yii_app\records\Admin;
  use yii_app\records\AdminGroup;
  use yii_app\records\AnalystsBusinessOperations;
@@@ -989,12 -1024,15 +1024,12 @@@ class DataController extends BaseContro
                  PHP_EOL . 'result empty', FILE_APPEND);
              return $this->asJson(['error' => ['code' => 400, 'message' => 'result empty']]);
          }
 -        $mess['request'] = $result;
 -        $requestIdText = '';
 +
          if (!empty($result["request_id"])) {
 -            $requestIdText = $result["request_id"];
              $fl = "request_id_" . $result["request_id"];
          } else {
-             $fl = time();
+             $fl = DataHelper::getRequestId();
          }
 -        //InfoLogService::setInfoLog(__FILE__, __LINE__, 'upload_' . $fl . '.json' , 'info_id_25_1');
  
          file_put_contents(self::OUT_DIR . '/upload_' . $fl . '.json', PHP_EOL . $request);