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

diff --git a/erp24/records/EqualizationRemains.php b/erp24/records/EqualizationRemains.php
index e191d9cf2ab29e815b9b98ad5ee425ad756b50bb..eedbebf3fa6bdabc61c020400a88be99cf04ae81 100644 (file)
--- a/erp24/records/EqualizationRemains.php
+++ b/erp24/records/EqualizationRemains.php
@@ -120,7 +120,7 @@ class EqualizationRemains extends \yii\db\ActiveRecord
             $equalizationRemain->setAttributes([
                 'shift_transfer_id' => $shift_transfer_id,
                 'product_id' => $er['product_id'],
-                'product_count' => $er['product_replacement_count'],
+                'product_count' => $er['product_count'],
                 'product_price' => $er['product_price'],
                 'product_self_cost' => $er['product_self_cost'],
                 'product_replacement_id' => $productReplacementId,

diff --git a/erp24/records/WaybillWriteOffsProducts.php b/erp24/records/WaybillWriteOffsProducts.php
index 87173039a1c3e9db30e22149b68403bb11da56ef..ff7a933d4aa4a865f1e91690fd788e4e0a05202f 100644 (file)
--- a/erp24/records/WaybillWriteOffsProducts.php
+++ b/erp24/records/WaybillWriteOffsProducts.php
@@ -78,6 +78,8 @@ class WaybillWriteOffsProducts extends \yii\db\ActiveRecord
             ->select('SUM(product_replacement_count) as sum')
             ->scalar();
 
+            $count = $itemCount;
+
             if ($er) {
                 if ($er == $itemCount) {
                     continue;
@@ -86,9 +88,6 @@ class WaybillWriteOffsProducts extends \yii\db\ActiveRecord
                 if ($itemCount > $er) {
                     $count = $itemCount - $er;
                 }
-
-            } else {
-                $count = $itemCount;
             }
 
             $model = new self();