开发测试制造模块权限,修改设备机床类别的布局以及编码规则
This commit is contained in:
@@ -4,12 +4,16 @@
|
|||||||
<field name="name">制造普通用户</field>
|
<field name="name">制造普通用户</field>
|
||||||
<field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
|
<field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
|
||||||
</record>
|
</record>
|
||||||
<record id="group_sf_mrp_manager" model="res.groups">
|
<!-- <record id="group_sf_mrp_manager" model="res.groups">-->
|
||||||
<field name="name">制造管理用户</field>
|
<!-- <field name="name">制造管理用户</field>-->
|
||||||
<field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
|
<!-- <field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>-->
|
||||||
<field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
|
<!-- <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>
|
<!-- <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">
|
<record id="group_sf_equipment_user" model="res.groups">
|
||||||
<field name="name">机床操作岗</field>
|
<field name="name">机床操作岗</field>
|
||||||
<field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
|
<field name="implied_ids" eval="[(4, ref('group_sf_mrp_user'))]"/>
|
||||||
@@ -28,7 +32,7 @@
|
|||||||
|
|
||||||
<record id="group_sf_mrp_manager" model="res.groups">
|
<record id="group_sf_mrp_manager" model="res.groups">
|
||||||
<field name="name">生产总监</field>
|
<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"/>
|
<field name="category_id" ref="base.module_category_manufacturing_manufacturing"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ class SfMaintenanceEquipment(models.Model):
|
|||||||
else:
|
else:
|
||||||
record.equipment_maintenance_standards_ids = False
|
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)
|
created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
|
||||||
equipment_type = fields.Selection([('机床', '机床'), ('机器人', '机器人'), ('AGV小车', 'AGV小车'), ('检测设备', '检测设备')]
|
equipment_type = fields.Selection([('机床', '机床'), ('机器人', '机器人'), ('AGV小车', 'AGV小车'), ('检测设备', '检测设备')]
|
||||||
, compute='_compute_category_id')
|
, compute='_compute_category_id')
|
||||||
@@ -74,8 +74,8 @@ class SfMaintenanceEquipment(models.Model):
|
|||||||
if record:
|
if record:
|
||||||
record.equipment_type = record.category_id.equipment_type
|
record.equipment_type = record.category_id.equipment_type
|
||||||
|
|
||||||
code = fields.Char('机台号')
|
code = fields.Char('行业编码')
|
||||||
name = fields.Char('名称')
|
name = fields.Char('机台号')
|
||||||
knife_type = fields.Selection(
|
knife_type = fields.Selection(
|
||||||
[("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
|
[("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
|
||||||
default="", string="刀把类型")
|
default="", string="刀把类型")
|
||||||
@@ -154,6 +154,20 @@ class SfMaintenanceEquipment(models.Model):
|
|||||||
result.append((parameter.id, name))
|
result.append((parameter.id, name))
|
||||||
return result
|
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')
|
# @api.constrains('rotate_speed')
|
||||||
# def _check_rotate_speed(self):
|
# def _check_rotate_speed(self):
|
||||||
# if self.rotate_speed <= 0:
|
# if self.rotate_speed <= 0:
|
||||||
|
|||||||
@@ -52,11 +52,13 @@
|
|||||||
<button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
|
<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)]}"/>
|
attrs="{'invisible': [('equipment_type', '!=', '机床'), ('brand_id','!=',False),('type_id','!=',False),('control_system_id','!=',False)]}"/>
|
||||||
</div>
|
</div>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='category_id']" position="before">
|
||||||
|
<field name="MTcode"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='category_id']" position="after">
|
<xpath expr="//field[@name='category_id']" position="after">
|
||||||
<field name="state_zc"/>
|
<field name="state_zc"/>
|
||||||
<field name="code"/>
|
<field name="code" readonly="1"/>
|
||||||
|
|
||||||
<field name="equipment_type" invisible="1"/>
|
<field name="equipment_type" invisible="1"/>
|
||||||
<field name="brand_id" force_save="1"/>
|
<field name="brand_id" force_save="1"/>
|
||||||
<field name="type_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
|
<field name="type_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
|
||||||
|
|||||||
@@ -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_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,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_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_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_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_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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
|
@@ -89,7 +89,7 @@
|
|||||||
<field name="model">maintenance.equipment</field>
|
<field name="model">maintenance.equipment</field>
|
||||||
<field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
|
<field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
|
||||||
<field name="arch" type="xml">
|
<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"/>
|
<field name="production_line_id"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
|
|||||||
Reference in New Issue
Block a user