From 016a2794531e28a552be02ad0bca9264421e30aa Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 10 May 2024 16:42:54 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=20=20=E5=9D=AF?=
 =?UTF-8?q?=E6=96=99=E5=A4=96=E5=8D=8F=E4=B8=8D=E7=94=9F=E6=88=90=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E5=87=BA=E5=BA=93=E5=8D=95=20=20=E7=9A=84bug=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BB=B6=E8=A3=85?=
 =?UTF-8?q?=E5=A4=B9=E5=B2=97=E5=AF=B9sf.functional.cutting.tool.entity?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/models/product_supplierinfo.py         | 19 ++++++++++++++++++-
 sf_dlm/views/product_template_view.xml        |  3 +++
 .../security/ir.model.access.csv              |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sf_dlm/models/product_supplierinfo.py b/sf_dlm/models/product_supplierinfo.py
index 2784cba0..05191b44 100644
--- a/sf_dlm/models/product_supplierinfo.py
+++ b/sf_dlm/models/product_supplierinfo.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-from odoo import models, fields
+import logging
+
+import re
+from odoo import models, fields, api
 
 
 class ResProductCategory(models.Model):
@@ -28,6 +31,20 @@ class ResMrpBomMo(models.Model):
     _inherit = 'mrp.bom'
 
     subcontractor_id = fields.Many2one('res.partner', string='外包商')
+    subcontractor_name = fields.Char('', compute='_compute_subcontractor_ids', store=True)
+
+    @api.depends('subcontractor_id')
+    def _compute_subcontractor_ids(self):
+        for item in self:
+            if item.subcontractor_id:
+                logging.info("subcontractor_ids: %s" % item.subcontractor_ids.ids)
+                subcontractor_id = int(re.sub(r"\D", "", str(item.subcontractor_id.id)))
+                item.subcontractor_ids = [subcontractor_id]
+                item.subcontractor_name = item.subcontractor_id.name
+                logging.info("subcontractor_ids: %s" % item.subcontractor_ids.ids)
+            else:
+                item.subcontractor_ids = []
+                item.subcontractor_name = ''
 
     def bom_create_line_has(self, embryo):
         vals = {
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 7803b263..c62ae8cd 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -110,6 +110,9 @@
                     <field name="subcontractor_id"
                            attrs="{'invisible': [('type', '!=', 'subcontract')], 'required': [('type', '=', 'subcontract')]}"/>
                 </field>
+                <xpath expr="//group" position="after">
+                    <field name="subcontractor_name" attrs="{'invisible': True}"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 79800637..58879f72 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_sf_tool_user,1,1,1,0
 access_sf_functional_cutting_tool_entity_group_plan_dispatch,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_functional_cutting_tool_entity_group_sf_order_user,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_sf_order_user,1,0,0,0
 
 access_sf_functional_tool_warning,sf.functional.tool.warning,model_sf_functional_tool_warning,sf_base.group_sf_tool_user,1,1,1,0
 access_sf_functional_tool_warning_group_plan_dispatch,sf.functional.tool.warning,model_sf_functional_tool_warning,sf_base.group_plan_dispatch,1,0,0,0