Merge branch refs/heads/develop into refs/heads/feature/质量检查弹出框优化

sf_quality/models/__init__.py

@@ -6,3 +6,4 @@ from . import quality
 from . import quality_cnc_test
 from . import mrp_workorder
 from . import stock
+from . import quality_company

sf_quality/models/custom_quality.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-from odoo import models, fields
-
+from odoo import models, fields, api
+from odoo.exceptions import ValidationError
 
 class SfQualityPoint(models.Model):
     _inherit = 'quality.point'
+    _rec_name = 'title'
 
     product_ids = fields.Many2many(
         'product.product', string='适用产品',
@@ -15,4 +16,14 @@ class SfQualityPoint(models.Model):
     operation_id = fields.Many2one(
         'mrp.routing.workcenter', 'Step', check_company=True,
         domain="[('is_outsource', '=', False),('company_id', 'in', (company_id, False))]")
+    
+    @api.onchange('test_type_id')
+    def _onchange_test_type_id(self):
+        """
+        如果类型选择了出厂检验报告，检查measure_on的值是否为product，如果为product，则类型的值不变，如果
+        不是，则提示错误
+        """
+        if self.test_type_id.name == '出厂检验报告':
+            if self.measure_on != 'product':
+                raise ValidationError('出厂检验报告的测量对象必须为产品')
 

sf_quality/models/quality_company.py

@@ -0,0 +1,8 @@
+from odoo import models, fields
+
+
+# 为公司增加字段
+class Company(models.Model):
+    _inherit = 'res.company'
+
+    factory_name = fields.Char('加工工厂')

sf_quality/models/stock.py

@@ -6,6 +6,16 @@ class StockPicking(models.Model):
 
     def button_validate(self):
         res = super(StockPicking, self).button_validate()
+        """
+            出厂检验报告上传
+        """
+
+        out_quality_check = self.env['quality.check'].search(
+            [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告')])
+        if not out_quality_check.is_factory_report_uploaded:
+            if out_quality_check and self.state == 'assigned':
+                out_quality_check.upload_factory_report()
+
         """
             调拨单若关联了质量检查单，验证调拨单时，应校验是否有不合格品，若存在，应弹窗提示：
             “警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”