diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index 6746f45a..cf645798 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -86,7 +86,7 @@ product.template - + diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index c2c9b9ad..378cb280 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -31,6 +31,7 @@ class ResMrpWorkOrder(models.Model): ('解除装夹', '解除装夹'), ('切割', '切割') ], string="工序类型") + results = fields.Char('检测结果') @api.onchange('users_ids') def get_user_permissions(self): @@ -289,16 +290,7 @@ class ResMrpWorkOrder(models.Model): self.env['stock.move'].sudo().create(productions._get_moves_finished_values()) productions._create_workorder2(self.processing_panel) else: - return { - 'type': 'ir.actions.act_window', - 'name': '工单详情', - 'res_model': 'mrp.workorder', - 'view_mode': 'tree', - 'context': {'active_id': self.id}, - 'domain': [('state', 'not in', ['done', 'cancel', 'waiting', 'pending'])], - 'target': 'current', - - } + self.results = '合格' # cnc程序获取 def fetchCNC(self): diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 272ef796..85ed09f0 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -132,7 +132,7 @@ - + @@ -357,14 +357,16 @@ + - + + + attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>