diff --git a/apps/mtm/models.py b/apps/mtm/models.py index 8e941d93..7f7c0bc3 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -325,7 +325,8 @@ class RoutePack(CommonADModel): route_dict[r.id] = { "label": r.process.name if r.process else "", "source": r.material_in.id, - "target": r.material_out.id + "target": r.material_out.id, + "id": r.id } # 获取所有物料信息 @@ -511,6 +512,7 @@ class Route(CommonADModel): 'source': source, 'target': target, 'label': rq.process.name, + 'id': rq.id }) # 将批次号排序 nodes_qs = Material.objects.filter(id__in=nodes_set).order_by("process__sort", "create_time") diff --git a/apps/wpm/services.py b/apps/wpm/services.py index e1c204f0..dca7533a 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -1071,6 +1071,7 @@ def get_batch_dag(batch_number: str, method="full"): target = log.target.id nodes_set.update([source, target]) edges.append({ + 'id': log.id, 'source': source, 'target': target, "handover": log.handover.id if log.handover else None,