From 439bfeb7d6d4fb80afa4583ef3c791598ec14a84 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Apr 2025 11:27:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=94=E5=B7=A5=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 2 ++ apps/wpm/views.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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"])