ERP-85 Реализовать обмен данных с 1С Бухгалтерия

diff --git a/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php b/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php
index 8dd2ad024fe6637123488217d783d30c6cb19507..d229169b02c59dec2f73e19f29e12c6de660d4e4 100644 (file)
--- a/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php
+++ b/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php
@@ -67,17 +67,24 @@ try {
             $schedulerTaskLog->save();
         }
 
-        $motivationGroup = MotivationValueGroup::findOne(['alias' => 'week' . Motivation::getWeek()]);
+        $month = MotivationBuh::find()
+            ->select('id')
+            ->andWhere(['month' => intval(date('m'))])
+            ->andWhere(['year' => intval(date('Y'))])
+            ->asArray()
+            ->column();
+
 
         $motivationBuhValue = MotivationBuhValue::find()
-            ->andWhere(['motivation_group_id' => $motivationGroup->id])
-            ->groupBy('store_id, value_id, motivation_buh_id')
+            ->andWhere(['motivation_buh_id' => $month])
+            ->groupBy('store_id, value_id, motivation_buh_id, motivation_group_id')
             ->select([
                 new Expression(
                     'sum(value_float) as value_float, 
                     motivation_buh_id as motivation_buh_id, 
                     value_id as value_id,
-                    store_id as store_id'
+                    store_id as store_id,
+                    motivation_group_id as motivation_group_id'
                 )
             ])
             ->all();
@@ -104,7 +111,7 @@ try {
             $motivationValue = new MotivationValue();
             $motivationValue->setAttributes([
                 'motivation_id' => $motivation->id,
-                'motivation_group_id' => $motivationGroup->id,
+                'motivation_group_id' => $value->id,
                 'value_id' => $value->value_id,
                 'value_type' => MotivationCostsItem::DATA_TYPE_FLOAT,
                 'value_float' => $value->value_float,