合并dev

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):