Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化客户

sf_manufacturing/models/mrp_workorder.py

@@ -105,6 +105,11 @@ class ResMrpWorkOrder(models.Model):
     picking_out_id = fields.Many2one('stock.picking', string='外协出库单')
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
     equipment_id = fields.Many2one('maintenance.equipment', string='加工设备')
+    is_ok = fields.Boolean(string='是否合格')
+    # 加工人
+    processing_user_id = fields.Many2one('res.users', string='加工人')
+    # 检测人
+    inspection_user_id = fields.Many2one('res.users', string='检测人')
     schedule_state = fields.Selection(related='production_id.schedule_state', store=True)
     # 工件装夹信息
     functional_fixture_code = fields.Char(string="功能夹具编码", readonly=True)
@@ -127,6 +132,13 @@ class ResMrpWorkOrder(models.Model):
     production_line = fields.Char(string="生产线")
     preset_program_information = fields.Char(string="预调程序信息")
 
+    @api.onchange('is_ok')
+    def _onchange_inspection_user_id(self):
+        """
+        检测is_ok(是否合格)被修改的话，就将当前用户赋值给inspection_user_id
+        """
+        self.inspection_user_id = self.env.user.id
+
     @api.onchange('functional_fixture_id')
     def _onchange_functional_fixture_id(self):
         if self.functional_fixture_id: