Стили и вывод

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index e31cad29c36f8fee7d620fd28f764fceab53dbdb..fe68d7f7bccdee463166c1e180023610a03d1f61 100644 (file)
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -1696,7 +1696,7 @@ class CronController extends Controller
                             'capacity_type' => 1,
                             'details' => json_encode($details, JSON_UNESCAPED_UNICODE),
                             'calculate' => $quantity,
-                            'modify' => ceil($total),
+                            'modify' => null,
                             'total' => ceil($total)
                         ]);
 

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index b57a605f869ccd9bb0b1d48d6fd67dd55095149b..449272a6d63664eae95d1ab255afab683bdb4cdd 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -149,13 +149,14 @@ class AutoPlannogrammaController extends BaseController
             }
 
             if (!empty($filters['capacity_type']) && $filters['capacity_type'] == 'min') {
-                $quantity = round((int)$model['modify'] * 0.3, 2);
+                $quantity = round(($model['modify'] ?? $model['total']) * 0.3, 2);
             } else {
-                $quantity = (int)$model['modify'];
+                $quantity = $model['modify'] ?? $model['total'];
             }
             $result[$productId]['values'][] = [
                 'id' => $model['plan_id'],
-                'quantity' => $quantity,
+                'quantity' => (int)$quantity,
+                'is_modify' => (int)$model['modify'] ? true : false,
                 'store_id' => (int)$model['store_id'],
                 'title' => !empty($model['details']) ? json_decode($model['details'], true) : null,
             ];

diff --git a/erp24/web/css/autoplannogramma/index.css b/erp24/web/css/autoplannogramma/index.css
index 76d7a68cd65dd03e88aefed53d19c36781089ac5..fd27dcc48f426b3308f9c528bdf6af2d4dafa469 100644 (file)
--- a/erp24/web/css/autoplannogramma/index.css
+++ b/erp24/web/css/autoplannogramma/index.css
@@ -5,7 +5,7 @@
 }
 
 .corrected-input-bg {
-    background-color: #9dff5b !important;
-    color: #fff !important;
-    border: 1px solid #9dff5b !important;
+    background-color: #97e67e !important;
+    color: #000 !important;
+    border: 1px solid #97e67e !important;
 }
\ No newline at end of file

diff --git a/erp24/web/js/autoplannogramma/autoplannogramma.js b/erp24/web/js/autoplannogramma/autoplannogramma.js
index 00f03c3f6cf691b73b0cd2d49e0bdebbcda0ba87..538c0396570d152f76bd59b809af5417812795f4 100644 (file)
--- a/erp24/web/js/autoplannogramma/autoplannogramma.js
+++ b/erp24/web/js/autoplannogramma/autoplannogramma.js
@@ -144,9 +144,11 @@ $('.subcategory .list-group-item').on('click', function (e) {
                     {
                         quantity: val.quantity || 0,
                         id: val.id || '',
-                        title: val.title || {}
+                        title: val.title || {},
+                        is_modify: val.is_modify
                     }
                 ]) || []);
+                console.log(valuesMap);
 
                 $('table thead th').each(function (index) {
                     const $th = $(this);
@@ -159,12 +161,12 @@ $('.subcategory .list-group-item').on('click', function (e) {
                     const val = valuesMap.get(storeId) || {quantity: 0, id: '', title: {}};
                     const tooltipTitle = generateTitleString(val.title);
                     const encodedTooltip = $('<div>').text(tooltipTitle).html();
-
+                    const modifyClass = val.is_modify ? 'corrected-input-bg' : 'auto-input-bg';
                     const td = $(`
                         <td data-store-id="${storeId}">
                             <div class="d-flex align-items-center">
                                 <input type="number" 
-                                       class="btn input w-100 auto-input-bg"
+                                       class="btn input w-100 ${modifyClass}"
                                        value="${val.quantity}"
                                        data-id="${val.id}"
                                        data-guid="${item.product_id || ''}"
@@ -251,6 +253,8 @@ $('.category .list-group-item').on('click', function () {
 
 $('#autoplannogramma').on('input', '.input', function () {
     $(this).closest('td').find('path').attr('fill', 'red');
+    $(this).removeClass('auto-input-bg');
+    $(this).addClass('corrected-input-bg');
 });
 
 $('#autoplannogramma').on('click', '.reject-btn', function () {