From 51a649c86489323cfa96b83b0d3b40f05a32b5db Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 5 Sep 2024 14:17:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlog=E8=BF=94=E5=9B=9Eroutepack=5Fname2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 1576bdc6..5b925b6d 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -215,6 +215,7 @@ class MlogbDetailSerializer(CustomModelSerializer): class MlogSerializer(CustomModelSerializer): mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True) supplier_name = serializers.CharField(source='supplier.name', read_only=True) + routepack_name = serializers.CharField(source='route.routepack.name', read_only=True) belong_dept = serializers.CharField( source='mgroup.belong_dept.id', read_only=True) belong_dept_name = serializers.CharField( @@ -458,8 +459,8 @@ class MlogbInSerializer(CustomModelSerializer): def validate(self, attrs): mlog: Mlog = attrs['mlog'] mtask: Mtask = attrs['mtask'] - if mtask.submit_time is not None: - raise ValidationError('不可选择已提交的任务') + if mtask.state != Mtask.MTASK_ASSGINED: + raise ValidationError('该任务非下达中不可选择') wm_in: WMaterial = attrs['wm_in'] if wm_in.state != WMaterial.WM_OK: raise ValidationError('非合格品不可使用') @@ -711,6 +712,8 @@ class FmlogSerializer(CustomModelSerializer): def validate(self, attrs): route: Route = attrs['route'] mtask: Mtask = attrs['mtask'] + if mtask.state != Mtask.MTASK_ASSGINED: + raise ParseError('该任务非下达中不可选择') mgroup: Mgroup = attrs['mgroup'] if route.process != mgroup.process: raise ParseError('工序不匹配')