feat: mlog增加班次及序列化
This commit is contained in:
parent
9427544cca
commit
b67cdde9d3
|
@ -0,0 +1,20 @@
|
||||||
|
# Generated by Django 3.2.12 on 2023-10-31 07:45
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('mtm', '0020_material_cate'),
|
||||||
|
('wpm', '0021_auto_20231031_1505'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='mlog',
|
||||||
|
name='shift',
|
||||||
|
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mtm.shift', verbose_name='关联班次'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -94,6 +94,9 @@ class Mlog(CommonADModel):
|
||||||
equipment_2 = models.ForeignKey(
|
equipment_2 = models.ForeignKey(
|
||||||
Equipment, verbose_name='生产设备2', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_equipment_2')
|
Equipment, verbose_name='生产设备2', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_equipment_2')
|
||||||
index = models.PositiveSmallIntegerField('第几锅', default=0)
|
index = models.PositiveSmallIntegerField('第几锅', default=0)
|
||||||
|
|
||||||
|
shift = models.ForeignKey(
|
||||||
|
Shift, verbose_name='关联班次', on_delete=models.SET_NULL, null=True, blank=True)
|
||||||
batch = models.CharField('批次号', max_length=50)
|
batch = models.CharField('批次号', max_length=50)
|
||||||
count_use = models.PositiveIntegerField('领用数', default=0)
|
count_use = models.PositiveIntegerField('领用数', default=0)
|
||||||
count_real = models.PositiveIntegerField('实际生产数', default=0)
|
count_real = models.PositiveIntegerField('实际生产数', default=0)
|
||||||
|
|
|
@ -100,6 +100,7 @@ class MlogSerializer(CustomModelSerializer):
|
||||||
source='equipment.name', read_only=True)
|
source='equipment.name', read_only=True)
|
||||||
equipment_2_name = serializers.CharField(
|
equipment_2_name = serializers.CharField(
|
||||||
source='equipment_2.name', read_only=True)
|
source='equipment_2.name', read_only=True)
|
||||||
|
shift_name = serializers.CharField(source='shift.name', read_only=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Mlog
|
model = Mlog
|
||||||
|
|
Loading…
Reference in New Issue