From 359eae14cc355bbda5619ed83d88d1da2917a0d6 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 13 Mar 2025 15:32:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=20=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E8=AE=A2=E5=8D=95=E5=86=85=E5=A4=96=E5=8D=8F=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=8D=95=E8=B4=A8=E9=87=8F=E6=A3=80=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=9F=A5=E9=A1=B5=E9=9D=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mrp_workorder/models/quality.py | 1 - quality_control/models/stock_picking.py | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mrp_workorder/models/quality.py b/mrp_workorder/models/quality.py index 7867c029..a0797b61 100644 --- a/mrp_workorder/models/quality.py +++ b/mrp_workorder/models/quality.py @@ -190,7 +190,6 @@ class QualityCheck(models.Model): # doubly linked chain for tablet view navigation next_check_id = fields.Many2one('quality.check') previous_check_id = fields.Many2one('quality.check') - # is_produced = fields.Boolean(string="Has Been Produced") # For components registration move_id = fields.Many2one( diff --git a/quality_control/models/stock_picking.py b/quality_control/models/stock_picking.py index bc8638d7..243ffd18 100644 --- a/quality_control/models/stock_picking.py +++ b/quality_control/models/stock_picking.py @@ -108,15 +108,11 @@ class StockPicking(models.Model): def action_open_quality_check_picking(self): action = self.env["ir.actions.actions"]._for_xml_id("quality_control.quality_check_action_picking") - action['context'] = self.env.context.copy() - keys_to_remove = [key for key in action['context'] if key.startswith('default_')] - for key in keys_to_remove: - del action['context'][key] - action['context'].update({ + action['context'] = { 'search_default_picking_id': [self.id], 'default_picking_id': self.id, 'show_lots_text': self.show_lots_text, - }) + } return action def button_quality_alert(self): From cd114d183b78614f15b185cf111f973d75cd59ea Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 13 Mar 2025 16:45:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E5=8D=95=E6=8E=A7=E5=88=B6=E6=96=B9=E5=BC=8F=E4=B8=BA=E9=9D=9E?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=97=B6=EF=BC=8C=E8=B0=83=E6=8B=A8=E5=8D=95?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=97=B6=E5=AD=98=E5=9C=A8=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E8=B4=A8=E6=A3=80=E5=8D=95=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_quality/models/stock.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sf_quality/models/stock.py b/sf_quality/models/stock.py index c9788a51..fa5003e7 100644 --- a/sf_quality/models/stock.py +++ b/sf_quality/models/stock.py @@ -18,13 +18,13 @@ class StockPicking(models.Model): fail_check_text = '' for product_id in product_list: check_ids = quality_check_ids.filtered(lambda qc: qc.product_id == product_id) - number = sum(check_ids.mapped('qty_line')) - if number != 0: - fail_check_text = (f'{fail_check_text}、{product_id.name} {number}件' - if fail_check_text != '' else f'{product_id.name} {number}件') + if all(check_id.measure_on == 'move_line' for check_id in check_ids): + number = sum(check_ids.mapped('qty_line')) else: - fail_check_text = (f'{fail_check_text}、{product_id.name}' - if fail_check_text != '' else f'{product_id.name}') + 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',