Проверка на статусы

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 97299e18014356c261b9705dee8a70f8ba59ee7f..866807531c51942318ba404c9446ac57e4248bdf 100644 (file)
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -1746,17 +1746,18 @@ class CronController extends Controller
         $cache    = Yii::$app->cache;
         $task     = $cache->get($cacheKey);
 
-        /*if (!$task) {
-            $scriptLauncherLog = ScriptLauncherLog::find()
+        $scriptLauncherLog = ScriptLauncherLog::find()
                 ->andWhere(['name' => "taskApRecalculate"])
                 ->orderBy(['created_at' => SORT_DESC])
                 ->asArray()
                 ->limit(1)
                 ->one();
-            if ($scriptLauncherLog && $scriptLauncherLog['active'] == 1) {
-                $task = json_decode($scriptLauncherLog['context'], true );
+            if ($scriptLauncherLog && $scriptLauncherLog['active'] == 1 && $scriptLauncherLog['status'] == 1) {
+                //$task = json_decode($scriptLauncherLog['context'], true );
+                $this->stdout("Задача уже запущена {$task['startTime']}\n");
+                return ExitCode::OK;
             }
-        }*/
+
 
         //$this->stdout(json_encode($task, JSON_UNESCAPED_UNICODE));
         if (!is_array($task) || empty($task['taskName']) || $task['taskName'] !== 'apRecalculateTask') {
@@ -1791,6 +1792,7 @@ class CronController extends Controller
             $log->year = (int)$task['year'];
             $log->month = (int)$task['month'];
             $log->active = 1;
+            $log->status = 1;
             $log->date_start = date('Y-m-d H:i:s');
             if (!$log->save()) {
                 Yii::error(json_encode($log->getErrors(), JSON_UNESCAPED_UNICODE));
@@ -1920,7 +1922,7 @@ class CronController extends Controller
                 $log->progress = 100;
                 $log->active = 0;
                 $log->date_finish = date('Y-m-d H:i:s');
-                $log->status = 1;
+                $log->status = 2;
                 if (!$log->save()) {
                     Yii::error(json_encode($log->getErrors(), JSON_UNESCAPED_UNICODE));
                     LogService::apiErrorLog(json_encode(["error_id" => 8, "error" => $log->getErrors()], JSON_UNESCAPED_UNICODE));

diff --git a/erp24/web/css/category-plan/style.css b/erp24/web/css/category-plan/style.css
index 9be4e0ebdccb43314164094587841223cb60bd47..238a55eb790219e620921c6441a50d3bf725e5b4 100644 (file)
--- a/erp24/web/css/category-plan/style.css
+++ b/erp24/web/css/category-plan/style.css
@@ -8,7 +8,7 @@
     top: 0; left: 0;
     width: 100%;
     height: 100%;
-    background: rgba(255, 255, 255, 0.3);
+    background: rgba(180, 180, 180, 0.3);
     z-index: 9999;
     pointer-events: all;
     filter: blur(1px);