Accept Merge Request #2199: (feature/修改产品名称 -> develop)
Merge Request: 客供料的制造订单,不显示采购申请的智能按钮 Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2199
This commit is contained in:
@@ -9,18 +9,13 @@ class MrpProduction(models.Model):
|
||||
@api.depends('state')
|
||||
def _compute_pr_mp_count(self):
|
||||
for item in self:
|
||||
# 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:
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
|
||||
# item.pr_mp_count = len(pr_ids)
|
||||
# 由于采购申请合并了所有销售订单行的采购,所以不区分产品
|
||||
mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
|
||||
item.pr_mp_count = len(pr_ids)
|
||||
if item.product_id.is_customer_provided:
|
||||
item.pr_mp_count = 0
|
||||
else:
|
||||
# 由于采购申请合并了所有销售订单行的采购,所以不区分产品
|
||||
mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
|
||||
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):
|
||||
@@ -28,13 +23,7 @@ class MrpProduction(models.Model):
|
||||
采购请求
|
||||
"""
|
||||
self.ensure_one()
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
|
||||
# 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)])
|
||||
|
||||
# 由于采购申请合并了所有销售订单行的采购,所以不区分产品
|
||||
mrp_names = self.env['mrp.production'].search([('origin', '=', self.origin)]).mapped('name')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
|
||||
|
||||
Reference in New Issue
Block a user