ack/MES_Core
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавил при закрытии позиции сохранение в факт.выполнено для красивости прогресбаров
All checks were successful
Deploy MES Core / deploy (push) Successful in 12s
Details

Browse Source
This commit is contained in:
ackFromRedmi
2026-04-23 00:04:01 +03:00
parent ede5358015
commit 248f6987c8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shiftflow/services/assembly_closing.py
View File

@@ -185,9 +185,10 @@ def apply_assembly_closing(workitem_id: int, fact_qty: int, user_id: int) -> boo
# Двигаем техпроцесс # Двигаем техпроцесс
workitem.quantity_done = (workitem.quantity_done or 0) + fact_qty workitem.quantity_done = (workitem.quantity_done or 0) + fact_qty
workitem.quantity_reported = max(int(workitem.quantity_reported or 0), int(workitem.quantity_done or 0))
if workitem.quantity_done >= workitem.quantity_plan: if workitem.quantity_done >= workitem.quantity_plan:
workitem.status = 'done' workitem.status = 'done'
workitem.save(update_fields=['quantity_done', 'status']) workitem.save(update_fields=['quantity_done', 'quantity_reported', 'status'])
logger.info( logger.info(
'assembly_closing:done workitem_id=%s qty=%s deal_id=%s location_id=%s user_id=%s report_id=%s', 'assembly_closing:done workitem_id=%s qty=%s deal_id=%s location_id=%s user_id=%s report_id=%s',

3
shiftflow/services/closing.py
View File

@@ -198,13 +198,14 @@ def apply_closing_workitems(
created_shift += 1 created_shift += 1
wi.quantity_done = done_total + fact wi.quantity_done = done_total + fact
wi.quantity_reported = max(int(wi.quantity_reported or 0), int(wi.quantity_done or 0))
if wi.quantity_done >= plan_total: if wi.quantity_done >= plan_total:
wi.status = 'done' wi.status = 'done'
elif wi.quantity_done > 0: elif wi.quantity_done > 0:
wi.status = 'leftover' wi.status = 'leftover'
else: else:
wi.status = 'planned' wi.status = 'planned'
wi.save(update_fields=['quantity_done', 'status']) wi.save(update_fields=['quantity_done', 'quantity_reported', 'status'])
for stock_item_id, qty in consumptions.items(): for stock_item_id, qty in consumptions.items():
if qty and float(qty) > 0: if qty and float(qty) > 0: