解决冲突
This commit is contained in:
mgw
@@ -84,7 +84,31 @@ class MachineTool(models.Model):
|
||||
state = fields.Selection(
|
||||
[("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
|
||||
default='正常', string="机床状态")
|
||||
|
||||
#0606新增字段
|
||||
machine_tool_picture = fields.Binary('机床图片')
|
||||
heightened_way = fields.Selection([
|
||||
('sifudianji', '伺服电机驱动'),
|
||||
('youyagang', '油压缸驱动'),
|
||||
('chilunjia', '齿轮架驱动')
|
||||
], string="主轴加高方式", default='sifudianji')
|
||||
workpiece_load = fields.Char('工件负载')
|
||||
lead_screw = fields.Char('丝杆')
|
||||
workbench_L = fields.Char('工作台长度(mm)')
|
||||
workbench_W = fields.Char('工作台宽度(mm)')
|
||||
guide_rail = fields.Char('导轨')
|
||||
machine_tool_L = fields.Char('机床长度(mm)')
|
||||
machine_tool_W = fields.Char('机床宽度(mm)')
|
||||
machine_tool_H = fields.Char('机床高度(mm)')
|
||||
feed_speed = fields.Char('进给速度(mm/min)')
|
||||
tool_speed = fields.Char('刀具速度')
|
||||
distance = fields.Char('主轴端面至工作台面距离(mm)')
|
||||
taper = fields.Char('主轴锥度(°)')
|
||||
torque = fields.Char('主轴点击扭矩(n/m)')
|
||||
motor_power = fields.Char('主轴电机功率(kw)')
|
||||
tool_quality_max = fields.Char('刀具最大质量')
|
||||
tool_long_max = fields.Char('刀具最大长度')
|
||||
tool_diameter_max = fields.Char('刀具最大刀径')
|
||||
machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
|
||||
# 一个机床对应一個加工工厂，一个加工工厂对应多个机床
|
||||
factory_id = fields.Many2one('res.partner', string='所属工厂',
|
||||
domain="[('is_factory', '=', True)]")
|
||||
@@ -152,6 +176,26 @@ class MachineTool(models.Model):
|
||||
item.z_axis = item.type_id.z_axis
|
||||
item.b_axis = item.type_id.b_axis
|
||||
item.c_axis = item.type_id.c_axis
|
||||
item.machine_tool_picture = item.type_id.machine_tool_picture
|
||||
item.heightened_way = item.type_id.heightened_way
|
||||
item.workpiece_load = item.type_id.workpiece_load
|
||||
item.lead_screw = item.type_id.lead_screw
|
||||
item.workbench_L = item.type_id.workbench_L
|
||||
item.workbench_W = item.type_id.workbench_W
|
||||
item.guide_rail = item.type_id.guide_rail
|
||||
item.machine_tool_L = item.type_id.machine_tool_L
|
||||
item.machine_tool_W = item.type_id.machine_tool_W
|
||||
item.machine_tool_H = item.type_id.machine_tool_H
|
||||
item.feed_speed = item.type_id.feed_speed
|
||||
item.tool_speed = item.type_id.tool_speed
|
||||
item.distance = item.type_id.distance
|
||||
item.taper = item.type_id.taper
|
||||
item.torque = item.type_id.torque
|
||||
item.motor_power = item.type_id.motor_power
|
||||
item.tool_quality_max = item.type_id.tool_quality_max
|
||||
item.tool_long_max = item.type_id.tool_long_max
|
||||
item.tool_diameter_max = item.type_id.tool_diameter_max
|
||||
item.machine_tool_category = item.type_id.machine_tool_category.id
|
||||
|
||||
# 注册同步机床
|
||||
def enroll_machine_tool(self):
|
||||
@@ -214,6 +258,33 @@ class MachineToolType(models.Model):
|
||||
default="", string="刀把类型")
|
||||
number_of_knife_library = fields.Integer('刀库数量')
|
||||
rotate_speed = fields.Integer('转速')
|
||||
#0606新增字段
|
||||
created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
|
||||
machine_tool_picture = fields.Binary('机床图片')
|
||||
heightened_way = fields.Selection([
|
||||
('sifudianji', '伺服电机驱动'),
|
||||
('youyagang', '油压缸驱动'),
|
||||
('chilunjia', '齿轮架驱动')
|
||||
], string="主轴加高方式", default='sifudianji')
|
||||
workpiece_load = fields.Char('工件负载')
|
||||
lead_screw = fields.Char('丝杆')
|
||||
workbench_L = fields.Char('工作台长度(mm)')
|
||||
workbench_W = fields.Char('工作台宽度(mm)')
|
||||
guide_rail = fields.Char('导轨')
|
||||
machine_tool_L = fields.Char('机床长度(mm)')
|
||||
machine_tool_W = fields.Char('机床宽度(mm)')
|
||||
machine_tool_H = fields.Char('机床高度(mm)')
|
||||
feed_speed = fields.Char('进给速度(mm/min)')
|
||||
tool_speed = fields.Char('刀具速度')
|
||||
distance = fields.Char('主轴端面至工作台面距离(mm)')
|
||||
taper = fields.Char('主轴锥度(°)')
|
||||
torque = fields.Char('主轴点击扭矩(n/m)')
|
||||
motor_power = fields.Char('主轴电机功率(kw)')
|
||||
tool_quality_max = fields.Char('刀具最大质量')
|
||||
tool_long_max = fields.Char('刀具最大长度')
|
||||
tool_diameter_max = fields.Char('刀具最大刀径')
|
||||
machine_tool_category = fields.Many2one('sf.machine_tool.category', string='机床类型')
|
||||
|
||||
# 多个型号对应一个机床
|
||||
machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
|
||||
number_of_axles = fields.Selection(
|
||||
@@ -259,3 +330,14 @@ class CuttingToolType(models.Model):
|
||||
brand_id = fields.Many2one('sf.machine.brand', string='品牌')
|
||||
remark = fields.Text('备注')
|
||||
active = fields.Boolean('有效', default=True)
|
||||
|
||||
class MachineToolCategory(models.Model):
|
||||
_name = 'sf.machine_tool.category'
|
||||
_description = '机床类型'
|
||||
|
||||
code = fields.Char('编码')
|
||||
name = fields.Char('名称')
|
||||
remark = fields.Text('备注')
|
||||
category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别',
|
||||
default='shukong')
|
||||
|
||||
|
||||
@@ -91,66 +91,88 @@
|
||||
<field name="name"/>
|
||||
<field name="brand_id"/>
|
||||
<field name="remark"/>
|
||||
<field name="machine_tool_picture" widget="image"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="form_sf_machine_tool_type">
|
||||
<record model="ir.ui.view" id="form_sf_machine_tool_type">
|
||||
<field name="name">form.sf.machine_tool.type</field>
|
||||
<field name="model">sf.machine_tool.type</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="机床型号">
|
||||
<group string="基本信息" name="base_info">
|
||||
<group>
|
||||
<field name="code" force_save="1" readonly="1"/>
|
||||
<field name="name" required="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="brand_id" required="1"
|
||||
domain="[('tag_ids', '=', '机床')]"
|
||||
options="{'no_create': True}"/>
|
||||
</group>
|
||||
</group>
|
||||
<field name="machine_tool_picture" widget="image"/>
|
||||
<group string="基本信息">
|
||||
<group>
|
||||
<field name="code" force_save="1" readonly="1"/>
|
||||
<field name="name" required="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="machine_tool_category"/>
|
||||
<field name="brand_id" required="1"
|
||||
domain="[('tag_ids', '=', '机床')]"
|
||||
options="{'no_create': True}" />
|
||||
</group>
|
||||
</group>
|
||||
<group string="参数">
|
||||
<group>
|
||||
<field name="knife_type" required="1"/>
|
||||
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
|
||||
<field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
|
||||
<label for="x_axis" string="加工行程(mm)"
|
||||
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
|
||||
<div class="o_address_format"
|
||||
attrs="{'invisible': [('number_of_axles', '=', False)]}">
|
||||
<label for="x_axis" string="x"/>
|
||||
<field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
|
||||
<label for="y_axis" string="y"/>
|
||||
<field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
|
||||
<label for="z_axis" string="z"/>
|
||||
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
|
||||
<label for="b_axis" string="b"
|
||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
|
||||
<field name="b_axis" class="o_address_city" required="1"
|
||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
|
||||
options="{'format': false}"/>
|
||||
<label for="c_axis" string="c"
|
||||
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
|
||||
<field name="c_axis" class="o_address_zip" required="1"
|
||||
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
|
||||
options="{'format': false}"/>
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="rotate_speed" string="转速(min)" required="1" options="{'format': false}"/>
|
||||
<field name="precision" required="1" string="加工精度(mm)"/>
|
||||
<field name="control_system_id" required="1" options="{'no_create': True}"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="control_system_id" required="1" options="{'no_create': True}" />
|
||||
<field name="workbench_L" required="1"/>
|
||||
<field name="workbench_W" required="1"/>
|
||||
<field name="machine_tool_L" required="1"/>
|
||||
<field name="machine_tool_W" required="1"/>
|
||||
<field name="machine_tool_H" required="1"/>
|
||||
<field name="knife_type" required="1"/>
|
||||
<field name="workpiece_load" required="1"/>
|
||||
<field name="lead_screw" required="1"/>
|
||||
<field name="taper" required="1"/>
|
||||
<field name="torque" required="1"/>
|
||||
<field name="motor_power" required="1"/>
|
||||
|
||||
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
|
||||
<field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
|
||||
<label for="x_axis" string="加工行程(mm)"
|
||||
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
|
||||
<div class="test_model"
|
||||
attrs="{'invisible': [('number_of_axles', '=', False)]}">
|
||||
<label for="x_axis" string="x"/>
|
||||
<field name="x_axis" class="o_address_zip" required="1" options="{'format': false}" />
|
||||
<span>&nbsp;</span>
|
||||
<label for="y_axis" string="y"/>
|
||||
<field name="y_axis" class="o_address_zip" required="1" options="{'format': false}" />
|
||||
<span>&nbsp;</span>
|
||||
<label for="z_axis" string="z"/>
|
||||
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}" />
|
||||
<br></br>
|
||||
<label for="b_axis" string="b"
|
||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
|
||||
<field name="b_axis" class="o_address_zip" required="1"
|
||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}" options="{'format': false}" />
|
||||
<span>&nbsp;</span>
|
||||
<label for="c_axis" string="c"
|
||||
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
|
||||
<field name="c_axis" class="o_address_zip" required="1"
|
||||
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}" options="{'format': false}" />
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="heightened_way" required="1"/>
|
||||
<field name="tool_quality_max" required="1"/>
|
||||
<field name="tool_long_max" required="1"/>
|
||||
<field name="tool_diameter_max" required="1"/>
|
||||
<field name="guide_rail" required="1"/>
|
||||
|
||||
<field name="feed_speed" required="1"/>
|
||||
<field name="tool_speed" required="1"/>
|
||||
<field name="distance" required="1"/>
|
||||
<field name="rotate_speed" string="主轴转速(min)" required="1" options="{'format': false}"/>
|
||||
<field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
|
||||
|
||||
</group>
|
||||
</group>
|
||||
<group string="其它">
|
||||
<field name="remark"/>
|
||||
</group>
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
@@ -169,6 +191,70 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
#------------------机床类型------------------
|
||||
|
||||
<record model="ir.ui.view" id="search_sf_machine_tool_category_view">
|
||||
<field name="name">search.sf.machine_tool.category</field>
|
||||
<field name="model">sf.machine_tool.category</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="机床类型">
|
||||
<field name="name" string="模糊搜索"
|
||||
filter_domain="['|',('name', 'ilike', self),('remark', 'ilike', self)]"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="tree_sf_machine_tool_category_view">
|
||||
<field name="name">tree.sf.machine_tool.category</field>
|
||||
<field name="model">sf.machine_tool.category</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="机床类型">
|
||||
<field name="code"/>
|
||||
<field name="name"/>
|
||||
<field name="category"/>
|
||||
<field name="remark"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="form_sf_machine_tool_category">
|
||||
<field name="name">form.sf.machine_tool.category</field>
|
||||
<field name="model">sf.machine_tool.category</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="机床类型">
|
||||
<group string="基本信息" name="base_info">
|
||||
<group>
|
||||
<field name="code" force_save="1" readonly="1"/>
|
||||
<field name="name" required="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="category" readonly="1"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
<group string="其它">
|
||||
<field name="remark"/>
|
||||
</group>
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_sf_machine_tool_category" model="ir.actions.act_window">
|
||||
<field name="name">机床类型</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">sf.machine_tool.category</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="help" type="html">
|
||||
<p class="o_view_nocontent_smiling_face">
|
||||
[机床型号] 还没有哦！点左上角的[创建]按钮，沙发归你了!
|
||||
</p>
|
||||
<p>
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
#------------------刀具型号------------------
|
||||
|
||||
<record model="ir.ui.view" id="search_sf_cutting_tool_type_view">
|
||||
|
||||
@@ -120,6 +120,12 @@
|
||||
name="机床型号"
|
||||
sequence="1"
|
||||
action="action_sf_machine_tool_type"/>
|
||||
<menuitem
|
||||
id="menu_sf_machine_tool_category"
|
||||
parent="menu_sf_base"
|
||||
name="机床类型"
|
||||
sequence="1"
|
||||
action="action_sf_machine_tool_category"/>
|
||||
|
||||
<menuitem
|
||||
id="menu_sf_cutting_tool"
|
||||
|
||||
Reference in New Issue
Block a user