jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调拨单需验证质检单数量方法优化

Browse Source
This commit is contained in:
yuxianghui
2025-06-24 16:59:38 +08:00
parent 579b7138e7
commit f5ed94866b
1 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
sf_quality/models/stock.py
View File

@@ -59,32 +59,33 @@ class StockPicking(models.Model):
“警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？” “警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”
""" """
try: try:
self.ensure_one()
context = self.env.context context = self.env.context
picking_to_quality = self._get_picking_to_quality() if not context.get('pinking_checkout_quality'):
if not picking_to_quality: return False picking_to_quality = self._get_picking_to_quality()
need_quality_val = self.get_need_quality_line(picking_to_quality) if not picking_to_quality: return False
if (not context.get('pinking_checkout_quality') and need_quality_val = self.get_need_quality_line(picking_to_quality)
any(line.get('fail_check_ids') for line in need_quality_val)): if any(line.get('fail_check_ids') for line in need_quality_val):
# 回滚事务，为二次确认/取消做准备 # 回滚事务，为二次确认/取消做准备
self.env.cr.rollback() self.env.cr.rollback()
# 获取存在失败的 质检单 调拨单明细行 # 获取存在失败的 质检单 调拨单明细行
check_list = [item for item in need_quality_val if item.get('fail_check_ids')] check_list = [item for item in need_quality_val if item.get('fail_check_ids')]
fail_check_text = '' fail_check_text = ''
for item in check_list: for item in check_list:
move_id, pre_done_qty = item.get('move_id'), item.get('pre_done_qty') move_id, pre_done_qty = item.get('move_id'), item.get('pre_done_qty')
fail_check_text = (f'{fail_check_text}、{move_id.product_id.display_name} {pre_done_qty}件' fail_check_text = (f'{fail_check_text}、{move_id.product_id.display_name} {pre_done_qty}件'
if fail_check_text != '' else f'{move_id.product_id.display_name} {pre_done_qty}件') if fail_check_text != '' else f'{move_id.product_id.display_name} {pre_done_qty}件')
return { return {
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'res_model': 'picking.validate.check.wizard', 'res_model': 'picking.validate.check.wizard',
'name': '质检不合格提示', 'name': '质检不合格提示',
'view_mode': 'form', 'view_mode': 'form',
'target': 'new', 'target': 'new',
'context': { 'context': {
'default_picking_id': self.id, 'default_picking_id': self.id,
'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？', 'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
'pinking_checkout_quality': True} 'pinking_checkout_quality': True}
} }
else: else:
return False return False
except Exception as e: except Exception as e:
@@ -119,9 +120,11 @@ class StockPicking(models.Model):
check_ids_2_done = check_ids_2.filtered(lambda qc: qc.quality_state in ('pass', 'fail')) check_ids_2_done = check_ids_2.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
check_ids_2_fail = check_ids_2.filtered(lambda qc: qc.quality_state == 'fail') check_ids_2_fail = check_ids_2.filtered(lambda qc: qc.quality_state == 'fail')
check_ids_2_none = check_ids_2.filtered(lambda qc: qc.quality_state == 'none') check_ids_2_none = check_ids_2.filtered(lambda qc: qc.quality_state == 'none')
if len(check_ids_2) >= pre_done_qty > len(check_ids_2_done): # 每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
if len(check_ids_2) >= move_id.product_uom_qty and len(check_ids_2_done) < pre_done_qty:
need_done_check_ids += check_ids_2_none need_done_check_ids += check_ids_2_none
elif len(check_ids_2) < pre_done_qty and len(check_ids_2_done) == 0: # 每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证
elif len(check_ids_2) < move_id.product_uom_qty and len(check_ids_2_done) == 0:
need_done_check_ids += check_ids_2_none need_done_check_ids += check_ids_2_none
if check_ids_2_fail: if check_ids_2_fail:
fail_check_ids += check_ids_2_fail fail_check_ids += check_ids_2_fail
@@ -161,10 +164,16 @@ class StockPicking(models.Model):
2、若调拨单任意行的0<【完成】<【需求】，且则验证时将会话是否需创建欠单 2、若调拨单任意行的0<【完成】<【需求】，且则验证时将会话是否需创建欠单
---->此时“预完成数量”=【完成】 ---->此时“预完成数量”=【完成】
""" """
if all(move_id.quantity_done == 0 for move_id in self.move_ids_without_package): # if all(move_id.quantity_done == 0 for move_id in self.move_ids_without_package):
pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.reserved_availability} for move_id in # pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.reserved_availability} for move_id in
self.move_ids_without_package] # self.move_ids_without_package]
else: # else:
pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.quantity_done} for move_id in # pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.quantity_done} for move_id in
self.move_ids_without_package] # self.move_ids_without_package]
pre_done_qty = []
for move_id in self.move_ids_without_package:
if move_id.quantity_done > 0:
pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.quantity_done})
else:
pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.reserved_availability})
return pre_done_qty return pre_done_qty