From 33ea489e4bc734b799e326baa087ccdbc3848cbc Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 4 Sep 2024 16:20:42 +0300 Subject: [PATCH] =?utf8?q?[ERP-130]=20=D0=92=20=D1=81=D0=BB=D1=83=D1=87?= =?utf8?q?=D0=B0=D0=B5=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2?= =?utf8?q?=D0=B8=D1=8F=20=D1=81=D0=B5=D0=B1=D0=B5=D1=81=D1=82=D0=BE=D0=B8?= =?utf8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?utf8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D0=BC=20summ=20=D0=BE=D1=82=20=D0=BF?= =?utf8?q?=D1=80=D0=BE=D0=B4=D1=83=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index 5186306a..9abba216 100644 --- 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']) + $writeOffs = WriteOffs::find()->alias('wo')->select(['wo.type', 'wo.date', 'wop.product_id', 'wop.quantity', 'wop.summ']) ->rightJoin('write_offs_products wop', 'wop.write_offs_id = wo.id') ->where(['between', 'wo.date', $weekStart, $weekEnd]) ->andWhere(['wo.store_id' => $exportImportTable->export_val]) @@ -481,7 +481,8 @@ class MotivationService if (($data['type'] ?? '') != $key) { continue; } - $sum += ($selfCostProductMap[date("Y-m-d", strtotime($data['date']))][$data['product_id']] ?? 0) * ($data['quantity'] ?? 0); + $value = ($selfCostProductMap[date("Y-m-d", strtotime($data['date']))][$data['product_id']] ?? 0) * ($data['quantity'] ?? 0); + $sum += $value > 0 ? $value : ($data['summ'] ?? 0); } $motivationItemType = MotivationCostsItem::writeOffsToMotivationItemMap($key); -- 2.39.5