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

feat: mlog添加不合格项目

This commit is contained in:
caoqianming 2024-08-12 11:07:29 +08:00
parent ae1099cbec
commit 562372b0b9
3 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
apps/wpm/migrations/0060_auto_20240812_1048.py Normal file
View File

@ -0,0 +1,63 @@
# Generated by Django 3.2.12 on 2024-08-12 02:48
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('wpm', '0059_auto_20240809_1508'),
]
operations = [
migrations.AddField(
model_name='mlog',
name='count_n_hd',
field=models.PositiveIntegerField(default=0, verbose_name='厚度'),
),
migrations.AddField(
model_name='mlog',
name='count_n_ps',
field=models.PositiveIntegerField(default=0, verbose_name='破损'),
),
migrations.AddField(
model_name='mlog',
name='count_n_txd',
field=models.PositiveIntegerField(default=0, verbose_name='同心度'),
),
migrations.AddField(
model_name='mlog',
name='count_n_wj',
field=models.PositiveIntegerField(default=0, verbose_name='外经'),
),
migrations.AddField(
model_name='mlog',
name='count_n_yd',
field=models.PositiveIntegerField(default=0, verbose_name='圆度'),
),
migrations.AddField(
model_name='mlogb',
name='count_n_hd',
field=models.PositiveIntegerField(default=0, verbose_name='厚度'),
),
migrations.AddField(
model_name='mlogb',
name='count_n_ps',
field=models.PositiveIntegerField(default=0, verbose_name='破损'),
),
migrations.AddField(
model_name='mlogb',
name='count_n_txd',
field=models.PositiveIntegerField(default=0, verbose_name='同心度'),
),
migrations.AddField(
model_name='mlogb',
name='count_n_wj',
field=models.PositiveIntegerField(default=0, verbose_name='外经'),
),
migrations.AddField(
model_name='mlogb',
name='count_n_yd',
field=models.PositiveIntegerField(default=0, verbose_name='圆度'),
),
]

11
apps/wpm/models.py
View File

@ -179,7 +179,13 @@ class Mlog(CommonADModel):
count_n_wm = models.PositiveIntegerField('雾面', default=0)
count_n_md = models.PositiveIntegerField('麻点', default=0)
count_n_xh = models.PositiveIntegerField('线痕', default=0)
count_n_ps = models.PositiveIntegerField('破损', default=0)
count_n_wj = models.PositiveIntegerField('外经', default=0)
count_n_yd = models.PositiveIntegerField('圆度', default=0)
count_n_txd = models.PositiveIntegerField('同心度', default=0)
count_n_hd = models.PositiveIntegerField('厚度', default=0)
count_n_qt = models.PositiveIntegerField('其他', default=0)
handle_date = models.DateField('操作日期', null=True, blank=True)
@ -240,6 +246,11 @@ class Mlogb(BaseModel):
count_n_wm = models.PositiveIntegerField('雾面', default=0)
count_n_md = models.PositiveIntegerField('麻点', default=0)
count_n_xh = models.PositiveIntegerField('线痕', default=0)
count_n_ps = models.PositiveIntegerField('破损', default=0)
count_n_wj = models.PositiveIntegerField('外经', default=0)
count_n_yd = models.PositiveIntegerField('圆度', default=0)
count_n_txd = models.PositiveIntegerField('同心度', default=0)
count_n_hd = models.PositiveIntegerField('厚度', default=0)
class Handover(CommonADModel):
"""

2
apps/wpm/serializers.py
View File

@ -472,6 +472,8 @@ class HandoverSerializer(CustomModelSerializer):
raise ValidationError('送料车间和送料工段必须有一个')
if wm.notok_sign is not None and attrs['type'] in [Handover.H_NORMAL, Handover.H_TEST]:
raise ValidationError('物料不合格，不能进行正常/检验交接')
if wm.count_xtest is not None:
raise ValidationError('物料检验中，不能进行交接')
return attrs
class Meta: