From 9d53fd559cd12ea197fc274a34576c6828e45867 Mon Sep 17 00:00:00 2001 From: fomichev Date: Tue, 28 Jan 2025 18:14:17 +0300 Subject: [PATCH] =?utf8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?utf8?q?=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 12 +++++++++++- erp24/records/WriteOffsErp.php | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 34f73dff..5c3088f8 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -311,6 +311,16 @@ class DataController extends BaseController } } + private function setPrefixToWriteOffsType($type) + { + $typeWriteOffs = $type; + if ($type === 'Брак') { + $typeWriteOffs = '2_' . $type; + } + + return $typeWriteOffs; + } + private function getWriteOffsDoc(): array { $writeOff = []; @@ -374,7 +384,7 @@ class DataController extends BaseController } foreach ($writeOff as $row) { - $typeWithPrefix = WriteOffsErp::WRITE_OFFS_TYPE_BRAK_PREFIX . $row['write_offs_type']; + $typeWithPrefix = $this->setPrefixToWriteOffsType($row['write_offs_type']); $writeOffResult[] = [ 'id' => $row['guid'], 'store_id' => $row['store_guid'], diff --git a/erp24/records/WriteOffsErp.php b/erp24/records/WriteOffsErp.php index 3da261c7..77b135ac 100644 --- a/erp24/records/WriteOffsErp.php +++ b/erp24/records/WriteOffsErp.php @@ -118,7 +118,6 @@ class WriteOffsErp extends \yii\db\ActiveRecord const STATUS_ERROR_1С = 8; const STATUS_DISABLE = 5; const WRITE_OFFS_TYPE_BRAK = "Брак"; - const WRITE_OFFS_TYPE_BRAK_PREFIX = "2_"; const WRITE_OFFS_TYPE_RETURN_KALUGA = "Возврат нереализованного товара (Калуга)"; const WRITE_OFFS_TYPE_DELIVERY_BRAK = 'Брак с поставки'; const WRITE_OFFS_TYPE_DUE_TO_EQUIPMENT_FAILURE_BRAK = 'Брак из-за поломки оборудования'; -- 2.39.5