[ERP-130] изменена формула себестоимости

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index 9abba21656327d33a693142695d5d60583141f1b..90a9a6a5eb2549fb067cf799d9d1c0b9edbcf5c5 100644 (file)
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -459,7 +459,7 @@ class MotivationService
             }
 
             if ($exportImportTable) {
-                $writeOffs = WriteOffs::find()->alias('wo')->select(['wo.type', 'wo.date', 'wop.product_id', 'wop.quantity', 'wop.summ'])
+                $writeOffs = WriteOffs::find()->alias('wo')->select(['wo.type', 'wo.date', 'wop.product_id', 'wop.quantity', 'wop.price'])
                     ->rightJoin('write_offs_products wop', 'wop.write_offs_id = wo.id')
                     ->where(['between', 'wo.date', $weekStart, $weekEnd])
                     ->andWhere(['wo.store_id' => $exportImportTable->export_val])
@@ -482,7 +482,7 @@ class MotivationService
                             continue;
                         }
                         $value = ($selfCostProductMap[date("Y-m-d", strtotime($data['date']))][$data['product_id']] ?? 0) * ($data['quantity'] ?? 0);
-                        $sum += $value > 0 ? $value : ($data['summ'] ?? 0);
+                        $sum += $value > 0 ? $value : ($data['price'] ?? 0) * ($data['quantity'] ?? 0);
                     }
 
                     $motivationItemType = MotivationCostsItem::writeOffsToMotivationItemMap($key);