ERP-224 Доработать Факт в таблице мотивации

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index 3ab5b4166f99318d4450f64a12fde55111846297..0f98f9fe6e4c74497fbbed80e2cfd74ef691946c 100644 (file)
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -217,6 +217,7 @@ class MotivationService
                     'forecast' => null,
                     'fact' => null,
                     'deviation' => null,
+                    'is_combined' => $costsItem->is_combined
                 ];
             }
 
@@ -234,8 +235,12 @@ class MotivationService
             }
 
                 $result[$costsItem->order][$groupAlias] = $actualValue;
-        }
 
+            if ($result[$costsItem->order]['is_combined'] == true
+                && (empty($result[$costsItem->order]['fact']) || $result[$costsItem->order]['fact'] == 0)) {
+                $result[$costsItem->order]['fact'] = $result[$costsItem->order]['plan'];
+            }
+        }
 
         // Подстановка значений расходных материалов
         //190 - порядок для расходных материалов