feat: added type field into warehouse model

basic_info/models.py

@@ -19,6 +19,12 @@ class WareHouseModeEnum(models.IntegerChoices):
     UNRESTRICTED = 3, '宽进宽出'
 
 
+class WarehouseTypeEnum(models.IntegerChoices):
+    """仓库类别枚举"""
+    WHOLE = 1, '整仓'
+    SCATTERED = 2, '散仓'
+
+
 class MerchantTypeEnum(models.IntegerChoices):
     """商户类型枚举"""
     STORE = 1, '布行'
@@ -62,6 +68,23 @@ class DeviceTypeEnum(models.TextChoices):
 # ==================== 模型定义 ====================
 
 
+class EmployeeType(ModelBase):
+    """员工职位类型"""
+    id = models.BigAutoField(primary_key=True)
+    merchant = models.ForeignKey('Merchant', on_delete=models.PROTECT, related_name='employee_types', verbose_name='所属商户')
+    title = models.CharField(max_length=50, verbose_name='职位名称')
+    description = models.TextField(blank=True, null=True, verbose_name='职位描述')
+    reverse = models.CharField(max_length=100, blank=True, null=True, verbose_name='预留字段')
+
+    def __str__(self):
+        return self.title
+
+    class Meta:
+        verbose_name = '员工职位类型'
+        verbose_name_plural = '员工职位类型'
+        unique_together = ('merchant', 'title')
+
+
 class QuickInput(ModelBase):
     id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=100, verbose_name='名')
@@ -118,6 +141,11 @@ class WareHouse(ModelBase):
     merchant = models.ForeignKey('Merchant', on_delete=models.PROTECT, related_name='warehouses', verbose_name='所属商户')
     name = models.CharField(max_length=100, verbose_name='仓库名称')
     location = models.CharField(max_length=200, blank=True, null=True, verbose_name='仓库地址')
+    type = models.IntegerField(
+        choices=WarehouseTypeEnum.choices,
+        default=WarehouseTypeEnum.WHOLE,
+        verbose_name='仓库类别',
+    )
     mode = models.IntegerField(
         choices=WareHouseModeEnum.choices,
         default=WareHouseModeEnum.RESTRICT_IN,
@@ -311,10 +339,12 @@ class Employee(ModelBase):
         verbose_name='系统用户',
     )
     name = models.CharField(max_length=100, verbose_name='员工姓名')
-    job_type = models.CharField(
-        max_length=20,
-        choices=EmployeeTypeEnum.choices,
-        default=EmployeeTypeEnum.PRINTER,
+    position = models.ForeignKey(
+        'EmployeeType',
+        on_delete=models.PROTECT,
+        related_name='employees',
+        null=True,
+        blank=True,
         verbose_name='职位',
     )
     mobile = models.CharField(max_length=20, blank=True, null=True, verbose_name='手机')
@@ -327,6 +357,17 @@ class Employee(ModelBase):
         verbose_name='员工状态',
     )
 
+    @property
+    def job_type(self) -> str:
+        """
+        返回职位名称（向后兼容）
+        
+        如果有关联的职位类型，返回其 title，否则返回空字符串
+        """
+        if self.position:
+            return self.position.title
+        return ''
+
     def __str__(self):
         return self.name