Accept Merge Request #2027: (feature/tool_standard_library_process -> develop)

Merge Request: 工艺相关展示调整

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2027

sf_manufacturing/models/mrp_production.py

@@ -924,6 +924,8 @@ class MrpProduction(models.Model):
                 "bom_id": self[0].bom_id.id,
                 "is_subcontract":True,
             })
+            self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
+                            'sf_stock.stock_location_outsourcing_material_receiving_area').id)]
             for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
                 cur_request_line = request_line_list[0]
                 cur_request_line['product_qty'] = len(request_line_list)
@@ -943,6 +945,7 @@ class MrpProduction(models.Model):
             product_id_to_production_names[product_id] = [p.name for p in pd]
         sorted_workorders = None
         purchase_request_line = []
+        all_workorders = []
         for production in production_all:
             proc_workorders = []
             process_parameter_workorder = self.env['mrp.workorder'].search(
@@ -962,8 +965,10 @@ class MrpProduction(models.Model):
                 # self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
                 purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
                     workorders, production)
+                all_workorders += workorders
         self._create_subcontract_purchase_request(purchase_request_line)
-
+        for workorder in all_workorders:
+            workorder._compute_pr_mp_count()
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:

sf_manufacturing/models/mrp_workorder.py

@@ -70,13 +70,16 @@ class ResMrpWorkOrder(models.Model):
                                         tracking=True)
     back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
     pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
+
     @api.depends('state')
     def _compute_pr_mp_count(self):
         for item in self:
             if not item.is_subcontract:
                 item.pr_mp_count = 0
                 continue
-            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.production_id.name), ('is_subcontract', '=', 'True'),
+                 ('state', '!=', 'rejected')])
             if pr_ids:
                 item.pr_mp_count = len(pr_ids)
             else:
@@ -461,7 +464,9 @@ class ResMrpWorkOrder(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.production_id.name), ('is_subcontract', '=', 'True'),
+             ('state', '!=', 'rejected')])
         action = {
             'res_model': 'purchase.request',
             'type': 'ir.actions.act_window',

sf_manufacturing/models/sf_production_common.py

@@ -7,6 +7,11 @@ from odoo.tools import str2bool
 
 class SfProductionProcessParameter(models.Model):
     _inherit = 'sf.production.process.parameter'
+    service_products = fields.Many2one(
+        'product.template',
+        string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
+        store=True
+    )
     outsourced_service_products = fields.One2many(
         'product.template',  # 另一个模型的名称
         'server_product_process_parameters_id',  # 对应的 Many2one 字段名称
@@ -16,6 +21,25 @@ class SfProductionProcessParameter(models.Model):
     is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
     routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
 
+    @api.depends('outsourced_service_products')
+    def _compute_service_products(self):
+        for record in self:
+            # 假设取第一条作为主明细
+            record.service_products = record.outsourced_service_products.id if record.outsourced_service_products else False
+
+    def _inverse_service_products(self):
+        for record in self:
+            if record.service_products:
+                # 确保关联关系正确
+                record.outsourced_service_products = record.service_products.ids if record.service_products else False
+            else:
+                record.outsourced_service_products = False
+    def name_get(self):
+        result = []
+        for record in self:
+            name = f"{record.process_id.name} - {record.name}"  # 自定义显示格式
+            result.append((record.id, name))
+        return result
     @api.constrains('outsourced_service_products')
     def _validate_partner_limit(self):
         for record in self:
@@ -35,17 +59,17 @@ class SfProductionProcessParameter(models.Model):
             else:
                 record.is_product_button = False
 
-    def has_wksp_prefix(self,code):
+    def has_wksp_prefix(self):
         """
         判断字符串是否以WKSP开头（不区分大小写）
         :param text: 要检查的字符串
         :return: True/False
         """
-        return code.upper().startswith('WKSP')
+        return self.code.upper().startswith('101'+self.routing_id.code)
     @api.depends('outsourced_service_products','code')
     def _compute_is_delete_button(self):
         for record in self:
-            if record.outsourced_service_products and self.has_wksp_prefix(record.code):
+            if record.outsourced_service_products and record.has_wksp_prefix():
                 record.is_delete_button = False
             elif record.outsourced_service_products:
                 record.is_delete_button = True