feat: mio增加mio_user

This commit is contained in:
caoqianming 2023-11-17 08:29:09 +08:00
parent 3caf59f33d
commit cd40d7f899
4 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,26 @@
# Generated by Django 3.2.12 on 2023-11-16 11:04
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('inm', '0009_auto_20231103_1814'),
]
operations = [
migrations.AddField(
model_name='mio',
name='mio_user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='mio_user_mio', to=settings.AUTH_USER_MODEL, verbose_name='仓库执行人'),
),
migrations.AlterField(
model_name='mio',
name='do_user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='do_user_mio', to=settings.AUTH_USER_MODEL, verbose_name='车间执行人'),
),
]

View File

@ -88,8 +88,10 @@ class MIO(CommonBDModel):
submit_time = models.DateTimeField('提交时间', null=True, blank=True)
submit_user = models.ForeignKey(
User, verbose_name='提交人', related_name='submit_user_mio', on_delete=models.CASCADE, null=True, blank=True)
mio_user = models.ForeignKey(
User, verbose_name='仓库执行人', related_name='mio_user_mio', on_delete=models.CASCADE, null=True, blank=True)
do_user = models.ForeignKey(
User, verbose_name='车间执行人', related_name='pick_user_mio', on_delete=models.CASCADE, null=True, blank=True)
User, verbose_name='车间执行人', related_name='do_user_mio', on_delete=models.CASCADE, null=True, blank=True)
class MIOItem(BaseModel):

View File

@ -61,6 +61,8 @@ class MIOListSerializer(CustomModelSerializer):
source='submit_user.name', read_only=True)
do_user_name = serializers.CharField(
source='do_user.name', read_only=True)
mio_user_name = serializers.CharField(
source='mio_user.name', read_only=True)
belong_dept_name = serializers.CharField(
source='belong_dept.name', read_only=True)
supplier_name = serializers.CharField(

View File

@ -208,6 +208,10 @@ class MIOItemViewSet(ListModelMixin, BulkCreateModelMixin, BulkDestroyModelMixin
检验
"""
ins: MIOItem = self.get_object()
if ins.test_date:
raise ParseError('该明细已检验')
if ins.mio.state != MIO.MIO_SUBMITED:
raise ParseError('该状态不可检验')
sr = MIOItemTestSerializer(instance=ins, data=request.data)
sr.is_valid(raise_exception=True)
sr.save()