From 8bb0781c7733ff939c55d12ccdaa3801d72ef4a3 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 6 Dec 2024 16:39:20 +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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/erp24/records/EqualizationRemains.php b/erp24/records/EqualizationRemains.php index b129232c..7f109b21 100644 --- 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(); -- 2.39.5