Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

# Conflicts:
#	quality_control/security/ir.model.access.csv
#	quality_control/wizard/quality_check_wizard.py
#	sf_quality/__manifest__.py
#	sf_quality/models/__init__.py
#	sf_quality/models/stock.py

sf_quality/__manifest__.py

@@ -24,7 +24,8 @@
         'views/quality_cnc_test_view.xml',
         'views/mrp_workorder.xml',
         'views/quality_check_view.xml',
-        'views/quality_company.xml'
+        'views/quality_company.xml',
+        'wizard/check_picking_wizard_view.xml',
     ],
 
     'assets': {

sf_quality/models/stock.py

@@ -5,23 +5,46 @@ class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
     def button_validate(self):
-        # """
-        #     调拨单若关联了质量检查单，验证调拨单时，应校验是否有不合格品，若存在，应弹窗提示：
-        #     “警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”
-        # """
-        # if self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
-        #     return {
-        #         'type': 'ir.actions.act_window',
-        #         'res_model': 'sf.functional.tool.assembly.order',
-        #         'name': ' ',
-        #         'view_mode': 'form',
-        #         'target': 'new',
-        #         'context': {'': True}
-        #     }
-        
-        out_quality_check = self.env['quality.check'].search([('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告')])
+
+        """
+            出厂检验报告上传
+        """
+
+        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件，继续调拨请点“确认”，否则请取消？”
+        """
+        context = self.env.context
+        if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
+            # 回滚事务，为二次确认/取消做准备
+            self.env.cr.rollback()
+            quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
+            product_list = list(set([quality_check_id.product_id for quality_check_id in quality_check_ids]))
+            fail_check_text = ''
+            for product_id in product_list:
+                check_ids = quality_check_ids.filtered(lambda qc: qc.product_id == product_id)
+                if all(check_id.measure_on == 'move_line' for check_id in check_ids):
+                    number = sum(check_ids.mapped('qty_line'))
+                else:
+                    number = sum(self.move_ids_without_package.filtered(
+                        lambda ml: ml.product_id == product_id).mapped('quantity_done'))
+                fail_check_text = (f'{fail_check_text}、{product_id.name}  {number}件'
+                                   if fail_check_text != '' else f'{product_id.name}  {number}件')
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'picking.validate.check.wizard',
+                'name': '质检不合格提示',
+                'view_mode': 'form',
+                'target': 'new',
+                'context': {
+                    'default_picking_id': self.id,
+                    'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
+                    'again_validate': True}
+            }
         return super(StockPicking, self).button_validate()

sf_quality/security/ir.model.access.csv

@@ -73,6 +73,6 @@ access_quality_cnc_test_group_quality_director,quality_cnc_test_group_quality_di
 
 access_quality_cnc_test_group_sf_equipment_user,quality_cnc_test_group_sf_equipment_user,model_quality_cnc_test,sf_base.group_sf_equipment_user,1,1,0,0
 
-
+access_picking_validate_check_wizard,access.picking_validate_check_wizard,model_picking_validate_check_wizard,quality.group_quality_user,1,1,1,0
 
 

sf_quality/wizard/__init__.py

@@ -0,0 +1 @@
+from . import check_picking_wizard

sf_quality/wizard/check_picking_wizard.py

@@ -0,0 +1,17 @@
+from odoo import api, models,fields
+
+
+class PickingValidateCheckWizard(models.TransientModel):
+    _name = 'picking.validate.check.wizard'
+    _description = '调拨质检不合格二次验证'
+
+    picking_id = fields.Many2one('stock.picking', '调拨单')
+    fail_check_text = fields.Text('提示信息')
+
+    def confirm_picking_validate_check(self):
+        res = self.picking_id.button_validate()
+        return res
+
+    def cancel_picking_validate_check(self):
+        # 这里是取消后的逻辑
+        return {'type': 'ir.actions.act_window_close'}

sf_quality/wizard/check_picking_wizard_view.xml

@@ -0,0 +1,15 @@
+<odoo>
+    <record id="picking_validate_check_wizard_form" model="ir.ui.view">
+        <field name="name">picking.validate.check.wizard</field>
+        <field name="model">picking.validate.check.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="fail_check_text" readonly="True"/>
+                <footer>
+                    <button name="confirm_picking_validate_check" type="object" class="btn-primary" string="确认"/>
+                    <button name="cancel_picking_validate_check" type="object" string="取消"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>