feat: restructure basic info menu, add kitting monitor table, and implement user preferences api
This commit is contained in:
@ -252,7 +252,7 @@ class BomService:
|
||||
|
||||
# ====================== MRP 齐套模拟计算 ======================
|
||||
@staticmethod
|
||||
def calculate_kitting(entries: list) -> list:
|
||||
def calculate_kitting(entries: list) -> dict:
|
||||
"""
|
||||
MRP 齐套模拟计算
|
||||
|
||||
@ -261,13 +261,20 @@ class BomService:
|
||||
2. 按子件 base_id 合并需求量:需求量 = dosage * (1 + loss_rate/100) * target_qty
|
||||
3. 跨 StockBuy / StockSemi / StockProduct 聚合可用库存
|
||||
4. 计算缺口:shortage = available_quantity - required_quantity
|
||||
5. 计算每个 BOM 的"当前库存可生产最大套数"(木桶效应)
|
||||
|
||||
:param entries: [{"bom_no": "BOM-001", "target_qty": 10}, ...]
|
||||
:return: [{base_id, name, spec, unit, required_qty, available_qty, shortage, children: [...]}, ...]
|
||||
:return: {
|
||||
"bom_summary": [{bom_no, parent_name, max_producible}],
|
||||
"materials": [{base_id, material_name, spec, unit, required_qty, available_qty, shortage, bom_sources}]
|
||||
}
|
||||
"""
|
||||
# Step 1: 展开所有 BOM 的子件,聚合需求量
|
||||
demand_map = {} # child_id -> {base_id, material_name, spec, unit, required_qty, bom_sources: []}
|
||||
|
||||
# 记录每个 entry 的元信息(用于后续 per-BOM 产量计算)
|
||||
entry_meta = {} # bom_no -> {parent_name, version, children: {child_id: {dosage, loss_rate}}}
|
||||
|
||||
for entry in entries:
|
||||
bom_no = entry.get('bom_no')
|
||||
target_qty = float(entry.get('target_qty', 0) or 0)
|
||||
@ -286,6 +293,18 @@ class BomService:
|
||||
if not latest_version:
|
||||
continue
|
||||
|
||||
# 获取父件名称
|
||||
parent_row = db.session.query(
|
||||
BomTable.parent_id, MaterialBase.name
|
||||
).join(
|
||||
MaterialBase, BomTable.parent_id == MaterialBase.id
|
||||
).filter(
|
||||
BomTable.bom_no == bom_no,
|
||||
BomTable.version == latest_version
|
||||
).first()
|
||||
|
||||
parent_name = parent_row.name if parent_row else ''
|
||||
|
||||
# 查询该 BOM 所有子件
|
||||
rows = db.session.query(
|
||||
BomTable, MaterialBase.name, MaterialBase.spec_model, MaterialBase.unit
|
||||
@ -297,12 +316,26 @@ class BomService:
|
||||
BomTable.is_enabled == True
|
||||
).all()
|
||||
|
||||
entry_meta[bom_no] = {
|
||||
'parent_name': parent_name,
|
||||
'version': latest_version,
|
||||
'children': {}
|
||||
}
|
||||
|
||||
for bom, child_name, child_spec, child_unit in rows:
|
||||
dosage = float(bom.dosage or 0)
|
||||
loss_rate = float(bom.loss_rate or 0)
|
||||
adj_dosage = dosage * (1 + loss_rate / 100.0)
|
||||
qty_needed = adj_dosage * target_qty
|
||||
|
||||
# 记录 per-unit 用量(用于 max_producible 计算)
|
||||
entry_meta[bom_no]['children'][bom.child_id] = {
|
||||
'dosage': dosage,
|
||||
'loss_rate': loss_rate,
|
||||
'adj_dosage': adj_dosage,
|
||||
'per_unit': adj_dosage # 每生产1套该BOM所需的此子件数量
|
||||
}
|
||||
|
||||
if bom.child_id not in demand_map:
|
||||
demand_map[bom.child_id] = {
|
||||
'base_id': bom.child_id,
|
||||
@ -323,14 +356,11 @@ class BomService:
|
||||
# Step 2: 批量查询三张库存表的可用库存
|
||||
child_ids = list(demand_map.keys())
|
||||
if not child_ids:
|
||||
return []
|
||||
return {'bom_summary': [], 'materials': []}
|
||||
|
||||
# StockBuy.available_quantity, StockSemi.available_quantity, StockProduct.available_quantity
|
||||
available_map = {cid: 0.0 for cid in child_ids}
|
||||
|
||||
for model_cls in (StockBuy, StockSemi, StockProduct):
|
||||
if model_cls is None:
|
||||
continue
|
||||
rows = db.session.query(
|
||||
model_cls.base_id,
|
||||
func.coalesce(model_cls.available_quantity, 0)
|
||||
@ -341,12 +371,12 @@ class BomService:
|
||||
if base_id in available_map:
|
||||
available_map[base_id] += float(qty)
|
||||
|
||||
# Step 3: 构造结果,计算缺口
|
||||
results = []
|
||||
# Step 3: 构造物料结果,计算缺口
|
||||
materials = []
|
||||
for base_id, info in demand_map.items():
|
||||
avail = available_map.get(base_id, 0.0)
|
||||
shortage = avail - info['required_qty']
|
||||
results.append({
|
||||
materials.append({
|
||||
'base_id': base_id,
|
||||
'material_name': info['material_name'],
|
||||
'spec': info['spec'],
|
||||
@ -357,9 +387,34 @@ class BomService:
|
||||
'bom_sources': info['bom_sources']
|
||||
})
|
||||
|
||||
# 按缺件数量降序排列(最缺的排前面)
|
||||
results.sort(key=lambda x: x['shortage'])
|
||||
return results
|
||||
# 按缺件数量升序(最缺的排前面)
|
||||
materials.sort(key=lambda x: x['shortage'])
|
||||
|
||||
# Step 4: 计算每个 BOM 的"当前库存可生产最大套数"(木桶效应)
|
||||
# 算法:对每个 BOM 的所有子件,计算 Floor(available_qty / per_unit_demand),
|
||||
# 取最小值 = 该 BOM 的最大可生产套数
|
||||
bom_summary = []
|
||||
for bom_no, meta in entry_meta.items():
|
||||
min_producible = float('inf')
|
||||
for child_id, child_info in meta['children'].items():
|
||||
avail = available_map.get(child_id, 0.0)
|
||||
per_unit = child_info['adj_dosage']
|
||||
if per_unit > 0:
|
||||
producible = int(avail // per_unit)
|
||||
if producible < min_producible:
|
||||
min_producible = producible
|
||||
max_prod = int(min_producible) if min_producible != float('inf') else 0
|
||||
bom_summary.append({
|
||||
'bom_no': bom_no,
|
||||
'parent_name': meta['parent_name'],
|
||||
'version': meta['version'],
|
||||
'max_producible': max_prod
|
||||
})
|
||||
|
||||
return {
|
||||
'bom_summary': bom_summary,
|
||||
'materials': materials
|
||||
}
|
||||
|
||||
# ====================== 兼容旧接口 ======================
|
||||
@staticmethod
|
||||
|
||||
Reference in New Issue
Block a user