ДО формируются под сделку

shiftflow/services/sessions.py

@@ -17,7 +17,7 @@ logger = logging.getLogger('mes')
 
 
 @transaction.atomic
-def close_cutting_session(session_id: int) -> None:
+def close_cutting_session(session_id: int, *, inherit_deal_for_remnants: bool = False) -> None:
     """
     Закрытие CuttingSession (транзакция склада).
 
@@ -56,6 +56,8 @@ def close_cutting_session(session_id: int) -> None:
         raise RuntimeError('Не задан склад цеха для станка (Цех -> Склад цеха).')
 
     consumed_material_ids: set[int] = set()
+    consumed_deal_ids: set[int] = set()
+    consumed_is_customer_supplied = False
 
     consumptions = list(
         ProductionReportConsumption.objects.select_related('material', 'stock_item', 'stock_item__material', 'stock_item__location')
@@ -72,6 +74,11 @@ def close_cutting_session(session_id: int) -> None:
                 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 getattr(si, 'deal_id', None):
+                    consumed_deal_ids.add(int(si.deal_id))
+                if bool(getattr(si, 'is_customer_supplied', False)):
+                    consumed_is_customer_supplied = True
+
                 if not si.material_id:
                     raise RuntimeError('В списании сырья указана позиция склада без material.')
 
@@ -129,6 +136,11 @@ def close_cutting_session(session_id: int) -> None:
 
         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 getattr(used, 'deal_id', None):
+            consumed_deal_ids.add(int(used.deal_id))
+        if bool(getattr(used, 'is_customer_supplied', False)):
+            consumed_is_customer_supplied = True
         if not used.material_id:
             raise RuntimeError('Взятый материал должен ссылаться на сырьё (material), а не на готовую деталь (entity).')
 
@@ -191,13 +203,19 @@ def close_cutting_session(session_id: int) -> None:
         )
         ProductionReportStockResult.objects.create(report=session, stock_item=created, kind='finished')
 
+    remnant_deal_id = None
+    if inherit_deal_for_remnants and len(consumed_deal_ids) == 1:
+        remnant_deal_id = int(next(iter(consumed_deal_ids)))
+
     remnants = list(ProductionReportRemnant.objects.filter(report=session).select_related('material'))
     for r in remnants:
         created = StockItem.objects.create(
             material=r.material,
+            deal_id=remnant_deal_id,
             location=work_location,
             quantity=float(r.quantity),
             is_remnant=True,
+            is_customer_supplied=bool(consumed_is_customer_supplied),
             current_length=r.current_length,
             current_width=r.current_width,
             unique_id=r.unique_id,