From 02c3130025a7b031036db6a552c636366ac8796e Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Tue, 17 Dec 2024 11:03:26 +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 | 5 +++--
 erp24/web/js/shift-transfer/replacement.js    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 04b3beed..8c365ed8 100644
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -349,6 +349,7 @@ class ShiftTransferController extends Controller
         try {
             $productPrice = Prices::findOne(['product_id' => $productGuid]);
             $shiftTransfer = ShiftTransfer::findOne($shiftTransferId);
+            $shiftRemains = ShiftRemains::findOne(['shift_transfer_id' => $shiftTransferId, 'product_guid' => $productGuid]);
             $storeId = array_flip(array_map('strval', CityStore::getAllActiveGuidId()))[$shiftTransfer->store_guid];
             $productSelfCost = SelfCostProduct::findOne(['product_guid' => $productGuid, 'date' => $shiftTransfer->date, 'store_id' => $storeId]);
 
@@ -369,13 +370,13 @@ class ShiftTransferController extends Controller
                 return $model->name . ' (арт. ' . $model->articule . ')';
             });
 
-
-            if (!$productPrice || !$productReplacement || !$productSelfCost) {
+            if (!$productPrice || !$productReplacement || !$productSelfCost || !$shiftRemains) {
                 throw new \Exception('У данного товара нет цены либо замен!');
             }
 
             $data = [
                 'success' => true,
+                'product_count' => $shiftRemains->fact_and_1c_diff,
                 'product_price' => $productPrice->price,
                 'product_replacement' => $productReplacement,
                 'product_self_cost' => $productSelfCost->price,
diff --git a/erp24/web/js/shift-transfer/replacement.js b/erp24/web/js/shift-transfer/replacement.js
index 55810326..1a113750 100644
--- a/erp24/web/js/shift-transfer/replacement.js
+++ b/erp24/web/js/shift-transfer/replacement.js
@@ -39,6 +39,7 @@ function setProductData() {
             const index = $this.closest('tr').data('index');
             document.querySelector(`#shifttransfer-equalizationremains-${index}-product_replacement_count`).value = '';
             $('#shifttransfer-equalizationremains-' + index + '-product_price').val(data.product_price);
+            $(`#shifttransfer-equalizationremains-${index}-product_count`).val(data.product_count);
 
             const replacementSelect = $('#shifttransfer-equalizationremains-' + index + '-product_replacement_id');
             replacementSelect.empty().append('<option value="">Выберите товар</option>');
-- 
2.39.5