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

修复sf同步问题

Browse Source
This commit is contained in:
gqh
2022-10-11 16:01:36 +08:00
parent 6d2292e1d0
commit aebd4d3f32
6 changed files with 206 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/models/sf_base.py
View File

@@ -9,10 +9,8 @@ _logger = logging.getLogger(__name__)
class MachineBrandTags(models.Model):
_name = 'mrs.machine.brand.tags'
_description = '标签'
brand_id = fields.Many2one('mrs.machine.brand', '品牌')
name = fields.Char('名称', size=50)
color = fields.Integer('颜色', default=0)
active = fields.Boolean('有效', default=True)
class MachineControlSystem(models.Model):
@@ -108,7 +106,7 @@ class MachineToolType(models.Model):
c_axis = fields.Integer('C轴')
remark = fields.Text('备注')
precision = fields.Float('加工精度')
control_system_id = fields.Many2one('mrs.machine_tool.type.control_system',
control_system_id = fields.Many2one('mrs.machine.control_system',
string="控制系统")
active = fields.Boolean('有效', default=True)
code = fields.Char('编码')

12
sf_base/views/menu_view.xml
View File

@@ -17,14 +17,14 @@
groups="base.group_system"/>-->
<menuitem
id="menu_mrs_machine_tool"
parent="mrp.menu_mrp_configuration"
name="机床注册"
parent="menu_mrs_base"
name="机床"
sequence="0"
action="action_mrs_machine_tool"
/>
<menuitem
sequence="0"
sequence="2"
name="基础数据"
id="menu_mrs_base"
action="mrs_production_materials"
@@ -34,7 +34,7 @@
id="menu_mrs_production_materials_1"
name="原材料"
parent="mrp.menu_mrp_configuration"
sequence="0"
sequence="3"
/>
@@ -50,7 +50,7 @@
id="menu_mrs_production_process_1"
name="工艺"
parent="mrp.menu_mrp_configuration"
sequence="0"
sequence="4"
/>
@@ -110,7 +110,7 @@
id="menu_mrs_cutting_tool"
parent="mrp.menu_mrp_configuration"
name="刀具"
sequence="0"/>
sequence="5"/>
<menuitem
id="menu_mrs_cutting_tool_category"

21
sf_base/views/mrs_base_view.xml
View File

@@ -107,7 +107,8 @@
</group>
<group>
<field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]"/>
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}" />
</group>
</group>
<group string="参数">
@@ -120,25 +121,25 @@
<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"/>
<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"/>
<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"/>
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}" />
<label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '3轴')]}"/>
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
<field name="b_axis" class="o_address_city" required="1"
attrs="{'invisible': [('number_of_axles', '=', '3轴')]}"/>
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}" options="{'format': false}" />
<label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['3轴','4轴'])]}"/>
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
<field name="c_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', 'in', ['3轴','4轴'])]}"/>
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" />
<field name="precision" required="1" string="加工精度(mm)"/>
<field name="control_system_id" required="1" options="{'no_create': True}" />
</group>
</group>
<group string="其它">