From e72ea3ed5e854aafd248f6fd677bd62b8d72fbc7 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 14 May 2025 15:17:02 +0300
Subject: [PATCH] =?utf8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8?=
 =?utf8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B5=D0=B4=D1=81?=
 =?utf8?q?=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/AutoPlannogrammaService.php        | 10 ++++++----
 erp24/views/auto-plannogramma/control-species.php |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php
index d236060a..23136f75 100644
--- a/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@ -1010,13 +1010,13 @@ var_dump($totals); die();
                 $weekRanges[] = [
                     'index' => (int)date('W', $wkStart),
                     'start' => date('Y-m-d H:i:s', $wkStart),
-                    'end'   => date('Y-m-d H:i:s', $wkEnd),
+                    'end'   => date('Y-m-d 23:59:59', $wkEnd),
                 ];
             }
         }
 
         $result = [];
-
+        //var_dump($weekRanges, $dateFrom); die();
         foreach ($weekRanges as $range) {
             $exprWeek = new Expression((string)$range['index']);
             $query = (new Query())->select([
@@ -1069,6 +1069,7 @@ var_dump($totals); die();
                     'sum'         => (float)$row['total_sum'],
                 ];
             }
+           // var_dump($result, $range['start'], $range['end']); die();
         }
 
         return $result;
@@ -1099,11 +1100,12 @@ var_dump($totals); die();
         $year  = (int)$yearStr;
 
         $historical = [];
-        for ($yr = $year-2; $yr < $year; $yr++) {
+        for ($yr = $year - 2; $yr < $year; $yr++) {
             $mYear = sprintf('%02d-%d', $month, $yr);
             $weeklyData = $this->getWeeklySpeciesDataForMonth(
                 $mYear, $filters, $productFilter, $type
             );
+           // var_dump($weeklyData, $mYear); die();
             foreach ($weeklyData as $row) {
                 $week     = $row['week'];
                 $sid      = $row['store_id'];
@@ -1120,7 +1122,7 @@ var_dump($totals); die();
                     ($historical[$week][$sid][$cat][$sub][$spec] ?? 0) + $sumWeek;
             }
         }
-
+        //var_dump($historical); die();
         $dateFrom = sprintf('%04d-%02d-01 00:00:00', $year, $month);
         $dateTo   = date('Y-m-d H:i:s', strtotime("$dateFrom +1 month -1 second"));
         $monthWeighted = $this->getMonthSpeciesShareOrWriteOffWeighted(
diff --git a/erp24/views/auto-plannogramma/control-species.php b/erp24/views/auto-plannogramma/control-species.php
index d2aa7711..98e80236 100644
--- a/erp24/views/auto-plannogramma/control-species.php
+++ b/erp24/views/auto-plannogramma/control-species.php
@@ -22,7 +22,7 @@ use yii_app\records\Products1c;
 ?>
 
 <div class="control-species p-4">
-    <h1>Проверка продаж/списаний по видам</h1>
+    <h1>Проверка списаний по видам</h1>
 
     <?php $form = ActiveForm::begin(['method' => 'post']); ?>
 
@@ -36,7 +36,7 @@ use yii_app\records\Products1c;
 
     <?= $form->field($model, 'type')
     ->radioList([
-    'sales'    => 'Продажи',
+    //'sales'    => 'Продажи',
     'writeOffs'=> 'Списания',
     ])
     ->label('Тип данных') ?>
@@ -50,7 +50,7 @@ use yii_app\records\Products1c;
 
 
     <?php if (!empty($weeksData)): ?>
-        <h2>Результаты по неделям</h2>
+        <h2>Результаты расчетов списаний видов по неделям</h2>
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
@@ -105,7 +105,7 @@ use yii_app\records\Products1c;
         </table>
     <?php endif; ?>
     <?php if (!empty($weeksProductForecast)): ?>
-        <h2>Прогноз по неделям по неделям</h2>
+        <h2>Прогноз списаний товаров по неделям </h2>
     <table class="table table-bordered table-striped">
         <thead>
         <tr>
-- 
2.39.5