1、sf_base新增刀具组模型;2、所以功能刀具相关模型添加刀具组对象字段(进行中);
This commit is contained in:
@@ -238,3 +238,12 @@ class MaintenanceStandardImage(models.Model):
|
|||||||
else:
|
else:
|
||||||
record['image'] = ""
|
record['image'] = ""
|
||||||
return records
|
return records
|
||||||
|
|
||||||
|
|
||||||
|
class ToolGroups(models.Model):
|
||||||
|
_name = 'sf.tool.groups'
|
||||||
|
_description = '刀具组'
|
||||||
|
|
||||||
|
name = fields.Char('名称')
|
||||||
|
equipment_ids = fields.Many2many('maintenance.equipment', 'ref_maintenance_equipment', string='机台号')
|
||||||
|
remark = fields.Char('备注', size=50)
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1,
|
|||||||
access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1
|
access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1
|
||||||
access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1
|
access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1
|
||||||
access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,base.group_user,1,1,1,1
|
access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,base.group_user,1,1,1,1
|
||||||
|
access_sf_tool_groups,sf_tool_groups,model_sf_tool_groups,base.group_user,1,1,1,1
|
||||||
access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,model_sf_tool_materials_basic_parameters,base.group_user,1,1,1,1
|
access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,model_sf_tool_materials_basic_parameters,base.group_user,1,1,1,1
|
||||||
access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1
|
access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1
|
||||||
access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1
|
access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1
|
||||||
|
|||||||
|
@@ -92,5 +92,12 @@
|
|||||||
action="action_maintenance_equipment_image"
|
action="action_maintenance_equipment_image"
|
||||||
sequence="5"/>
|
sequence="5"/>
|
||||||
|
|
||||||
|
<menuitem
|
||||||
|
id="menu_sf_tool_groups"
|
||||||
|
name="刀具组"
|
||||||
|
parent="menu_sf_cutting_tool"
|
||||||
|
action="sf_tool_groups_view_act"
|
||||||
|
sequence="10"/>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|||||||
@@ -493,6 +493,28 @@
|
|||||||
<field name="domain">[]</field>
|
<field name="domain">[]</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<!-- ================================================刀具组================================================ -->
|
||||||
|
<record id="sf_tool_groups_tree" model="ir.ui.view">
|
||||||
|
<field name="name">刀具组</field>
|
||||||
|
<field name="model">sf.tool.groups</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<tree create="1" edit="1" delete="1" editable="bottom">
|
||||||
|
<field name="name"/>
|
||||||
|
<field name="equipment_ids" widget="many2many_tags"/>
|
||||||
|
<field name="remark"/>
|
||||||
|
<field name="create_uid" string="创建人"/>
|
||||||
|
<field name="create_date" string="创建时间"/>
|
||||||
|
</tree>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="sf_tool_groups_view_act" model="ir.actions.act_window">
|
||||||
|
<field name="name">刀具组</field>
|
||||||
|
<field name="type">ir.actions.act_window</field>
|
||||||
|
<field name="res_model">sf.tool.groups</field>
|
||||||
|
<field name="view_mode">tree,form,search</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<!-- ================================================刀具基础参数================================================ -->
|
<!-- ================================================刀具基础参数================================================ -->
|
||||||
<!-- <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
|
<!-- <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
|
||||||
<!-- <field name="name">sf.tool.materials.basic.parameters.tree</field>-->
|
<!-- <field name="name">sf.tool.materials.basic.parameters.tree</field>-->
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ class FunctionalCuttingToolEntity(models.Model):
|
|||||||
_name = 'sf.functional.cutting.tool.entity'
|
_name = 'sf.functional.cutting.tool.entity'
|
||||||
_description = '功能刀具列表'
|
_description = '功能刀具列表'
|
||||||
|
|
||||||
# code = fields.Char('序列号')
|
code = fields.Char('编码', related='functional_tool_name_id.code')
|
||||||
|
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
|
||||||
name = fields.Char(related='functional_tool_name_id.name')
|
name = fields.Char(related='functional_tool_name_id.name')
|
||||||
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
|
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
|
||||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
|
||||||
@@ -175,6 +176,8 @@ class FunctionalToolWarning(models.Model):
|
|||||||
_name = 'sf.functional.tool.warning'
|
_name = 'sf.functional.tool.warning'
|
||||||
_description = '功能刀具预警'
|
_description = '功能刀具预警'
|
||||||
|
|
||||||
|
code = fields.Char('编码', related='functional_tool_name_id.code')
|
||||||
|
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
|
||||||
name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name')
|
name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name')
|
||||||
# 机床信息
|
# 机床信息
|
||||||
production_line_id = fields.Many2one('sf.production.line', string='生产线',
|
production_line_id = fields.Many2one('sf.production.line', string='生产线',
|
||||||
@@ -243,6 +246,8 @@ class StockMoveLine(models.Model):
|
|||||||
diameter = fields.Integer(string='刀具直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
|
diameter = fields.Integer(string='刀具直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
|
||||||
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
|
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
|
||||||
install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time')
|
install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time')
|
||||||
|
code = fields.Char('编码', related='functional_tool_name_id.code')
|
||||||
|
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _read_group_functional_tool_type_id(self, categories, domain, order):
|
def _read_group_functional_tool_type_id(self, categories, domain, order):
|
||||||
@@ -255,6 +260,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
|
|||||||
_description = '功能刀具安全库存'
|
_description = '功能刀具安全库存'
|
||||||
|
|
||||||
name = fields.Char('功能刀具名称', readonly=False)
|
name = fields.Char('功能刀具名称', readonly=False)
|
||||||
|
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组')
|
||||||
sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False,
|
sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False,
|
||||||
group_expand='_read_mrs_cutting_tool_type_ids', store=True)
|
group_expand='_read_mrs_cutting_tool_type_ids', store=True)
|
||||||
diameter = fields.Integer(string='刀具直径(mm)', readonly=False)
|
diameter = fields.Integer(string='刀具直径(mm)', readonly=False)
|
||||||
@@ -421,6 +427,8 @@ class MachineTableToolChangingApply(models.Model):
|
|||||||
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True,
|
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True,
|
||||||
required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]")
|
required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]")
|
||||||
# 功能刀具信息
|
# 功能刀具信息
|
||||||
|
code = fields.Char('编码', related='functional_tool_name_id.code')
|
||||||
|
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
|
||||||
functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True)
|
functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True)
|
||||||
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True,
|
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True,
|
||||||
domain=[('product_id.name', '=', '功能刀具')],
|
domain=[('product_id.name', '=', '功能刀具')],
|
||||||
|
|||||||
Reference in New Issue
Block a user