Комплектация

2025-02-15 22:27:11 +05:00 · 2025-02-15 22:27:11 +05:00 · a59837ceb2
parent ef075b39b8
commit a59837ceb2
11 changed files with 283 additions and 88 deletions
--- a/app/Console/PipiCarInstallCommands.php
+++ b/app/Console/PipiCarInstallCommands.php
@ -27,6 +27,7 @@ class PipiCarInstallCommands extends InstallCommand
            'auto_brands', // Бренд авто
            'auto_colors', // Цвета авто
            'auto_types', // Типы авто
+            'auto_equipment', // Комплектация авто
            'brand_models', // Модель авто
            'auto_classes', // Класс авто
            'auto_tariffs', // Тарифы авто
--- a/modules/auto/script.php
+++ b/modules/auto/script.php
@ -40,54 +40,53 @@ return new class extends \A7kz\Platform\Commands\InstallScript {
        if ($count === 0) {
            foreach ($segments as $segment) {
                foreach ($data as $value) {
-                    $car = UniModel::model('pipi_auto', $segment->connector);
-                    $car->code = $value['Код'];
-                    $car->name = $value['Наименование'];
-                    $car->type_id = UniModel::model('pipi_auto_types', $segment->connector)
-                        ->firstOrCreate([
-                            'name' => $value['Тип']
-                        ])->id;
-                    $car->class_id = UniModel::model('pipi_auto_classes', $segment->connector)
-                        ->firstOrCreate([
-                            'name' => $value['Класс']
-                        ])->id;
-                    $autoBrand = UniModel::model('pipi_auto_brands', $segment->connector)
-                        ->firstOrCreate([
-                            'name' => $value['Марка']
-                        ]);
-                    $car->brand_id = $autoBrand->id;
-                    $car->model_id = UniModel::model('pipi_brand_models', $segment->connector)
-                        ->firstOrCreate([
-                            'name'      => $value['Модель'],
-                            'brand_id'  => $autoBrand->id,
-                            'year'      => $this->formatDate($value['ГодПроизводства'])?->format('Y'),
-                        ])->id;
-                    $car->color_id = UniModel::model('pipi_auto_colors', $segment->connector)
-                        ->firstOrCreate([
-                            'name' => $value['Цвет']
-                        ])->id;
-                    $car->serial_number = $value['СерийныйНомер'];
-                    $car->state_number = $value['ГосНомер'];
-                    $car->manufacture_year = $this->formatDate($value['ГодПроизводства'])?->format('Y-m-d');
-                    $car->passport_number = $value['НомерТехПаспорта'];
-                    $car->passport_date = $this->formatDate($value['ДатаТехпаспорта'])?->format('Y-m-d');
-                    $car->estimated_cost = $value['ОценочнаяСтоимость'];
-                    $owner = UniModel::model('pipi_owners', $segment->connector)
-                        ->firstOrCreate([
-                            'name' =>$value['ВладелецИмущества']
-                        ]);
-                    $car->owner_id = $owner->id;
-                    $car->is_trust_management = (bool) $value['ВДоверенномУправлении'];
-                    $car->owner_percentage = $value['ПроцентВладельца'];
-                    $car->owner_contract = $owner->contract_file_path;
-                    $car->is_inactive = (bool) $value['НеИспользовать'];
-                    $car->is_predefined = (bool) $value['Предопределенный'];
-                    $car->predefined_data_name = $value['ИмяПредопределенныхДанных'];
-                    $car->inspection_kit = json_validate($value['КомпректацияДляОсмотра']) ? $value['КомпректацияДляОсмотра'] : null;
-                    if ($value['ПометкаУдаления'] == 'Да') {
-                        $car->deleted_at = now();
+                    if ($value['ПометкаУдаления'] == 'Нет') {
+                        $car = UniModel::model('pipi_auto', $segment->connector);
+                        $car->code = $value['Код'];
+                        $car->name = $value['Наименование'];
+                        $car->type_id = UniModel::model('pipi_auto_types', $segment->connector)
+                            ->firstOrCreate([
+                                'name' => $value['Тип']
+                            ])->id;
+                        $car->class_id = UniModel::model('pipi_auto_classes', $segment->connector)
+                            ->firstOrCreate([
+                                'name' => $value['Класс']
+                            ])->id;
+                        $autoBrand = UniModel::model('pipi_auto_brands', $segment->connector)
+                            ->firstOrCreate([
+                                'name' => $value['Марка']
+                            ]);
+                        $car->brand_id = $autoBrand->id;
+                        $car->model_id = UniModel::model('pipi_brand_models', $segment->connector)
+                            ->firstOrCreate([
+                                'name'      => $value['Модель'],
+                                'brand_id'  => $autoBrand->id,
+                                'year'      => $this->formatDate($value['ГодПроизводства'])?->format('Y'),
+                            ])->id;
+                        $car->color_id = UniModel::model('pipi_auto_colors', $segment->connector)
+                            ->firstOrCreate([
+                                'name' => $value['Цвет']
+                            ])->id;
+                        $car->serial_number = $value['СерийныйНомер'];
+                        $car->state_number = $value['ГосНомер'];
+                        $car->manufacture_year = $this->formatDate($value['ГодПроизводства'])?->format('Y-m-d');
+                        $car->passport_number = $value['НомерТехПаспорта'];
+                        $car->passport_date = $this->formatDate($value['ДатаТехпаспорта'])?->format('Y-m-d');
+                        $car->estimated_cost = $value['ОценочнаяСтоимость'];
+                        $owner = UniModel::model('pipi_owners', $segment->connector)
+                            ->firstOrCreate([
+                                'name' =>$value['ВладелецИмущества']
+                            ]);
+                        $car->owner_id = $owner->id;
+                        $car->is_trust_management = (bool) $value['ВДоверенномУправлении'];
+                        $car->owner_percentage = $value['ПроцентВладельца'];
+                        $car->owner_contract = $owner->contract_file_path;
+                        $car->is_inactive = (bool) $value['НеИспользовать'];
+                        $car->is_predefined = (bool) $value['Предопределенный'];
+                        $car->predefined_data_name = $value['ИмяПредопределенныхДанных'];
+                        $car->inspection_kit = json_validate($value['КомпректацияДляОсмотра']) ? $value['КомпректацияДляОсмотра'] : null;
+                        $car->save();
                    }
-                    $car->save();
                }
            }
        }
--- a/modules/auto_equipment/access.json
+++ b/modules/auto_equipment/access.json
@ -0,0 +1,9 @@
+{
+  "admin": [
+	"default",
+	"add",
+	"show",
+	"edit",
+	"delete"
+  ]
+}
--- a/modules/auto_equipment/app.json
+++ b/modules/auto_equipment/app.json
@ -0,0 +1,101 @@
+{
+    "module": "pipicar",
+    "name": "pipicar.auto_equipment",
+    "type": "crud",
+    "title": "Комплектация Автомобилей",
+    "data": {
+        "table": "pipi_auto_equipment",
+        "pk": "id",
+        "limit": 25,
+        "segment": true,
+        "timestamp": false,
+        "fields": {
+            "id": {
+                "type": "pk"
+            },
+            "name": {
+                "type": "string"
+            }
+        }
+    },
+    "ui": {
+        "grid": {
+            "title": "Комплектация Автомобилей",
+            "template": "app.base.crud.grid",
+            "cols": [
+                {
+                    "name": "name",
+                    "caption": "Название комплектации"
+                }
+            ],
+            "action": {
+                "head": [
+                    "add"
+                ],
+                "row": [
+                    "edit",
+                    "delete"
+                ]
+            },
+            "filter": {
+                "template": "app.base.crud.filter",
+                "rows": [
+                    {
+                        "cols": [
+                            {
+                                "size": 6,
+                                "input": {
+                                    "name": "name",
+                                    "label": "Название комплектации"
+                                }
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
+        "forms": {
+            "add": {
+                "title": "Добавление комплектации",
+                "template": "app.base.crud.form",
+                "form": {
+                    "submits": "struct:crud.form.edit.submits",
+                    "rows": [
+                        {
+                            "cols": [
+                                {
+                                    "size": 12,
+                                    "input": {
+                                        "name": "name",
+                                        "label": "Название комплектации"
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }
+            },
+            "edit": {
+                "title": "Редактирование комплектации",
+                "template": "app.base.crud.form",
+                "form": {
+                    "rows": [
+                        {
+                            "cols": [
+                                {
+                                    "size": 12,
+                                    "input": {
+                                        "name": "name",
+                                        "label": "Название комплектации"
+                                    }
+                                }
+                            ]
+                        }
+                    ],
+                    "submits": "struct:crud.form.edit.submits"
+                }
+            }
+        }
+    },
+    "actions": "struct:crud.actions"
+}
--- a/modules/auto_equipment/migrate.php
+++ b/modules/auto_equipment/migrate.php
@ -0,0 +1,23 @@
+<?php
+
+use A7kz\Platform\Modules\Platform\Segment\Facades\Segment;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        $segments = Segment::listActive();
+        foreach ($segments as $segment) {
+            Schema::connection($segment->connector)->create('pipi_auto_equipment', static function (Blueprint $table) {
+                $table->id();
+                $table->string('name')->nullable()->comment('Наименование');
+                $table->timestamps();
+                $table->softDeletes();
+            });
+        }
+    }
+};
--- a/modules/auto_equipment/script.php
+++ b/modules/auto_equipment/script.php
@ -0,0 +1,54 @@
+<?php
+
+use A7kz\Platform\Models\UniModel;
+use A7kz\Platform\Modules\Platform\Core\Facades\Core;
+use A7kz\Platform\Modules\Platform\Segment\Facades\Segment;
+use Carbon\Carbon;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\Storage;
+use \A7kz\Platform\Commands\InstallScript;
+
+return new class extends \A7kz\Platform\Commands\InstallScript {
+
+    public function install($module_name, $module_version)
+    {
+    }
+
+    public function update($module_name, $module_version): void
+    {
+        $this->upgrade();
+        $this->seed();
+    }
+
+    private function upgrade(): void
+    {
+        $segments = Segment::listActive();
+        foreach ($segments as $segment) {
+            if (!Schema::connection($segment->connector)->hasTable('pipi_auto_equipment')) {
+                Schema::connection($segment->connector)->create('pipi_auto_equipment', static function (Blueprint $table) {
+                    $table->id();
+                    $table->string('name')->nullable()->comment('Наименование');
+                    $table->timestamps();
+                    $table->softDeletes();
+                });
+            }
+        }
+    }
+
+    private function seed()
+    {
+        $count = UniModel::model('pipi_auto_equipment')->count();
+        if ($count === 0) {
+            $seed = Storage::disk('pipicar_crm')->get('auto_equipment/seeds/seed.json');
+
+            $data = json_decode($seed, true);
+            foreach ($data as $item) {
+                UniModel::model('pipi_auto_equipment')->create([
+                    'name' => $item['name'],
+                ]);
+            }
+        }
+    }
+};
--- a/modules/auto_equipment/seeds/seed.json
+++ b/modules/auto_equipment/seeds/seed.json
@ -0,0 +1,8 @@
+[
+    {
+        "name": "Полная"
+    },
+    {
+        "name": "Комфорт"
+    }
+]
--- a/modules/brand_models/migrate.php
+++ b/modules/brand_models/migrate.php
@ -16,6 +16,7 @@ return new class extends Migration
                $table->id();
                $table->string('name')->nullable()->comment('Наименование');
                $table->integer('year')->nullable()->comment('Год выпуска');
+                $table->unsignedBigInteger('equipment_id')->nullable('Комплектация');
                $table->timestamps();
                $table->softDeletes();

--- a/modules/brand_models/script.php
+++ b/modules/brand_models/script.php
@ -30,6 +30,7 @@ return new class extends \A7kz\Platform\Commands\InstallScript {
                    $table->id();
                    $table->string('name')->nullable()->comment('Наименование');
                    $table->integer('year')->nullable()->comment('Год выпуска');
+                    $table->unsignedBigInteger('equipment_id')->nullable('Комплектация');
                    $table->timestamps();
                    $table->softDeletes();

--- a/modules/owner_contracts/script.php
+++ b/modules/owner_contracts/script.php
@ -68,21 +68,20 @@ return new class extends \A7kz\Platform\Commands\InstallScript {
        if ($count === 0) {
            foreach ($segments as $segment) {
                foreach ($data as $value) {
-                    $model = UniModel::model('pipi_owner_contracts', $segment->connector);
-                    $model->is_group = (bool) $value['ЭтоГруппа'];
-                    $model->code = $value['Код'];
-                    $model->name = $value['Наименование'];
-                    $model->comments = $value['Комментарий'];
-                    $model->organization = $value['Организация'];
-                    $model->contract_number = $value['НомерДоговора'];
-                    $model->contract_date = $this->formatDate($value['ДатаДоговора'])?->format('Y-m-d');
-                    $model->started_at = $this->formatDate($value['ДатаНачалаДействияДоговора'])?->format('Y-m-d');
-                    $model->ended_at = $this->formatDate($value['ДатаОкончанияДействияДоговора'])?->format('Y-m-d');
-                    $model->payment_type = $value['УсловияОплаты'];
-                    if ($value['ПометкаУдаления'] = 'Да') {
-                        $model->deleted_at = now();
+                    if ($value['ПометкаУдаления'] == 'Нет') {
+                        $model = UniModel::model('pipi_owner_contracts', $segment->connector);
+                        $model->is_group = (bool) $value['ЭтоГруппа'];
+                        $model->code = $value['Код'];
+                        $model->name = $value['Наименование'];
+                        $model->comments = $value['Комментарий'];
+                        $model->organization = $value['Организация'];
+                        $model->contract_number = $value['НомерДоговора'];
+                        $model->contract_date = $this->formatDate($value['ДатаДоговора'])?->format('Y-m-d');
+                        $model->started_at = $this->formatDate($value['ДатаНачалаДействияДоговора'])?->format('Y-m-d');
+                        $model->ended_at = $this->formatDate($value['ДатаОкончанияДействияДоговора'])?->format('Y-m-d');
+                        $model->payment_type = $value['УсловияОплаты'];
+                        $model->save();
                    }
-                    $model->save();
                }
            }

--- a/modules/owners/script.php
+++ b/modules/owners/script.php
@ -73,34 +73,33 @@ return new class extends \A7kz\Platform\Commands\InstallScript {
            $segments = Segment::listActive();
            foreach ($segments as $segment) {
                foreach ($data as $value) {
-                    $model = UniModel::model('pipi_owners', $segment->connector);
-                    $model->is_group = (bool) $value['ЭтоГруппа'];
-                    $model->code = $value['Код'];
-                    $model->name = $value['Наименование'];
-                    $model->comments = $value['Комментарий'];
-                    $model->iin = $value['ИдентификационныйКодЛичности'];
-                    $model->kbe = $value['КБЕ'];
-                    $model->okpo_code = $value['КодПоОКПО'];
-                    $model->main_contact = $value['ОсновноеКонтактноеЛицо'];
-                    $model->bank_account = $value['ОсновнойБанковскийСчет'];
-                    $model->address = $value['Адрес'];
-                    $model->phone = $value['Телефон'];
-                    $model->mail = $value['Почта'];
-                    $model->id_number = $value['УдНомер'];
-                    if ($value['УдДата']) {
-                        $model->id_date = $this->formatDate($value['УдДата'])->format('Y-m-d');
+                    if ($value['ПометкаУдаления'] == 'Нет') {
+                        $model = UniModel::model('pipi_owners', $segment->connector);
+                        $model->is_group = (bool) $value['ЭтоГруппа'];
+                        $model->code = $value['Код'];
+                        $model->name = $value['Наименование'];
+                        $model->comments = $value['Комментарий'];
+                        $model->iin = $value['ИдентификационныйКодЛичности'];
+                        $model->kbe = $value['КБЕ'];
+                        $model->okpo_code = $value['КодПоОКПО'];
+                        $model->main_contact = $value['ОсновноеКонтактноеЛицо'];
+                        $model->bank_account = $value['ОсновнойБанковскийСчет'];
+                        $model->address = $value['Адрес'];
+                        $model->phone = $value['Телефон'];
+                        $model->mail = $value['Почта'];
+                        $model->id_number = $value['УдНомер'];
+                        if ($value['УдДата']) {
+                            $model->id_date = $this->formatDate($value['УдДата'])->format('Y-m-d');
+                        }
+                        $model->issued = $value['УдВыдан'];
+                        if ($value['ОсновнойДоговор']) {
+                            $model->contract_id = UniModel::model('pipi_owner_contracts', $segment->connector)
+                                ->firstOrCreate([
+                                    'name' => $value['ОсновнойДоговор']
+                                ])->id;
+                        }
+                        $model->save();
                    }
-                    $model->issued = $value['УдВыдан'];
-                    if ($value['ОсновнойДоговор']) {
-                        $model->contract_id = UniModel::model('pipi_owner_contracts', $segment->connector)
-                            ->firstOrCreate([
-                                'name' => $value['ОсновнойДоговор']
-                            ])->id;
-                    }
-                    if ($value['ПометкаУдаления'] == 'Да') {
-                        $model->deleted_at = now();
-                    }
-                    $model->save();
                }
            }