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

feat: mio 添加 mgroup字段

This commit is contained in:
zty 2024-07-30 11:40:18 +08:00
parent 893781ec7f
commit a587e570f0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/inm/models.py
View File

@ -2,7 +2,7 @@ from django.db import models
from apps.utils.models import BaseModel, CommonBModel, CommonBDModel, CommonADModel from apps.utils.models import BaseModel, CommonBModel, CommonBDModel, CommonADModel
from apps.pum.models import Supplier, PuOrder from apps.pum.models import Supplier, PuOrder
from apps.sam.models import Customer, Order from apps.sam.models import Customer, Order
from apps.mtm.models import Material from apps.mtm.models import Material, Mgroup
from apps.system.models import User from apps.system.models import User
# Create your models here. # Create your models here.
@ -75,6 +75,7 @@ class MIO(CommonBDModel):
'状态', choices=MIO_STATES, default=10, help_text=str(MIO_CREATE)) '状态', choices=MIO_STATES, default=10, help_text=str(MIO_CREATE))
type = models.CharField('出入库类型', max_length=10, default=MIO_TYPE_DO_OUT, type = models.CharField('出入库类型', max_length=10, default=MIO_TYPE_DO_OUT,
choices=MIO_TYPES, help_text=str(MIO_TYPES)) choices=MIO_TYPES, help_text=str(MIO_TYPES))
mgroup = models.ForeignKey(Mgroup, verbose_name='出入库工段', on_delete=models.CASCADE, null=True, blank=True)
inout_date = models.DateField('出入库日期', null=True, blank=True) inout_date = models.DateField('出入库日期', null=True, blank=True)
supplier = models.ForeignKey( supplier = models.ForeignKey(
Supplier, verbose_name='供应商', on_delete=models.CASCADE, null=True, blank=True) Supplier, verbose_name='供应商', on_delete=models.CASCADE, null=True, blank=True)

8
apps/inm/serializers.py
View File

@ -65,6 +65,7 @@ class MIOListSerializer(CustomModelSerializer):
source='mio_user.name', read_only=True) source='mio_user.name', read_only=True)
belong_dept_name = serializers.CharField( belong_dept_name = serializers.CharField(
source='belong_dept.name', read_only=True) source='belong_dept.name', read_only=True)
mgroup_name = serializers.CharField(source='mgroup.name', read_only=True)
supplier_name = serializers.CharField( supplier_name = serializers.CharField(
source='supplier.name', read_only=True) source='supplier.name', read_only=True)
customer_name = serializers.CharField( customer_name = serializers.CharField(
@ -163,8 +164,13 @@ class MIODoSerializer(CustomModelSerializer):
class Meta: class Meta:
model = MIO model = MIO
fields = ['id', 'number', 'note', 'do_user', fields = ['id', 'number', 'note', 'do_user',
'belong_dept', 'type', 'inout_date'] 'belong_dept', 'type', 'inout_date', 'mgroup']
def validate(self, attrs):
if 'mgroup' in attrs and attrs['mgroup']:
attrs['belong_dept'] = attrs['mgroup'].belong_dept
return attrs
def create(self, validated_data): def create(self, validated_data):
if validated_data['type'] not in [MIO.MIO_TYPE_DO_OUT, MIO.MIO_TYPE_DO_IN]: if validated_data['type'] not in [MIO.MIO_TYPE_DO_OUT, MIO.MIO_TYPE_DO_IN]:
raise ValidationError('出入库类型错误') raise ValidationError('出入库类型错误')