Merge branch 'feature/优化加工质检' into develop

sf_quality/models/quality_cnc_test.py

@@ -31,19 +31,31 @@ class SfQualityCncTest(models.Model):
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")
     detailed_reason = fields.Text('详细原因')
 
+    # machining_drawings = fields.Binary(related='workorder_id.machining_drawings', string='2D加工图纸', readonly=True)
+    # quality_standard = fields.Binary(related='workorder_id.quality_standard', string='质检标准', readonly=True)
+
     def submit_pass(self):
-        self.write({'result': 'pass', 'test_results': self.test_results, 'state': 'done'})
+        if self.test_results in ['返工', '报废']:
+            raise UserError(_('请重新选择【判定结果】-【检测结果】'))
+        self.write({'result': 'pass', 'test_results': '合格', 'state': 'done'})
         self.workorder_id.write({'test_results': self.test_results})
         self.workorder_id.button_finish()
 
     def submit_fail(self):
-        if not self.reason and not self.detailed_reason and not self.test_results:
+        if not self.test_results:
             raise UserError(_('请填写【判定结果】里的信息'))
-        else:
-            self.write({'result': 'fail', 'test_results': self.test_results, 'state': 'done'})
-            self.workorder_id.write(
-                {'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason})
-            self.workorder_id.button_finish()
+        if self.test_results == '合格':
+            raise UserError(_('请重新选择【判定结果】-【检测结果】'))
+        self.write({'result': 'fail', 'test_results': self.test_results, 'state': 'done'})
+        self.workorder_id.write(
+            {'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason})
+        self.workorder_id.button_finish()
+
+    @api.onchange('test_results')
+    def _onchange_test_results(self):
+        if self.test_results == '合格':
+            self.reason = False
+            self.detailed_reason = False
 
 
 class SfQualityWorkOrder(models.Model):