From f7cef1590097bd82658160eb6d110e256d343b3a Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 17 Dec 2024 14:38:43 +0300 Subject: [PATCH] =?utf8?q?ERP-259=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=BA=D0=B0=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE?= =?utf8?q?=20=D1=88=D0=B0=D0=B3=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?utf8?q?=D0=B0=D1=87=D0=B8=20=D1=81=D0=BC=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/EqualizationRemains.php | 2 +- erp24/records/WaybillWriteOffsProducts.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/erp24/records/EqualizationRemains.php b/erp24/records/EqualizationRemains.php index e191d9cf..eedbebf3 100644 --- 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 87173039..ff7a933d 100644 --- 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(); -- 2.39.5