jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改机床型号参数缺陷

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-08-15 17:31:27 +08:00
parent 0ecd4e4c3b
commit e0f43fa9fe
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/models/base.py
View File

@@ -64,7 +64,7 @@ class MachineTool(models.Model):
knife_type = fields.Selection( knife_type = fields.Selection(
[("BT40", "BT40"), ("BT30", "BT30")], [("BT40", "BT40"), ("BT30", "BT30")],
default="", string="刀把类型") default="", string="刀把类型")
number_of_knife_library = fields.Integer('刀库数量') number_of_knife_library = fields.Integer('刀库数量(把)')
rotate_speed = fields.Integer('转速') rotate_speed = fields.Integer('转速')
number_of_axles = fields.Selection( number_of_axles = fields.Selection(
[("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")], [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
@@ -281,7 +281,7 @@ class MachineToolType(models.Model):
distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)') distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)')
distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)') distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)')
taper = fields.Char('主轴锥度(°)') taper = fields.Char('主轴锥度(°)')
torque = fields.Char('主轴点击扭矩(n/m)') torque = fields.Char('主轴电机扭矩(n/m)')
motor_power = fields.Char('主轴电机功率(kw)') motor_power = fields.Char('主轴电机功率(kw)')
tool_quality_max = fields.Char('刀具最大质量(kg)') tool_quality_max = fields.Char('刀具最大质量(kg)')
tool_long_max = fields.Char('刀具最大长度(mm)') tool_long_max = fields.Char('刀具最大长度(mm)')

7
sf_base/static/src/scss/test.scss
View File

@@ -6,3 +6,10 @@
margin-right: 0px !important; margin-right: 0px !important;
white-space: nowrap; white-space: nowrap;
} }
.o_form_label.o_field_invalid::after {
content: '*' !important;
color: red !important;
padding: 0 4px !important;
vertical-align: top !important;
font-size: 1.5rem !important;
}

19
sf_base/views/base_view.xml
View File

@@ -102,11 +102,16 @@
<field name="model">sf.machine_tool.type</field> <field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="机床型号" create="0" edit="0" delete="0"> <form string="机床型号" create="0" edit="0" delete="0">
<sheet> <sheet>
<div class="oe_title">
<label for="name"/>
<h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>
</div>
<group> <group>
<group> <group>
<field name="code" force_save="1" readonly="1"/> <field name="code" force_save="1" readonly="1"/>
<field name="name" required="1"/>
<field name="brand_id" required="1" <field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]" domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}"/> options="{'no_create': True}"/>
@@ -191,7 +196,7 @@
</group> </group>
<group string="主轴"> <group string="主轴">
<field name="taper" required="1"/> <field name="taper" required="1"/>
<field name="rotate_speed" string="主轴转速(min)" required="1" <field name="rotate_speed" string="主轴转速(r/min)" required="1"
options="{'format': false}"/> options="{'format': false}"/>
<field name="heightened_way" required="1"/> <field name="heightened_way" required="1"/>
<field name="torque" required="1"/> <field name="torque" required="1"/>
@@ -216,11 +221,11 @@
<div class="test_model"> <div class="test_model">
<label for="tool_diameter_min" string="最小(min)"/> <label for="tool_diameter_min" string="最小(min)"/>
<field name="tool_diameter_min" class="o_address_zip" required="1" <field name="tool_diameter_min" class="o_address_zip" required="1"
options="{'format': false}"/> options="{'format': false}"/>Φ
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
<label for="tool_diameter_max" string="最大(max)"/> <label for="tool_diameter_max" string="最大(max)"/>
<field name="tool_diameter_max" class="o_address_zip" required="1" <field name="tool_diameter_max" class="o_address_zip" required="1"
options="{'format': false}"/> options="{'format': false}"/>Φ
</div> </div>
<field name="tool_quality_max" required="1"/> <field name="tool_quality_max" required="1"/>
</group> </group>
@@ -348,6 +353,10 @@
<button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册" <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
attrs="{'invisible': [('code','!=',False)]}"/> attrs="{'invisible': [('code','!=',False)]}"/>
</header> </header>
<div class="oe_title">
<label for="name"/>
<h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>
</div>
<group string="基本信息"> <group string="基本信息">
<group> <group>
<field name="MTcode" string="编码"/> <field name="MTcode" string="编码"/>
@@ -357,7 +366,7 @@
options="{'no_create': True}"/> options="{'no_create': True}"/>
</group> </group>
<group> <group>
<field name="name" required="1"/>
<field name="type_id" required="1" options="{'no_create': True}" <field name="type_id" required="1" options="{'no_create': True}"
domain="[('brand_id', '=', brand_id)]" attrs="{'invisible': [('brand_id','=',False)]}"/> domain="[('brand_id', '=', brand_id)]" attrs="{'invisible': [('brand_id','=',False)]}"/>
</group> </group>

4
sf_maintenance/models/sf_maintenance.py
View File

@@ -72,7 +72,7 @@ class SfMaintenanceEquipment(models.Model):
knife_type = fields.Selection( knife_type = fields.Selection(
[("BT40", "BT40"), ("BT30", "BT30")], [("BT40", "BT40"), ("BT30", "BT30")],
default="", string="刀把类型") default="", string="刀把类型")
number_of_knife_library = fields.Integer('刀库数量') number_of_knife_library = fields.Integer('刀库数量(把)')
rotate_speed = fields.Integer('转速') rotate_speed = fields.Integer('转速')
number_of_axles = fields.Selection( number_of_axles = fields.Selection(
[("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")], [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")],
@@ -116,7 +116,7 @@ class SfMaintenanceEquipment(models.Model):
distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)') distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)')
distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)') distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)')
taper = fields.Char('主轴锥度(°)') taper = fields.Char('主轴锥度(°)')
torque = fields.Char('主轴点击扭矩(n/m)') torque = fields.Char('主轴电机扭矩(n/m)')
motor_power = fields.Char('主轴电机功率(kw)') motor_power = fields.Char('主轴电机功率(kw)')
tool_quality_max = fields.Char('刀具最大质量(kg)') tool_quality_max = fields.Char('刀具最大质量(kg)')
tool_long_max = fields.Char('刀具最大长度(mm)') tool_long_max = fields.Char('刀具最大长度(mm)')

2
sf_maintenance/views/maintenance_views.xml
View File

@@ -111,7 +111,7 @@
</group> </group>
<group string="主轴"> <group string="主轴">
<field name="taper" required="1"/> <field name="taper" required="1"/>
<field name="rotate_speed" string="主轴转速(min)" required="1" <field name="rotate_speed" string="主轴转速(min/s)" required="1"
options="{'format': false}"/> options="{'format': false}"/>
<field name="heightened_way" required="1"/> <field name="heightened_way" required="1"/>
<field name="torque" required="1"/> <field name="torque" required="1"/>