增加采购申请对于单件制造非首个制造订单的显示,修改采购申请对于同一个补货组同一个产品的合并
This commit is contained in:
@@ -9,12 +9,16 @@ class MrpProduction(models.Model):
|
||||
@api.depends('state')
|
||||
def _compute_pr_mp_count(self):
|
||||
for item in self:
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
|
||||
if pr_ids:
|
||||
if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture:
|
||||
first_order = self.env['mrp.production'].search(
|
||||
[('origin', '=', item.origin), ('product_id', '=', item.product_id.id)], limit=1, order='id asc')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
|
||||
item.pr_mp_count = len(pr_ids)
|
||||
else:
|
||||
item.pr_mp_count = 0
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
|
||||
item.pr_mp_count = len(pr_ids)
|
||||
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
|
||||
|
||||
def action_view_pr_mp(self):
|
||||
"""
|
||||
@@ -22,7 +26,13 @@ class MrpProduction(models.Model):
|
||||
"""
|
||||
self.ensure_one()
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
|
||||
if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
|
||||
first_order = self.env['mrp.production'].search(
|
||||
[('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
|
||||
else:
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
|
||||
|
||||
action = {
|
||||
'res_model': 'purchase.request',
|
||||
'type': 'ir.actions.act_window',
|
||||
|
||||
Reference in New Issue
Block a user