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

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 9f2d035430730e9a52ff9e789016bc66f0825d3a..53632e2bc0f37c84604c5b744dd89cc9e1780f0d 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -267,7 +267,7 @@ class ShiftTransferController extends Controller
                 WaybillWriteOffs::setData($model);
             }
 
-            $this->redirect(Yii::$app->request->referrer);
+            return $this->redirect(Yii::$app->request->referrer);
         }
 
         $shiftTransfer = ShiftTransfer::findOne($id);

diff --git a/erp24/records/WaybillIncomingProducts.php b/erp24/records/WaybillIncomingProducts.php
index 8ee8c107dbf7aa8b31b097fe42d339f0efb46bd2..63d8c5b1db95a4651cfbd9fba41973e913165a0d 100644 (file)
--- a/erp24/records/WaybillIncomingProducts.php
+++ b/erp24/records/WaybillIncomingProducts.php
@@ -72,17 +72,18 @@ class WaybillIncomingProducts extends \yii\db\ActiveRecord
             $itemCount = abs($item->fact_and_1c_diff);
             $er = EqualizationRemains::findOne([
                 'shift_transfer_id' => $shiftTransfer->id,
-                'product_id' => $item->product_guid
+                'product_replacement_id' => $item->product_guid
             ]);
-
+            $count = 0;
             if ($er) {
                 if ($er->product_count == $itemCount) {
                     return;
                 }
 
-                $count = $er->product_count > $itemCount
-                    ? $er->product_count - $itemCount
-                    : $er->product_count;
+                if ($itemCount > $er->product_count) {
+                    $count = $itemCount - $er->product_count;
+                }
+
             } else {
                 $count = $itemCount;
             }

diff --git a/erp24/records/WaybillWriteOffsProducts.php b/erp24/records/WaybillWriteOffsProducts.php
index 6f9bec6011f9d341e3f8788b3315d0a202fcbdc2..8adf0880adf396034282c0f1c99d4138fd9e59b6 100644 (file)
--- a/erp24/records/WaybillWriteOffsProducts.php
+++ b/erp24/records/WaybillWriteOffsProducts.php
@@ -77,14 +77,16 @@ class WaybillWriteOffsProducts extends \yii\db\ActiveRecord
                 'product_id' => $item->product_guid
             ]);
 
+
             if ($er) {
                 if ($er->product_count == $itemCount) {
                     return;
                 }
 
-                $count = $er->product_count > $itemCount
-                    ? $er->product_count - $itemCount
-                    : $er->product_count;
+                if ($itemCount > $er->product_count) {
+                    $count = $itemCount - $er->product_count;
+                }
+
             } else {
                 $count = $itemCount;
             }

diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php
index 446a97df8e9a25a52e7b462fdd0363097d9cf4ce..66ad1309fecb66081a51e53f6236396c408b9e21 100644 (file)
--- a/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@ -19,8 +19,8 @@ use yii\widgets\ActiveForm;
 $this->registerJsFile('/js/shift-transfer/replacement.js', ['position' => \yii\web\View::POS_END]);
 
 $totalBalance = array_sum(array_column($shiftTransfer->equalizationRemains, 'balance'));
-$writeOffsBalance = \yii_app\records\WaybillWriteOffs::findOne(['shift_transfer_id' => $shiftTransfer->id])->summ ?? null;
-$incomingBalance = \yii_app\records\WaybillIncoming::findOne(['shift_transfer_id' => $shiftTransfer->id])->summ ?? null;
+$writeOffsBalance = \yii_app\records\WaybillWriteOffs::findOne(['shift_transfer_id' => $shiftTransfer->id])->summ ?? 0;
+$incomingBalance = \yii_app\records\WaybillIncoming::findOne(['shift_transfer_id' => $shiftTransfer->id])->summ ?? 0;
 
 $form = \yii\widgets\ActiveForm::begin(); ?>
 
@@ -168,18 +168,12 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
         'iconSource' => 'fa',
     ])->label(false);
 
-    echo $btn = Html::submitButton('Продолжить', [
+    echo Html::submitButton('Продолжить', [
         'class' => 'btn btn-primary float-right',
         'name' => 'action',
         'value' => 'resume'
     ]);
-    ?>
-    <?php
 } else {
-    ?>
-    </div>
-    </div>
-    <?php
     echo GridView::widget([
         'dataProvider' => new \yii\data\ArrayDataProvider([
             'allModels' => $shiftTransfer->equalizationRemains,
@@ -335,15 +329,15 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
     <?php
     if ($shiftTransfer->status_id == ShiftTransfer::STATUS_OF_THE_FORMATION_OF_SURPLUSES_AND_SHORTAGES
         && Yii::$app->user->id == $shiftTransfer->end_shift_admin_id) {
-        echo $btn = Html::submitButton('Назад', [
-                'class' => 'btn btn-primary float-right',
-                'name' => 'action',
-                'value' => 'rejection'
-            ]) . '&nbsp;&nbsp;' . Html::submitButton('Сохранить', [
-                'class' => 'btn btn-success float-right',
-                'name' => 'action',
-                'value' => 'save'
-            ]);
+        echo Html::submitButton('Назад', [
+            'class' => 'btn btn-primary float-right',
+            'name' => 'action',
+            'value' => 'rejection'
+        ]) . '&nbsp;&nbsp;' . Html::submitButton('Сохранить', [
+            'class' => 'btn btn-success float-right',
+            'name' => 'action',
+            'value' => 'save'
+        ]);
     }
 
     if (