From c0463cb7dc713ff06ede6e23e5751c4491994ab5 Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 9 Feb 2026 15:28:42 +0800 Subject: [PATCH] (no commit message provided) Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) --- inventory-backend/app/models/bom.py | 4 ++-- inventory-backend/app/services/bom_service.py | 3 +-- inventory-web/src/views/outbound/Selection.vue | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/inventory-backend/app/models/bom.py b/inventory-backend/app/models/bom.py index 55ff046..e4bd2fd 100644 --- a/inventory-backend/app/models/bom.py +++ b/inventory-backend/app/models/bom.py @@ -8,8 +8,8 @@ class BomTable(db.Model): child_id = db.Column(db.Integer, db.ForeignKey('material_base.id'), nullable=False) bom_no = db.Column(db.String(100), comment='BOM编号') version = db.Column(db.String(50), comment='版本') - dosage = db.Column(db.Numeric(19, 4), comment='用量') - loss_rate = db.Column(db.Numeric(5, 2), comment='损耗率%') + dosage = db.Column(db.Numeric(19, 4), comment='个数') + loss_rate = db.Column(db.Numeric(5, 2), comment='损耗率%(已废弃)', default=0, nullable=True) remark = db.Column(db.Text, comment='备注') # relationships diff --git a/inventory-backend/app/services/bom_service.py b/inventory-backend/app/services/bom_service.py index 13798a3..f1e762f 100644 --- a/inventory-backend/app/services/bom_service.py +++ b/inventory-backend/app/services/bom_service.py @@ -9,7 +9,7 @@ class BomService: def create_or_update_bom(parent_id, child_list): """ 保存/更新父件的BOM子件关系 - child_list: [{"child_id": int, "dosage": float, "loss_rate": float, "remark": str}, ...] + child_list: [{"child_id": int, "dosage": float, "remark": str}, ...] """ # 删除该父件原有的BOM记录 BomTable.query.filter_by(parent_id=parent_id).delete() @@ -19,7 +19,6 @@ class BomService: parent_id=parent_id, child_id=item['child_id'], dosage=item.get('dosage', 0), - loss_rate=item.get('loss_rate', 0), remark=item.get('remark', '') ) db.session.add(bom) diff --git a/inventory-web/src/views/outbound/Selection.vue b/inventory-web/src/views/outbound/Selection.vue index b006df3..8f4708f 100644 --- a/inventory-web/src/views/outbound/Selection.vue +++ b/inventory-web/src/views/outbound/Selection.vue @@ -140,7 +140,7 @@ - + @@ -355,7 +355,6 @@ const saveBom = async () => { children: bomForm.value.children.map(c => ({ child_id: c.child_id, dosage: c.dosage, - loss_rate: c.loss_rate, remark: c.remark || '' })) }