1、质检弹窗和数量应用弹窗顺序调整
This commit is contained in:
@@ -5,7 +5,6 @@ class StockPicking(models.Model):
|
|||||||
_inherit = 'stock.picking'
|
_inherit = 'stock.picking'
|
||||||
|
|
||||||
def button_validate(self):
|
def button_validate(self):
|
||||||
res = super(StockPicking, self).button_validate()
|
|
||||||
"""
|
"""
|
||||||
出厂检验报告上传
|
出厂检验报告上传
|
||||||
"""
|
"""
|
||||||
@@ -24,9 +23,7 @@ class StockPicking(models.Model):
|
|||||||
“警告:存在不合格产品XXXX n 件、YYYYY m件,继续调拨请点“确认”,否则请取消?”
|
“警告:存在不合格产品XXXX n 件、YYYYY m件,继续调拨请点“确认”,否则请取消?”
|
||||||
"""
|
"""
|
||||||
context = self.env.context
|
context = self.env.context
|
||||||
if (not (not isinstance(res, bool) and res.get('type') == 'ir.actions.act_window')
|
if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
|
||||||
and not context.get('again_validate')
|
|
||||||
and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')):
|
|
||||||
# 回滚事务,为二次确认/取消做准备
|
# 回滚事务,为二次确认/取消做准备
|
||||||
self.env.cr.rollback()
|
self.env.cr.rollback()
|
||||||
quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
|
quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
|
||||||
@@ -58,4 +55,5 @@ class StockPicking(models.Model):
|
|||||||
'default_fail_check_text': f'警告:存在不合格产品{fail_check_text},继续调拨请点“确认”,否则请取消?',
|
'default_fail_check_text': f'警告:存在不合格产品{fail_check_text},继续调拨请点“确认”,否则请取消?',
|
||||||
'again_validate': True}
|
'again_validate': True}
|
||||||
}
|
}
|
||||||
|
res = super(StockPicking, self).button_validate()
|
||||||
return res
|
return res
|
||||||
|
|||||||
Reference in New Issue
Block a user