From 1ebfbc07b9de424cca66bad736a98a59b446a34b Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 8 Nov 2022 10:16:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=BA=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/process.py | 8 ++++++++ sf_manufacturing_orders/models/sf_production.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sf_base/models/process.py b/sf_base/models/process.py index 3f669dd6..18dae613 100644 --- a/sf_base/models/process.py +++ b/sf_base/models/process.py @@ -55,6 +55,14 @@ class ModelTypeRoutingSort(models.Model): sequence = fields.Integer('Sequence') route_workcenter_id = fields.Many2one('mrp.routing.workcenter') is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') + routing_type = fields.Selection([ + ('获取CNC加工程序', '获取CNC加工程序'), + ('装夹', '装夹'), + ('前置三元定位检测', '前置三元定位检测'), + ('CNC加工', 'CNC加工'), + ('置三元质量检测', '置三元质量检测'), + ('解除装夹', '解除装夹'), + ], string="工序类型", related='route_workcenter_id.routing_type') workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids') model_type_id = fields.Many2one('sf.model.type') diff --git a/sf_manufacturing_orders/models/sf_production.py b/sf_manufacturing_orders/models/sf_production.py index 7c8e5dd5..f976a5ba 100644 --- a/sf_manufacturing_orders/models/sf_production.py +++ b/sf_manufacturing_orders/models/sf_production.py @@ -74,7 +74,7 @@ class MrpProduction(models.Model): 'operation_id': False, 'name': route.route_workcenter_id.name, 'processing_panel': k, - 'routing_type': route.route_workcenter_id.routing_type, + 'routing_type': route.routing_type, 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids), 'date_planned_start': False, 'date_planned_finished': False,