This commit is contained in:
2026-04-09 23:15:56 +08:00
parent dccd9bd81d
commit cd9b244bc8
7 changed files with 153 additions and 28 deletions
+3 -7
View File
@@ -36,7 +36,7 @@ async def _calculate_material_cost_map(db_session: AsyncSession, product_ids: Li
ProductMaterial.finished_product_id,
func.coalesce(
func.sum(
Product.cost_price * ProductMaterial.quantity * (1 + ProductMaterial.loss_rate)
Product.cost_price * ProductMaterial.quantity
),
0
)
@@ -186,7 +186,7 @@ async def get_product_bom(
items: List[ProductMaterialItemResponse] = []
total_material_cost = 0.0
for bom, material in bom_result.all():
line_cost = float(material.cost_price or 0) * float(bom.quantity) * (1 + float(bom.loss_rate or 0))
line_cost = float(material.cost_price or 0) * float(bom.quantity)
total_material_cost += line_cost
items.append(
ProductMaterialItemResponse(
@@ -194,7 +194,6 @@ async def get_product_bom(
material_sku=material.sku,
material_name=material.name,
quantity=round(float(bom.quantity), 4),
loss_rate=round(float(bom.loss_rate or 0), 4),
unit_cost=round(float(material.cost_price or 0), 4),
line_cost=round(float(line_cost), 4),
)
@@ -246,15 +245,12 @@ async def replace_product_bom(
for item in payload.items:
if item.quantity <= 0:
raise HTTPException(status_code=400, detail="物料数量必须大于0")
if item.loss_rate < 0:
raise HTTPException(status_code=400, detail="损耗率不能为负数")
raise HTTPException(status_code=400, detail="物料数量必须大于 0")
db_session.add(
ProductMaterial(
finished_product_id=product_id,
material_product_id=item.material_id,
quantity=item.quantity,
loss_rate=item.loss_rate,
)
)