From 63427c6cf9c5fb9cf17114da5ec3f0c22fc3b147 Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 9 Dec 2024 12:22:09 +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/controllers/ShiftTransferController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php index e670a75d..fc130e81 100644 --- a/erp24/controllers/ShiftTransferController.php +++ b/erp24/controllers/ShiftTransferController.php @@ -268,7 +268,13 @@ class ShiftTransferController extends Controller $admins = ArrayHelper::map(Admin::find()->all(), 'id', 'name'); - $products = ArrayHelper::map(Products1c::findAll(['id' => ShiftRemains::find()->where(['shift_transfer_id' => $id])->select('product_guid')->column()]), 'id', 'name'); + $products = ArrayHelper::map( + Products1c::findAll(['id' => + ShiftRemains::find() + ->andWhere(['shift_transfer_id' => $id]) + ->andWhere(['<', 'fact_and_1c_diff', 0]) + ->select('product_guid')->column()]), + 'id', 'name'); return $this->render('view', compact('shiftTransfer', 'storeNameById', 'admins', 'products')); @@ -296,7 +302,7 @@ class ShiftTransferController extends Controller ->andWhere(['guid' => $productGuid]) ->andWhere(['guid_replacement' => ShiftRemains::find() ->andWhere(['shift_transfer_id' => $shiftTransferId]) - ->andWhere(['<>', 'fact_and_1c_diff', 0]) + ->andWhere(['>', 'fact_and_1c_diff', 0]) ->select('product_guid') ->column()]) ->select(['guid_replacement']) -- 2.39.5