Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废

# Conflicts:
#	sf_manufacturing/models/stock.py
This commit is contained in:
jinling.yang
2024-11-22 17:54:21 +08:00

View File

@@ -596,18 +596,18 @@ class StockPicking(models.Model):
for move_id in item.move_ids: for move_id in item.move_ids:
move_ids.append(move_id.product_id.id) move_ids.append(move_id.product_id.id)
boms = self.env['mrp.bom'].sudo().search([('bom_line_ids.product_id', 'in', move_ids)]) boms = self.env['mrp.bom'].sudo().search([('bom_line_ids.product_id', 'in', move_ids)])
default_codes = ''
if boms: if boms:
codes_list = []
for bom in boms: for bom in boms:
if bom.product_tmpl_id.default_code: if bom.product_tmpl_id.default_code:
code = bom.product_tmpl_id.default_code.split('-')[-1] code_list = bom.product_tmpl_id.default_code.split('-')
default_code = bom.product_tmpl_id.default_code.split(f'-{code}')[0] if len(code_list) >= 4:
if default_code not in default_codes: code = '-'.join(code_list[:4])
if default_codes == '': if code not in codes_list:
default_codes = default_code codes_list.append(code)
else: else:
default_codes = default_codes + ',' + default_code raise ValidationError('坯料成品的内部参考值格式错误')
item.retrospect_ref = default_codes item.retrospect_ref = ','.join(codes_list)
elif item.picking_type_id.sequence_code in ['INT', 'PC']: elif item.picking_type_id.sequence_code in ['INT', 'PC']:
pass pass