jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #2098: (feature/6694 -> develop)

Browse Source 
Merge Request: 解决制造订单不显示采购申请按钮的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2098?initial=true
This commit is contained in:
胡尧
2025-05-08 17:48:05 +08:00
committed by Coding
parent 6d1de42d76 f10f595fa4
commit 6c2eb40e6a
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
jikimo_purchase_request/models/mrp_production.py
View File

@@ -9,15 +9,19 @@ class MrpProduction(models.Model):
@api.depends('state') @api.depends('state')
def _compute_pr_mp_count(self): def _compute_pr_mp_count(self):
for item in self: for item in self:
if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture: # if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture:
first_order = self.env['mrp.production'].search( # first_order = self.env['mrp.production'].search(
[('origin', '=', item.origin), ('product_id', '=', item.product_id.id)], limit=1, order='id asc') # [('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)]) # 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)
# 由于采购申请合并了所有销售订单行的采购，所以不区分产品
first_mp = self.env['mrp.production'].search(
[('origin', '=', item.origin)], limit=1, order='id asc')
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
item.pr_mp_count = len(pr_ids) 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)
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')]) # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
def action_view_pr_mp(self): def action_view_pr_mp(self):
@@ -26,12 +30,17 @@ class MrpProduction(models.Model):
""" """
self.ensure_one() 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),('is_subcontract', '!=', True)])
if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture: # if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
first_order = self.env['mrp.production'].search( # first_order = self.env['mrp.production'].search(
[('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc') # [('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)]) # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
else: # else:
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)]) # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
# 由于采购申请合并了所有销售订单行的采购，所以不区分产品
first_mp = self.env['mrp.production'].search(
[('origin', '=', self.origin)], limit=1, order='id asc')
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
action = { action = {
'res_model': 'purchase.request', 'res_model': 'purchase.request',