Формирование имени документа передачи смен

diff --git a/erp24/helpers/DataHelper.php b/erp24/helpers/DataHelper.php
index dd4c42b20462b07848fd477bcd7864d1e5d71966..76f3d6a8fddea79c8b4fbcabee5214a95308f0c1 100644 (file)
--- a/erp24/helpers/DataHelper.php
+++ b/erp24/helpers/DataHelper.php
@@ -127,4 +127,8 @@ class DataHelper
         return DateHelper::getMicrosecondsString();
     }
 
+    public static function generateShiftTransferDocName($prefix, $modelId) {
+        return 'ЕРП_' . $prefix . '_' . date("Y-m-d_H-i") . '_ИД_' . $modelId;
+    }
+
 }
\ No newline at end of file

diff --git a/erp24/records/ReplacementInvoice.php b/erp24/records/ReplacementInvoice.php
index 4a91ef8c66da00be75566e7ce6fccb54cc529dde..b1e5f976088c0a605ef4a7fba35c13678a5f7028 100644 (file)
--- a/erp24/records/ReplacementInvoice.php
+++ b/erp24/records/ReplacementInvoice.php
@@ -97,7 +97,8 @@ class ReplacementInvoice extends \yii\db\ActiveRecord
 
         try {
             $model->save();
-            $model->updateAttributes(['number' => 'ЕРП_ПС_' . date("Y-m-d_H-i") . '_' . $model->id]);
+            $docName = DataHelper::generateShiftTransferDocName('ПС', $model->id);
+            $model->updateAttributes(['number' => $docName]);
 
             ReplacementInvoiceProducts::setData($model, $shiftTransfer);
 

diff --git a/erp24/records/WaybillIncoming.php b/erp24/records/WaybillIncoming.php
index cb79c589eeebb546ac9b014b2257266d6561bcb2..a4b67e3853d45c71aa40ba94c9d7e100fc9374aa 100644 (file)
--- a/erp24/records/WaybillIncoming.php
+++ b/erp24/records/WaybillIncoming.php
@@ -131,9 +131,9 @@ class WaybillIncoming extends \yii\db\ActiveRecord
 
         try {
             $model->save();
-
+            $docName = DataHelper::generateShiftTransferDocName('РПН', $model->id);
             $model->updateAttributes([
-                'number' => 'ЕРП_РПН_' . date("Y-m-d_H-i") . '_' . $model->id
+                'number' => $docName
             ]);
 
             WaybillIncomingProducts::setData($model, $shiftTransfer);

diff --git a/erp24/records/WaybillWriteOffs.php b/erp24/records/WaybillWriteOffs.php
index 2d1d90ba9b89b35c3853579a7d6e4fb09c68c688..74b380be0dab1425845644b601aba28018ddcbcc 100644 (file)
--- a/erp24/records/WaybillWriteOffs.php
+++ b/erp24/records/WaybillWriteOffs.php
@@ -128,9 +128,9 @@ class WaybillWriteOffs extends \yii\db\ActiveRecord
         ]);
         try {
             $model->save();
-
+            $docName = DataHelper::generateShiftTransferDocName('РНС', $model->id);
             $model->updateAttributes([
-                'number' => 'ЕРП_РНС_' . date("Y-m-d_H-i") . '_' . $model->id
+                'number' => $docName
             ]);
 
             WaybillWriteOffsProducts::setData($model, $shiftTransfer);