diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 933abf07..a20d11f9 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -22,7 +22,7 @@ def find_material_can_change(material: Material, mgroup_to: Mgroup): 找到可转变为的物料(返工交接用) """ routepackIds = Route.objects.filter(material_out=material, routepack__state=RoutePack.RP_S_CONFIRM).values_list('routepack', flat=True) - matIds = list(Route.objects.filter(routepack__id__in=routepackIds, process=mgroup_to.process).values_list('material_in', flat=True).distinct()) + matIds = list(Route.objects.filter(routepack__id__in=routepackIds, process=mgroup_to.process, material_in__type__in=[Material.MA_TYPE_HALFGOOD, Material.MA_TYPE_GOOD]).values_list('material_in', flat=True).distinct()) if matIds and len(matIds) == 1: return Material.objects.get(id=matIds[0]) raise ParseError("无法返工到该工段")