zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 去除mlog重复校验

This commit is contained in:
caoqianming 2023-11-27 17:25:11 +08:00
parent 741032f4e8
commit ee3841cd52
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/wpm/serializers.py
View File

@ -205,9 +205,9 @@ class MlogSerializer(CustomModelSerializer):
def create(self, validated_data): def create(self, validated_data):
mtask: Mtask = validated_data.get('mtask', None) mtask: Mtask = validated_data.get('mtask', None)
batch = validated_data['batch'] # batch = validated_data['batch']
handle_date = validated_data['handle_date'] # handle_date = validated_data['handle_date']
handle_user = validated_data['handle_user'] # handle_user = validated_data.get('handle_user', None)
if mtask: if mtask:
validated_data['mgroup'] = mtask.mgroup validated_data['mgroup'] = mtask.mgroup
validated_data['material_in'] = mtask.material_in validated_data['material_in'] = mtask.material_in
@ -220,8 +220,12 @@ class MlogSerializer(CustomModelSerializer):
material_out = validated_data['material_out'] material_out = validated_data['material_out']
if not (mgroup and material_out): if not (mgroup and material_out):
raise ValidationError('缺少工段或产物!') raise ValidationError('缺少工段或产物!')
if Mlog.objects.filter(mtask=mtask, batch=batch, handle_date=handle_date, handle_user=handle_user).exists(): # if handle_user:
raise ValidationError('存在相同的日志记录') # 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(): with transaction.atomic():
mlogb = validated_data.pop('mlogb', []) mlogb = validated_data.pop('mlogb', [])
instance = super().create(validated_data) instance = super().create(validated_data)