Accept Merge Request #1913: (feature/质检弹窗优化 -> develop)
Merge Request: 质量检查弹出框顺序修改 Created By: @禹翔辉 Reviewed By: @马广威 Approved By: @马广威 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1913
This commit is contained in:
@@ -21,7 +21,9 @@ class StockPicking(models.Model):
|
|||||||
“警告:存在不合格产品XXXX n 件、YYYYY m件,继续调拨请点“确认”,否则请取消?”
|
“警告:存在不合格产品XXXX n 件、YYYYY m件,继续调拨请点“确认”,否则请取消?”
|
||||||
"""
|
"""
|
||||||
context = self.env.context
|
context = self.env.context
|
||||||
if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
|
if (not (isinstance(res, dict) and res.get('type') == 'ir.actions.act_window')
|
||||||
|
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')
|
||||||
|
|||||||
Reference in New Issue
Block a user