Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

This commit is contained in:
mgw
2024-11-22 09:23:59 +08:00

View File

@@ -967,10 +967,7 @@ class ReStockMove(models.Model):
production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
productions = self.env['mrp.production'].search([('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
res['origin'] = ','.join(productions.mapped('name'))
res['carrier_tracking_ref'] = production.product_id.name
return res
# 增加追踪参考
res['carrier_tracking_ref'] = self.carrier_tracking_ref
res['retrospect_ref'] = production.product_id.name
return res
def _single_manufactuing_mo_generate_origin(self, res):