From b4b5207aea7c680f4a303f3fd6c1c61f48662f45 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 22 Nov 2023 17:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=8B=E8=AF=95=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=BE=E5=A4=87=E6=9C=BA=E5=BA=8A=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80=E4=BB=A5=E5=8F=8A=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/security/group_security.xml           | 18 ++++++++++-------
 sf_maintenance/models/sf_maintenance.py       | 20 ++++++++++++++++---
 sf_maintenance/views/maintenance_views.xml    |  6 ++++--
 sf_manufacturing/security/ir.model.access.csv |  8 +++++---
 .../views/production_line_view.xml            |  2 +-
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml
index 770fe378..60daf15e 100644
--- a/sf_base/security/group_security.xml
+++ b/sf_base/security/group_security.xml
@@ -4,12 +4,16 @@
             <field name="name">制造普通用户</field>
             <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
         </record>
-        <record id="group_sf_mrp_manager" model="res.groups">
-            <field name="name">制造管理用户</field>
-            <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
-            <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
-             <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
-        </record>
+<!--        <record id="group_sf_mrp_manager" model="res.groups">-->
+<!--            <field name="name">制造管理用户</field>-->
+<!--            <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>-->
+<!--            <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>-->
+<!--        </record>-->
+<!--         <record id="group_sf_mrp_manager" model="res.groups">-->
+<!--            <field name="name">制造管理用户</field>-->
+<!--            <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>-->
+<!--            <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>-->
+<!--        </record>-->
         <record id="group_sf_equipment_user" model="res.groups">
             <field name="name">机床操作岗</field>
             <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
@@ -28,7 +32,7 @@
 
         <record id="group_sf_mrp_manager" model="res.groups">
             <field name="name">生产总监</field>
-            <field name="implied_ids" eval="[(4, ref('group_sf_mrp_manager'))]"/>
+            <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
             <field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
         </record>
 
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 2e546366..a46f7f69 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -63,7 +63,7 @@ class SfMaintenanceEquipment(models.Model):
             else:
                 record.equipment_maintenance_standards_ids = False
 
-    MTcode = fields.Char("编码", default=get_no)
+    MTcode = fields.Char("机台编码", default=get_no)
     created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
     equipment_type = fields.Selection([('机床', '机床'), ('机器人', '机器人'), ('AGV小车', 'AGV小车'), ('检测设备', '检测设备')]
                                       , compute='_compute_category_id')
@@ -74,8 +74,8 @@ class SfMaintenanceEquipment(models.Model):
             if record:
                 record.equipment_type = record.category_id.equipment_type
 
-    code = fields.Char('机台号')
-    name = fields.Char('名称')
+    code = fields.Char('行业编码')
+    name = fields.Char('机台号')
     knife_type = fields.Selection(
         [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
         default="", string="刀把类型")
@@ -154,6 +154,20 @@ class SfMaintenanceEquipment(models.Model):
             result.append((parameter.id, name))
         return result
 
+    @api.model
+    def create(self, vals):
+        # 在创建设备之前执行一些自定义逻辑
+
+        vals.name = vals.MTcode + '#' + vals.type_id.name
+
+
+        equipment = super(SfMaintenanceEquipment, self).create(vals)
+
+        # 在创建设备之后执行一些自定义逻辑
+        # ...
+
+        return equipment
+
     # @api.constrains('rotate_speed')
     # def _check_rotate_speed(self):
     #     if self.rotate_speed <= 0:
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 435e291c..ff0b6e73 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -52,11 +52,13 @@
                         <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
                                 attrs="{'invisible': [('equipment_type', '!=', '机床'), ('brand_id','!=',False),('type_id','!=',False),('control_system_id','!=',False)]}"/>
                     </div>
+                </xpath>
+                  <xpath expr="//field[@name='category_id']" position="before">
+                   <field name="MTcode"/>
                 </xpath>
                 <xpath expr="//field[@name='category_id']" position="after">
                     <field name="state_zc"/>
-                    <field name="code"/>
-
+                    <field name="code" readonly="1"/>
                     <field name="equipment_type" invisible="1"/>
                     <field name="brand_id" force_save="1"/>
                     <field name="type_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 1ce0b1d7..1eadee0a 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -13,12 +13,14 @@ access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.gr
 access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,1
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_user,1,0,0,0
 access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_manager,1,1,1,1
-access_mrp_production,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_production,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_production_manager,mrp_production,model_mrp_production,sf_base.group_sf_mrp_manager,1,1,1,0
-access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workorder_manager,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_manager,1,1,1,0
-access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,1,1,0
+access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workcenter_manager,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_manager,1,1,1,0
+access_mrp_workcenter_productivity,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_user,1,0,0,0
+access_mrp_workcenter_productivity_manager,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_manager,1,1,1,0
 
 
 
diff --git a/sf_manufacturing/views/production_line_view.xml b/sf_manufacturing/views/production_line_view.xml
index 237697c3..c43885b4 100644
--- a/sf_manufacturing/views/production_line_view.xml
+++ b/sf_manufacturing/views/production_line_view.xml
@@ -89,7 +89,7 @@
         <field name="model">maintenance.equipment</field>
         <field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
          <field name="arch" type="xml">
-             <xpath expr="//field[@name='brand_id']" position="after">
+             <xpath expr="//field[@name='type_id']" position="after">
                  <field name="production_line_id"/>
              </xpath>
          </field>