From e9124f585a7c2e56c69b1e593d615fd5c09a4279 Mon Sep 17 00:00:00 2001
From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Mon, 6 May 2024 12:42:07 +0300
Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
 =?utf8?q?=D0=BE=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D1=83=20=D0=B7?=
 =?utf8?q?=D0=B0=D1=80=D0=BF=D0=BB=D0=B0=D1=82=D0=BD=D0=BE=D0=B9=20=D0=B2?=
 =?utf8?q?=D0=B5=D0=B4=D0=BE=D0=BC=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/commands/AssignmentController.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/erp24/commands/AssignmentController.php b/erp24/commands/AssignmentController.php
index 0ecf8e5c..b50b3ba8 100644
--- a/erp24/commands/AssignmentController.php
+++ b/erp24/commands/AssignmentController.php
@@ -32,6 +32,7 @@ class AssignmentController extends Controller
         $errors = [];
         $decodeString = '-';
         $uploadArrayInfo = [];
+        $alreadyStart = 0;
 
         $val = Yii::$app->cache->get("addAssignmentTask");
 
@@ -42,10 +43,21 @@ class AssignmentController extends Controller
             if (array_key_exists('taskName', $uploadArrayInfo)){
                 if ($uploadArrayInfo['taskName'] === 'payrollMake') {
 
+                    $scriptLauncherLog = ScriptLauncherLog::find()->andWhere(['name' => 'taskPayrollMake'])->orderBy(['created_at' => SORT_DESC])->asArray()->limit(1)->one();
+                    if ($scriptLauncherLog['active'] == 1) {
+                        $alreadyStart = 1;
+                        $errorText = 'Процесс формирования ведомости уже запущен в ' . $scriptLauncherLog['date_start'];
+                        $errorText . ' сформированно ' . $scriptLauncherLog['progress'] . '%';
+                        $errorText .= '<br> Дождитесь окончания либо сообщите об ошибке <br> Попробуйте перезагрузить страницу  ';
+                        $errors[] = $errorText;
+                        Yii::$app->cache->delete("addAssignmentTask");
+                        return 'ok';
+                    }
+
                     if (!empty($uploadArrayInfo['start'])) {
                         $start = $uploadArrayInfo['start'];
 //                        $startCheck = time() - 180;
-                        $startCheck = time() - 7200;
+                        $startCheck = time() - 86000;
                         if ($start < $startCheck) {
                             echo time();
                             echo ' ';
@@ -94,7 +106,7 @@ class AssignmentController extends Controller
                 ($uploadArrayInfo['taskName'] === 'payrollMake')
             ) {
                 Yii::$app->cache->set("addAssignmentTask", false);
-                $text = "В назначенных заданиях есть изменения. Продолжаю выполнение...";
+                $text = date('Y-m_d H:i:s') . " В назначенных заданиях есть изменения. Продолжаю выполнение...";
 
                 $notInStoreIds = Admin::NOT_IN_STORE_IDS;
                 $ids = null;
@@ -268,7 +280,7 @@ class AssignmentController extends Controller
             $scriptLauncherLog->error_message = json_encode($errors, JSON_UNESCAPED_UNICODE);
             $scriptLauncherLog->error_count = count($errors);
             $scriptLauncherLog->save();
-            $text = "Ошибка запуска";
+            $text = date('Y-m-d H:i:s') . " Ошибка запуска " . $scriptLauncherLog->error_message;
         }
 
         echo $text . "\n";
-- 
2.39.5