合并代码

This commit is contained in:
gqh
2022-11-08 11:44:37 +08:00
parent dc24df19c2
commit edd6c30176
6 changed files with 141 additions and 14 deletions

View File

@@ -17,7 +17,7 @@ class ResMrpRoutingWorkcenter(models.Model):
('装夹', '装夹'),
('前置三元定位检测', '前置三元定位检测'),
('CNC加工', 'CNC加工'),
('置三元质量检测', '置三元质量检测'),
('置三元质量检测', '置三元质量检测'),
('解除装夹', '解除装夹'),
], string="工序类型")
is_repeat = fields.Boolean('重复', default=False)
@@ -60,7 +60,7 @@ class ModelTypeRoutingSort(models.Model):
('装夹', '装夹'),
('前置三元定位检测', '前置三元定位检测'),
('CNC加工', 'CNC加工'),
('置三元质量检测', '置三元质量检测'),
('置三元质量检测', '置三元质量检测'),
('解除装夹', '解除装夹'),
], string="工序类型", related='route_workcenter_id.routing_type')
workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')