Доработали генерацию сменных заданий

warehouse/models.py

@@ -30,17 +30,19 @@ class Material(models.Model):
     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="Генерируется автоматически, если пусто")
-    
+    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}"
+        category_part = (self.category.name or '').strip() if self.category_id else ''
+        name_part = (self.name or '').strip()
+        grade_part = (self.steel_grade.name or '').strip() if self.steel_grade_id else ''
+
+        self.full_name = ' '.join([p for p in [category_part, name_part, grade_part] if p])
         super().save(*args, **kwargs)
 
     def __str__(self):
-        return self.full_name or f"{self.category.name} {self.name}"
+        return self.full_name or ' '.join([p for p in [(self.category.name if self.category_id else ''), self.name, (self.steel_grade.name if self.steel_grade_id else '')] if p]).strip()