From 8032d3496309823708e09643ed2da4cef7b370c4 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 15 Dec 2025 15:38:51 +0300
Subject: [PATCH] =?utf8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2?=
 =?utf8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20?=
 =?utf8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=20=D0=BF?=
 =?utf8?q?=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B8=20=D1=81=D0=BC=D0=B5?=
 =?utf8?q?=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/helpers/DataHelper.php         | 4 ++++
 erp24/records/ReplacementInvoice.php | 3 ++-
 erp24/records/WaybillIncoming.php    | 4 ++--
 erp24/records/WaybillWriteOffs.php   | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/erp24/helpers/DataHelper.php b/erp24/helpers/DataHelper.php
index dd4c42b2..76f3d6a8 100644
--- 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 4a91ef8c..b1e5f976 100644
--- 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 cb79c589..a4b67e38 100644
--- 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 2d1d90ba..74b380be 100644
--- 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);
-- 
2.39.5