From 4f4cf19f51107a6b99fd0d826bcc8cb51e937d31 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 2 Jul 2025 12:56:03 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?utf8?q?=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8=20=D1=80=D0=B0?=
 =?utf8?q?=D0=B1=D0=BE=D1=82=D1=8B=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/commands/CronController.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 665b5bb1..91a31866 100644
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -1745,19 +1745,22 @@ class CronController extends Controller
         $cacheKey = 'apRecalculateTask';
         $cache    = Yii::$app->cache;
         $task     = $cache->get($cacheKey);
+        if ($task) {
+            $this->stdout("Задача время {$task['startTime']}\n");
+        }
 
         $scriptLauncherLog = ScriptLauncherLog::find()
-                ->andWhere(['name' => "taskApRecalculate"])
-                ->orderBy(['created_at' => SORT_DESC])
-                ->asArray()
-                ->limit(1)
-                ->one();
-            if ($scriptLauncherLog && $scriptLauncherLog['active'] == 1 && $scriptLauncherLog['status'] == 1) {
-                //$task = json_decode($scriptLauncherLog['context'], true );
-               // $cache->delete($cacheKey);
-                $this->stdout("Задача уже запущена {$task['startTime']}\n");
-                return ExitCode::OK;
-            }
+            ->andWhere(['name' => "taskApRecalculate"])
+            ->orderBy(['created_at' => SORT_DESC])
+            ->asArray()
+            ->limit(1)
+            ->one();
+        if ($scriptLauncherLog && $scriptLauncherLog['active'] == 1 && $scriptLauncherLog['status'] == 1) {
+            //$task = json_decode($scriptLauncherLog['context'], true );
+            $cache->delete($cacheKey);
+            $this->stdout("Задача уже запущена {$task['startTime']}\n");
+            return ExitCode::OK;
+        }
 
 
         //$this->stdout(json_encode($task, JSON_UNESCAPED_UNICODE));
@@ -1923,11 +1926,11 @@ class CronController extends Controller
                 $log->message = 'Finished successfully';
                 $log->progress = 100;
                 $log->active = 0;
-                $log->progress = 100;
                 $log->date_finish = date('Y-m-d H:i:s');
                 $log->status = 2;
                 if (!$log->save()) {
                     Yii::error(json_encode($log->getErrors(), JSON_UNESCAPED_UNICODE));
+                    $this->stdout(json_encode($log->getErrors()));
                     LogService::apiErrorLog(json_encode(["error_id" => 8, "error" => $log->getErrors()], JSON_UNESCAPED_UNICODE));
                 }
                 $cache->delete($cacheKey);
-- 
2.39.5