Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched

This commit is contained in:
mgw
2025-03-18 09:18:47 +08:00
4 changed files with 35 additions and 15 deletions

View File

@@ -21,7 +21,9 @@ class StockPicking(models.Model):
“警告存在不合格产品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'):
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()
quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')