diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 3b759112..1ecf948b 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -126,14 +126,15 @@ class Mlog(CommonADModel): 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, null=True, blank=True) count_use = models.PositiveIntegerField('领用数', default=0) count_real = models.PositiveIntegerField('实际生产数', default=0) count_real_eweight = models.FloatField('单数重量', default=0) count_ok = models.PositiveIntegerField('合格数', default=0) count_notok = models.PositiveIntegerField('不合格数', default=0) - count_break = models.PositiveIntegerField('碎料数', default=0) + count_break = models.PositiveIntegerField('加工碎料数', default=0) + count_break_t = models.PositiveIntegerField('检验碎料数', default=0) count_n_zw = models.PositiveIntegerField('炸纹', default=0) count_n_tw = models.PositiveIntegerField('条纹', default=0) @@ -161,6 +162,12 @@ class Mlog(CommonADModel): count_n_bhpcd = models.PositiveIntegerField('壁厚偏差大', default=0) count_n_xzp = models.PositiveIntegerField('箱中破', default=0) count_n_thhs = models.PositiveIntegerField('退火后碎', default=0) + count_n_swen = models.PositiveIntegerField('水纹', default=0) + count_n_bb = models.PositiveIntegerField('崩边', default=0) + count_n_wm = models.PositiveIntegerField('雾面', default=0) + count_n_md = models.PositiveIntegerField('麻点', default=0) + count_n_xh = models.PositiveIntegerField('线痕', default=0) + count_n_qt = models.PositiveIntegerField('其他', default=0) handle_date = models.DateField('操作日期', null=True, blank=True) @@ -205,9 +212,19 @@ class Mlogb(BaseModel): material_out = models.ForeignKey( Material, verbose_name='产物', on_delete=models.CASCADE, related_name='mlogb_material_out', null=True, blank=True) count_use = models.PositiveIntegerField('领用数量', default=0) + count_break = models.PositiveIntegerField('加工破碎数', default=0) + count_break_t = models.PositiveIntegerField('检验碎料数', default=0) count_real = models.PositiveIntegerField('实际生产数', default=0) count_ok = models.PositiveIntegerField('合格数量', default=0) + count_notok = models.PositiveIntegerField('不合格数', default=0) + count_n_hs = models.PositiveIntegerField('划伤', default=0) + count_n_qp = models.PositiveIntegerField('气泡', default=0) + count_n_swen = models.PositiveIntegerField('水纹', default=0) + count_n_bb = models.PositiveIntegerField('崩边', default=0) + count_n_wm = models.PositiveIntegerField('雾面', default=0) + count_n_md = models.PositiveIntegerField('麻点', default=0) + count_n_xh = models.PositiveIntegerField('线痕', default=0) class Handover(CommonADModel): """