From 9d042dc61e7bae7b081f7ff77c917fbb7ca11dcb Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 13 Mar 2025 13:02:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A4=84=E7=90=86=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E5=8D=95=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81=E6=97=B6=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E5=A4=84=E7=90=86=E7=89=B9=E6=AE=8A=E9=80=94?= =?UTF-8?q?=E5=BE=84-=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E5=86=85?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=B0=83=E6=8B=A8=E5=8D=95=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=B8=8D=E9=80=9A=E8=BF=87=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC=E8=B4=A8=E9=87=8F=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mrp_workorder/models/quality.py | 1 + quality_control/wizard/quality_check_wizard.py | 4 ++-- sf_quality/wizard/check_picking_wizard.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mrp_workorder/models/quality.py b/mrp_workorder/models/quality.py index a0797b61..2b8ca118 100644 --- a/mrp_workorder/models/quality.py +++ b/mrp_workorder/models/quality.py @@ -190,6 +190,7 @@ 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/wizard/quality_check_wizard.py b/quality_control/wizard/quality_check_wizard.py index 3c67eb87..3a6b6639 100644 --- a/quality_control/wizard/quality_check_wizard.py +++ b/quality_control/wizard/quality_check_wizard.py @@ -122,8 +122,8 @@ class PickingCheckCancelWizard(models.TransientModel): picking_id = fields.Many2one('stock.picking', 'stock picking') def confirm_picking_check(self): - self.picking_id.action_cancel() - return {'type': 'ir.actions.act_window_close'} + res = self.picking_id.action_cancel() + return res def cancel_picking_check(self): # 这里是取消后的逻辑 diff --git a/sf_quality/wizard/check_picking_wizard.py b/sf_quality/wizard/check_picking_wizard.py index 1cb25756..1b9bcf3c 100644 --- a/sf_quality/wizard/check_picking_wizard.py +++ b/sf_quality/wizard/check_picking_wizard.py @@ -9,8 +9,8 @@ class PickingValidateCheckWizard(models.TransientModel): fail_check_text = fields.Text('提示信息') def confirm_picking_validate_check(self): - self.picking_id.button_validate() - return {'type': 'ir.actions.act_window_close'} + res = self.picking_id.button_validate() + return res def cancel_picking_validate_check(self): # 这里是取消后的逻辑