ERP-259 Доработка второго шага передачи смен

diff --git a/erp24/records/EqualizationRemains.php b/erp24/records/EqualizationRemains.php
index b129232c2cff27c8a7c9cf31b039126f79b50ae7..7f109b2103f838aa0d2e540bb9360e1ea6ef75bf 100644 (file)
--- a/erp24/records/EqualizationRemains.php
+++ b/erp24/records/EqualizationRemains.php
@@ -160,7 +160,7 @@ class EqualizationRemains extends \yii\db\ActiveRecord
 
             foreach ($minus as $key => $item) {
 
-//                $count = $count ?? $item['fact_and_1c_diff'];
+                $count = $count ?? $item['fact_and_1c_diff'];
 
                 if (self::find()
                     ->select(['shift_id', 'product_replacement_id'])
@@ -195,13 +195,13 @@ class EqualizationRemains extends \yii\db\ActiveRecord
                     $model->save();
 
                     $quanity = $quanity - min($quanity, abs($item['fact_and_1c_diff']));
-//                    $count += min($quanity, abs($item['fact_and_1c_diff']));
+                    $count += min($quanity, abs($item['fact_and_1c_diff']));
 //
-//                    if ($count == 0) {
-////                        unset($intersection['fad838d9-8159-11ef-84ea-ac1f6b1b7573']);
-//                        unset($count);
-//                        break;
-//                    }
+                    if ($count == 0) {
+                        unset($minus[$key]);
+                        unset($count);
+                        break;
+                    }
                 } elseif ($model->getErrors()) {
                     var_dump($model->errors);
                     die();