Доработали фильт в реестре заданий
All checks were successful
Deploy MES Core / deploy (push) Successful in 10s
All checks were successful
Deploy MES Core / deploy (push) Successful in 10s
This commit is contained in:
0
warehouse/__init__.py
Normal file
0
warehouse/__init__.py
Normal file
19
warehouse/admin.py
Normal file
19
warehouse/admin.py
Normal file
@@ -0,0 +1,19 @@
|
||||
from django.contrib import admin
|
||||
from .models import MaterialCategory, SteelGrade, Material
|
||||
|
||||
@admin.register(MaterialCategory)
|
||||
class MaterialCategoryAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'gost_standard')
|
||||
search_fields = ('name', 'gost_standard')
|
||||
|
||||
@admin.register(SteelGrade)
|
||||
class SteelGradeAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'gost_standard')
|
||||
search_fields = ('name', 'gost_standard')
|
||||
|
||||
@admin.register(Material)
|
||||
class MaterialAdmin(admin.ModelAdmin):
|
||||
list_display = ('full_name', 'category', 'steel_grade', 'name')
|
||||
list_filter = ('category', 'steel_grade')
|
||||
search_fields = ('name', 'full_name')
|
||||
readonly_fields = ('full_name',)
|
||||
6
warehouse/apps.py
Normal file
6
warehouse/apps.py
Normal file
@@ -0,0 +1,6 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
class WarehouseConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'warehouse'
|
||||
verbose_name = 'Склад и материалы'
|
||||
53
warehouse/migrations/0001_initial.py
Normal file
53
warehouse/migrations/0001_initial.py
Normal file
@@ -0,0 +1,53 @@
|
||||
# Generated by Django 6.0.3 on 2026-03-29 14:16
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='MaterialCategory',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100, unique=True, verbose_name='Название категории')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Категория материала',
|
||||
'verbose_name_plural': 'Категории материалов',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='SteelGrade',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100, unique=True, verbose_name='Марка стали')),
|
||||
('gost_standard', models.CharField(blank=True, help_text='Основной стандарт для этой марки', max_length=255, verbose_name='ГОСТ/ТУ')),
|
||||
('certificate_pdf', models.FileField(blank=True, null=True, upload_to='certificates/', verbose_name='Сертификат/ГОСТ (PDF)')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Марка стали',
|
||||
'verbose_name_plural': 'Марки стали',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Material',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255, verbose_name='Наименование (размер/характеристики)')),
|
||||
('full_name', models.CharField(blank=True, help_text='Генерируется автоматически, если пусто', max_length=500, verbose_name='Полное наименование')),
|
||||
('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='warehouse.materialcategory', verbose_name='Категория')),
|
||||
('steel_grade', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='warehouse.steelgrade', verbose_name='Марка стали')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Материал (номенклатура)',
|
||||
'verbose_name_plural': 'Материалы',
|
||||
},
|
||||
),
|
||||
]
|
||||
18
warehouse/migrations/0002_materialcategory_gost_standard.py
Normal file
18
warehouse/migrations/0002_materialcategory_gost_standard.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 6.0.3 on 2026-03-29 14:21
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('warehouse', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='materialcategory',
|
||||
name='gost_standard',
|
||||
field=models.CharField(blank=True, help_text='Напр: ГОСТ 8639-82', max_length=255, verbose_name='ГОСТ на тип проката'),
|
||||
),
|
||||
]
|
||||
0
warehouse/migrations/__init__.py
Normal file
0
warehouse/migrations/__init__.py
Normal file
46
warehouse/models.py
Normal file
46
warehouse/models.py
Normal file
@@ -0,0 +1,46 @@
|
||||
from django.db import models
|
||||
|
||||
class MaterialCategory(models.Model):
|
||||
"""Категория материала (например, Труба, Лист, Круг)"""
|
||||
name = models.CharField("Название категории", max_length=100, unique=True)
|
||||
gost_standard = models.CharField("ГОСТ на тип проката", max_length=255, blank=True, help_text="Напр: ГОСТ 8639-82")
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Категория материала"
|
||||
verbose_name_plural = "Категории материалов"
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
class SteelGrade(models.Model):
|
||||
"""Марка стали (например, Ст3сп, 09Г2С) и связанные с ней ГОСТы"""
|
||||
name = models.CharField("Марка стали", max_length=100, unique=True)
|
||||
gost_standard = models.CharField("ГОСТ/ТУ", max_length=255, blank=True, help_text="Основной стандарт для этой марки")
|
||||
certificate_pdf = models.FileField("Сертификат/ГОСТ (PDF)", upload_to='certificates/', blank=True, null=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Марка стали"
|
||||
verbose_name_plural = "Марки стали"
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} ({self.gost_standard})" if self.gost_standard else self.name
|
||||
|
||||
class Material(models.Model):
|
||||
"""Конкретная номенклатурная единица (например, Труба 100х100х4)"""
|
||||
category = models.ForeignKey(MaterialCategory, on_delete=models.PROTECT, verbose_name="Категория")
|
||||
steel_grade = models.ForeignKey(SteelGrade, on_delete=models.PROTECT, verbose_name="Марка стали", null=True, blank=True)
|
||||
name = models.CharField("Наименование (размер/характеристики)", max_length=255)
|
||||
full_name = models.CharField("Полное наименование", max_length=500, blank=True, help_text="Генерируется автоматически, если пусто")
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Материал (номенклатура)"
|
||||
verbose_name_plural = "Материалы"
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.full_name:
|
||||
grade_str = f" {self.steel_grade.name}" if self.steel_grade else ""
|
||||
self.full_name = f"{self.category.name} {self.name}{grade_str}"
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
def __str__(self):
|
||||
return self.full_name or f"{self.category.name} {self.name}"
|
||||
0
warehouse/views.py
Normal file
0
warehouse/views.py
Normal file
Reference in New Issue
Block a user