基础信息修改,新增所属公司,同时修正类别排序以及新增时候类别选择的功能
This commit is contained in:
@ -12,6 +12,9 @@ class MaterialBase(db.Model):
|
||||
|
||||
# 1. 基础字段
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
# [修改] 所属公司,去除了 default='IRIS'
|
||||
company_name = db.Column(db.String(255), comment='所属公司')
|
||||
|
||||
name = db.Column(db.String(255), nullable=False, comment='名称')
|
||||
common_name = db.Column(db.String(255), comment='俗名')
|
||||
category = db.Column(db.String(100), comment='类别')
|
||||
@ -42,8 +45,7 @@ class MaterialBase(db.Model):
|
||||
# 3. 关联成品库存 (StockProduct)
|
||||
stock_products = db.relationship('StockProduct', back_populates='base', lazy='dynamic')
|
||||
|
||||
# 4. 关联服务库存 (StockService) - [新增]
|
||||
# 假设您的服务库存模型类名为 StockService,且有 base_id 外键
|
||||
# 4. 关联服务库存 (StockService)
|
||||
stock_services = db.relationship('StockService', back_populates='base', lazy='dynamic')
|
||||
|
||||
def to_dict(self):
|
||||
@ -65,6 +67,7 @@ class MaterialBase(db.Model):
|
||||
|
||||
return {
|
||||
'id': self.id,
|
||||
'companyName': self.company_name,
|
||||
'name': self.name,
|
||||
'commonName': self.common_name,
|
||||
'category': self.category,
|
||||
@ -72,7 +75,6 @@ class MaterialBase(db.Model):
|
||||
'spec': self.spec_model,
|
||||
'unit': self.unit,
|
||||
'visibilityLevel': self.visibility_level,
|
||||
# 修改:解析为列表返回
|
||||
'generalManual': parse_list(self.manual_link),
|
||||
'generalImage': parse_list(self.product_image),
|
||||
'isEnabled': 1 if self.is_enabled else 0,
|
||||
|
||||
Reference in New Issue
Block a user