diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index bfa31f78..dc209f6b 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -703,6 +703,8 @@ class MlogbInSerializer(CustomModelSerializer): raise ParseError("请选择相应车间库存!") if is_fix: # 返修或复检 if wm_in.state in [WMaterial.WM_REPAIR, WMaterial.WM_NOTOK]: + pass + else: raise ParseError('返修或复检需使用返修品/不合格品') elif wm_in.state != WMaterial.WM_OK: raise ParseError('非合格品不可使用') diff --git a/apps/wpm/views.py b/apps/wpm/views.py index e3525e24..2abd9cbb 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -583,7 +583,7 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust for wpr in Wpr.objects.filter(wm=wm_in).order_by("number"): Mlogbw.objects.get_or_create(wpr=wpr, mlogb=mlogbin, defaults={"number": wpr.number}) - if qct is None and not (is_fix and mtype == Process.PRO_PROD): + if qct is None: mlog.qct = Qct.get(material_out, "process") mlog.save(update_fields = ["qct"])