(no commit message provided)
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
This commit is contained in:
@ -8,8 +8,8 @@ class BomTable(db.Model):
|
|||||||
child_id = db.Column(db.Integer, db.ForeignKey('material_base.id'), nullable=False)
|
child_id = db.Column(db.Integer, db.ForeignKey('material_base.id'), nullable=False)
|
||||||
bom_no = db.Column(db.String(100), comment='BOM编号')
|
bom_no = db.Column(db.String(100), comment='BOM编号')
|
||||||
version = db.Column(db.String(50), comment='版本')
|
version = db.Column(db.String(50), comment='版本')
|
||||||
dosage = db.Column(db.Numeric(19, 4), comment='用量')
|
dosage = db.Column(db.Numeric(19, 4), comment='个数')
|
||||||
loss_rate = db.Column(db.Numeric(5, 2), comment='损耗率%')
|
loss_rate = db.Column(db.Numeric(5, 2), comment='损耗率%(已废弃)', default=0, nullable=True)
|
||||||
remark = db.Column(db.Text, comment='备注')
|
remark = db.Column(db.Text, comment='备注')
|
||||||
|
|
||||||
# relationships
|
# relationships
|
||||||
|
|||||||
@ -9,7 +9,7 @@ class BomService:
|
|||||||
def create_or_update_bom(parent_id, child_list):
|
def create_or_update_bom(parent_id, child_list):
|
||||||
"""
|
"""
|
||||||
保存/更新父件的BOM子件关系
|
保存/更新父件的BOM子件关系
|
||||||
child_list: [{"child_id": int, "dosage": float, "loss_rate": float, "remark": str}, ...]
|
child_list: [{"child_id": int, "dosage": float, "remark": str}, ...]
|
||||||
"""
|
"""
|
||||||
# 删除该父件原有的BOM记录
|
# 删除该父件原有的BOM记录
|
||||||
BomTable.query.filter_by(parent_id=parent_id).delete()
|
BomTable.query.filter_by(parent_id=parent_id).delete()
|
||||||
@ -19,7 +19,6 @@ class BomService:
|
|||||||
parent_id=parent_id,
|
parent_id=parent_id,
|
||||||
child_id=item['child_id'],
|
child_id=item['child_id'],
|
||||||
dosage=item.get('dosage', 0),
|
dosage=item.get('dosage', 0),
|
||||||
loss_rate=item.get('loss_rate', 0),
|
|
||||||
remark=item.get('remark', '')
|
remark=item.get('remark', '')
|
||||||
)
|
)
|
||||||
db.session.add(bom)
|
db.session.add(bom)
|
||||||
|
|||||||
@ -140,7 +140,7 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="用量" width="150">
|
<el-table-column label="个数" width="150">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-input-number v-model="row.dosage" :min="0" :precision="4" style="width:100%" />
|
<el-input-number v-model="row.dosage" :min="0" :precision="4" style="width:100%" />
|
||||||
</template>
|
</template>
|
||||||
@ -355,7 +355,6 @@ const saveBom = async () => {
|
|||||||
children: bomForm.value.children.map(c => ({
|
children: bomForm.value.children.map(c => ({
|
||||||
child_id: c.child_id,
|
child_id: c.child_id,
|
||||||
dosage: c.dosage,
|
dosage: c.dosage,
|
||||||
loss_rate: c.loss_rate,
|
|
||||||
remark: c.remark || ''
|
remark: c.remark || ''
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user