|
|
|
|
@ -377,12 +377,20 @@ async def get_spareparts_paginated(*, db_session, collector_db_session):
|
|
|
|
|
data_query,
|
|
|
|
|
{"asset_locations": asset_locations}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
sparepart_remark = (await db_session.execute(
|
|
|
|
|
select(SparepartRemark)
|
|
|
|
|
)).scalars().all()
|
|
|
|
|
|
|
|
|
|
sparepart_remark_dict = {item.itemnum: item.remark for item in sparepart_remark}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
spare_parts = []
|
|
|
|
|
for row in rows:
|
|
|
|
|
spare_parts.append({
|
|
|
|
|
"item_num": row.itemnum,
|
|
|
|
|
"description": row.item_description,
|
|
|
|
|
"remark": sparepart_remark_dict.get(row.itemnum, ""),
|
|
|
|
|
"current_balance_total": float(row.current_balance_total) if row.current_balance_total else 0.0,
|
|
|
|
|
"total_required_for_oh": float(row.avg_qty_per_wo),
|
|
|
|
|
"total_pr_qty": row.total_pr_qty,
|
|
|
|
|
@ -1389,6 +1397,7 @@ async def create_remark(*, db_session, collector_db_session, remark_in):
|
|
|
|
|
itemnum=remark_in.itemnum,
|
|
|
|
|
remark=remark_in.remark,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
db_session.add(new_remark)
|
|
|
|
|
await db_session.commit()
|
|
|
|
|
await db_session.refresh(new_remark)
|
|
|
|
|
|