From ee3841cd52d23994b42fc161f17eedf131319d44 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 27 Nov 2023 17:25:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4mlog=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index e66bb474..9165a88e 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -205,9 +205,9 @@ class MlogSerializer(CustomModelSerializer): def create(self, validated_data): mtask: Mtask = validated_data.get('mtask', None) - batch = validated_data['batch'] - handle_date = validated_data['handle_date'] - handle_user = validated_data['handle_user'] + # batch = validated_data['batch'] + # handle_date = validated_data['handle_date'] + # handle_user = validated_data.get('handle_user', None) if mtask: validated_data['mgroup'] = mtask.mgroup validated_data['material_in'] = mtask.material_in @@ -220,8 +220,12 @@ class MlogSerializer(CustomModelSerializer): material_out = validated_data['material_out'] if not (mgroup and material_out): raise ValidationError('缺少工段或产物!') - if Mlog.objects.filter(mtask=mtask, batch=batch, handle_date=handle_date, handle_user=handle_user).exists(): - raise ValidationError('存在相同的日志记录') + # if handle_user: + # if Mlog.objects.filter(mtask=mtask, batch=batch, handle_date=handle_date, handle_user=handle_user).exists(): + # raise ValidationError('存在相同的日志记录') + # else: + # if Mlog.objects.filter(mtask=mtask, batch=batch, handle_date=handle_date).exists(): + # raise ValidationError('存在相同的日志记录') with transaction.atomic(): mlogb = validated_data.pop('mlogb', []) instance = super().create(validated_data)