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

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 04b3beeddb341e478523f19609289e11c2783123..8c365ed887c882c1bbfaa561eb50878f31f1bb85 100644 (file)
--- 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 558103267de6f409dab5ae0d2bf185c9e30f27f3..1a113750cbee12189d1eace58615fd7753822670 100644 (file)
--- 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>');