diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index e829274a..74e916a8 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -33,7 +33,7 @@ - + diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py index 29357d02..10157f63 100644 --- a/sf_manufacturing/models/model_type.py +++ b/sf_manufacturing/models/model_type.py @@ -21,7 +21,8 @@ class ProductModelTypeRoutingSort(models.Model): _description = '成品工序排序' sequence = fields.Integer('Sequence') - route_workcenter_id = fields.Many2one('mrp.routing.workcenter') + route_workcenter_id = fields.Many2one('mrp.routing.workcenter', + domain=[('routing_type', 'in', ['装夹预调', 'CNC加工', '解除装夹'])]) is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') # routing_type = fields.Selection([ @@ -54,7 +55,7 @@ class EmbryoModelTypeRoutingSort(models.Model): _description = '坯料工序排序' sequence = fields.Integer('Sequence') - route_workcenter_id = fields.Many2one('mrp.routing.workcenter') + route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['切割'])]) is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') # routing_type = fields.Selection([ @@ -87,7 +88,7 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model): _description = '表面工艺工序排序' sequence = fields.Integer('Sequence') - route_workcenter_id = fields.Many2one('mrp.routing.workcenter') + route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['表面工艺'])]) is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') # routing_type = fields.Selection([ diff --git a/sf_manufacturing/views/model_type_view.xml b/sf_manufacturing/views/model_type_view.xml index 8b1218a4..09877a83 100644 --- a/sf_manufacturing/views/model_type_view.xml +++ b/sf_manufacturing/views/model_type_view.xml @@ -37,7 +37,7 @@ - + @@ -48,18 +48,18 @@ - + - + - +