Открыл админу изделия, доработал списание

shiftflow/services/closing.py

@@ -1,5 +1,6 @@
 from django.db import transaction
 from django.utils import timezone
+import logging
 
 from shiftflow.models import (
     CuttingSession,
@@ -9,7 +10,8 @@ from shiftflow.models import (
     ShiftItem,
 )
 from shiftflow.services.sessions import close_cutting_session
-from warehouse.models import StockItem
+
+logger = logging.getLogger('mes')
 
 
 @transaction.atomic
@@ -22,12 +24,15 @@ def apply_closing(
     consumptions: dict[int, float],
     remnants: list[dict],
 ) -> None:
+    logger.info('apply_closing:start user=%s machine=%s material=%s items=%s consumptions=%s remnants=%s', user_id, machine_id, material_id, list(item_actions.keys()), list(consumptions.keys()), len(remnants))
+
     items = list(
         Item.objects.select_for_update(of=('self',))
         .select_related('task', 'task__deal', 'task__material', 'machine')
         .filter(id__in=list(item_actions.keys()), machine_id=machine_id, status='work', task__material_id=material_id)
     )
     if not items:
+        logger.error('apply_closing:no_items machine=%s material=%s', machine_id, material_id)
         raise RuntimeError('Не найдено пунктов сменки для закрытия.')
 
     report = CuttingSession.objects.create(
@@ -38,6 +43,8 @@ def apply_closing(
         is_closed=False,
     )
 
+    logger.info('apply_closing:report_created id=%s', report.id)
+    logger.info('apply_closing:update_items start items=%s', [it.id for it in items])
     for it in items:
         spec = item_actions.get(it.id) or {}
         action = (spec.get('action') or '').strip()
@@ -59,6 +66,7 @@ def apply_closing(
 
         ShiftItem.objects.create(session=report, task=it.task, quantity_fact=fact)
 
+    logger.info('apply_closing:consumption_count=%s', len(consumptions))
     for stock_item_id, qty in consumptions.items():
         if qty <= 0:
             continue
@@ -69,6 +77,7 @@ def apply_closing(
             quantity=float(qty),
         )
 
+    logger.info('apply_closing:remnants_count=%s', len(remnants))
     for r in remnants:
         qty = float(r.get('quantity') or 0)
         if qty <= 0:
@@ -82,6 +91,7 @@ def apply_closing(
             unique_id=None,
         )
 
+    logger.info('apply_closing:close_session id=%s', report.id)
     close_cutting_session(report.id)
 
     for it in items:
@@ -117,4 +127,6 @@ def apply_closing(
                 quantity_fact=0,
                 status='leftover',
                 is_synced_1c=False,
-            )
+            )
+
+    logger.info('apply_closing:done report=%s', report.id)

shiftflow/services/sessions.py

@@ -1,4 +1,5 @@
 from django.db import transaction
+import logging
 from django.utils import timezone
 
 from manufacturing.models import ProductEntity
@@ -12,6 +13,8 @@ from shiftflow.models import (
 )
 from warehouse.models import StockItem
 
+logger = logging.getLogger('mes')
+
 
 @transaction.atomic
 def close_cutting_session(session_id: int) -> None:
@@ -26,6 +29,7 @@ def close_cutting_session(session_id: int) -> None:
        - для каждого ShiftItem создаём StockItem(entity=..., location=machine.location, quantity=quantity_fact)
        - если использованный материал не совпадает с planned_material КД -> material_substitution=True
     """
+    logger.info('close_cutting_session:start id=%s', session_id)
     session = (
         CuttingSession.objects.select_for_update(of=('self',))
         .select_related(
@@ -66,6 +70,8 @@ def close_cutting_session(session_id: int) -> None:
 
             if c.stock_item_id:
                 si = StockItem.objects.select_for_update(of=('self',)).select_related('material', 'location').get(pk=c.stock_item_id)
+                logger.info('close_cutting_session:consume stock_item=%s qty=%s before=%s', si.id, c.quantity, si.quantity)
+
                 if not si.material_id:
                     raise RuntimeError('В списании сырья указана позиция склада без material.')
 
@@ -80,6 +86,7 @@ def close_cutting_session(session_id: int) -> None:
                     si.is_archived = True
                     si.archived_at = timezone.now()
                     si.save(update_fields=['quantity', 'is_archived', 'archived_at'])
+                    logger.info('close_cutting_session:archived stock_item=%s', si.id)
                 else:
                     si.save(update_fields=['quantity'])
 
@@ -107,7 +114,10 @@ def close_cutting_session(session_id: int) -> None:
                 need -= take
 
                 if si.quantity == 0:
-                    si.delete()
+                    si.is_archived = True
+                    si.archived_at = timezone.now()
+                    si.save(update_fields=['quantity', 'is_archived', 'archived_at'])
+                    logger.info('close_cutting_session:archived stock_item=%s', si.id)
                 else:
                     si.save(update_fields=['quantity'])
 
@@ -118,6 +128,7 @@ def close_cutting_session(session_id: int) -> None:
             raise RuntimeError('Не заполнено списание сырья: добавь строки «Списание сырья» или укажи legacy поле «Взятый материал».')
 
         used = StockItem.objects.select_for_update(of=('self',)).select_related('material', 'location').get(pk=session.used_stock_item_id)
+        logger.info('close_cutting_session:used stock_item=%s before=%s', used.id, used.quantity)
         if not used.material_id:
             raise RuntimeError('Взятый материал должен ссылаться на сырьё (material), а не на готовую деталь (entity).')
 
@@ -132,6 +143,7 @@ def close_cutting_session(session_id: int) -> None:
             used.is_archived = True
             used.archived_at = timezone.now()
             used.save(update_fields=['quantity', 'is_archived', 'archived_at'])
+            logger.info('close_cutting_session:archived used=%s', used.id)
         else:
             used.save(update_fields=['quantity'])
 
@@ -193,4 +205,5 @@ def close_cutting_session(session_id: int) -> None:
         ProductionReportStockResult.objects.create(report=session, stock_item=created, kind='remnant')
 
     session.is_closed = True
-    session.save(update_fields=["is_closed"])
+    session.save(update_fields=["is_closed"])
+    logger.info('close_cutting_session:done id=%s', session_id)