From d70b7574873cfc29258432fbee3cfcd2c4135888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Mon, 16 Jun 2025 14:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E4=BE=9B=E6=96=99=E7=9A=84=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E8=AE=A2=E5=8D=95=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E7=9A=84=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/mrp_production.py | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/jikimo_purchase_request/models/mrp_production.py b/jikimo_purchase_request/models/mrp_production.py index 680e3c61..6973d51f 100644 --- a/jikimo_purchase_request/models/mrp_production.py +++ b/jikimo_purchase_request/models/mrp_production.py @@ -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)])