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

新增了功能刀具列表的form视图，简化了tree视图字段

Browse Source
This commit is contained in:
yuxianghui
2023-07-25 17:42:47 +08:00
parent 810ec1fd6c
commit d3c7f8cd56
2 changed files with 166 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
sf_tool_management/models/base.py
View File

@@ -12,7 +12,7 @@ class FunctionalCuttingToolEntity(models.Model):
_inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'} _inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
# 新添加的关联到原模型的字段 # 新添加的关联到原模型的字段
sf_functional_cutting_tool_entity_id = fields.Many2one('sf.functional.cutting.tool', ondelete='cascade') sf_functional_cutting_tool_entity_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具')
order = fields.Char(string='序') order = fields.Char(string='序')
functional_cutting_tool_id = fields.Char(string='功能刀具', invisible=True) functional_cutting_tool_id = fields.Char(string='功能刀具', invisible=True)
# 功能刀具预警 特有字段 # 功能刀具预警 特有字段
@@ -53,18 +53,18 @@ class FunctionalCuttingToolEntity(models.Model):
# remark = fields.Text(string='备注/说明') # remark = fields.Text(string='备注/说明')
# 功能刀具实时分布 # 功能刀具实时分布
tool_stock_num = fields.Text(string='刀具房库存数量') tool_stock_num = fields.Char(string='刀具房库存数量')
side_shelf_num = fields.Text(string='线边货架货架数量') side_shelf_num = fields.Char(string='线边货架货架数量')
on_tool_stock_num = fields.Text(string='机内刀库库存数量') on_tool_stock_num = fields.Char(string='机内刀库库存数量')
tool_stock_total = fields.Text(string='合计') tool_stock_total = fields.Char(string='合计')
return_reuse_num_re = fields.Text(string='归还再用数量(精)') return_reuse_num_re = fields.Char(string='归还再用数量(精)')
return_reuse_num_co = fields.Text(string='归还再用数量(粗)') return_reuse_num_co = fields.Char(string='归还再用数量(粗)')
return_processing_num = fields.Text(string='归还需磨削数量') return_processing_num = fields.Char(string='归还需磨削数量')
return_total = fields.Text(string='合计') return_total = fields.Char(string='合计')
total = fields.Text(string='总计') total = fields.Char(string='总计')
# remark = fields.Char(string='备注/说明') # remark = fields.Char(string='备注/说明')
# @api.onchange('functional_cutting_tool_id') # @api.onchange('functional_cutting_tool_id')
# def get_functional_cutting_tool_info(self): # def get_functional_cutting_tool_info(self):
# for item in self: # for item in self:
@@ -90,7 +90,6 @@ class FunctionalCuttingToolEntity(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
if not vals.get('order'): if not vals.get('order'):
vals['order'] = self._generate_code() vals['order'] = self._generate_code()
return super(FunctionalCuttingToolEntity, self).create(vals) return super(FunctionalCuttingToolEntity, self).create(vals)
@@ -105,6 +104,76 @@ class FunctionalCuttingToolEntity(models.Model):
new_code = '001' new_code = '001'
return new_code return new_code
# class FunctionalToolWarning(models.Model):
# _name = 'sf.functional.tool.warning'
# _description = '功能刀具预警'
#
# functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool', '功能刀具')
#
# code = fields.Char('编码')
# name = fields.Char('名称')
# mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
#
# # 整体式刀具型号
# mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
# string='整体式刀具型号', domain=
# [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# # 刀片型号
# mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
# string='刀片型号', domain=
# [('mrs_cutting_tool_material_name', '=', '刀片')])
# # 刀杆型号
# mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
# 'rel_cutterbar_model_functional_sf',
# string='刀杆型号', domain=
# [('mrs_cutting_tool_material_name', '=', '刀杆')])
# # 刀盘型号
# mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
# 'rel_cutterpad_model_functional_sf',
# string='刀盘型号', domain=
# [('mrs_cutting_tool_material_name', '=', '刀盘')])
# # 刀柄型号
# mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
# 'rel_cutterhandle_model_functional_sf',
# string='刀柄型号',
# domain=
# [('mrs_cutting_tool_material_name', '=', '刀柄')])
# # 夹头型号
# mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
# 'rel_cutterhead_model_functional_sf',
# string='夹头型号', domain=
# [('mrs_cutting_tool_material_name', '=', '夹头')])
#
# diameter = fields.Float('直径(mm)')
# tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
# string='刀具等级')
# machining_accuracy = fields.Float('加工精度(mm)')
# tool_length = fields.Float('装刀长')
# blade_number = fields.Integer('刃数')
# integral_blade_length = fields.Float('整体刃长(mm)')
# effective_blade_length = fields.Float('有效刃长(mm)')
# max_life = fields.Float('最大寿命值')
# is_standard = fields.Boolean('是否标准刀')
# applicable_range = fields.Char('适用范围')
# image = fields.Binary('图片')
#
# # 功能刀具预警 特有字段
# install_tool_time = fields.Char("装刀时间")
# outbound_time = fields.Char('出库时间')
# on_board_time = fields.Char('上机时间')
# machine_tool_code = fields.Char('机台号')
# cutting_tool_code = fields.Char('刀位号')
# idle_time = fields.Char('闲置时长')
# alarm_value = fields.Char('报警值')
# used_value = fields.Char('已使用值')
# alarm_type = fields.Char('报警类型')
# alarm_time = fields.Char('报警时间')
# dispose_user = fields.Char('处理人')
# dispose_time = fields.Char('处理时间')
# dispose_func = fields.Char('处理方法/措施')
# remark = fields.Char('备注')
class MachineTableToolChangingApply(models.Model): class MachineTableToolChangingApply(models.Model):
_name = 'sf.machine.table.tool.changing.apply' _name = 'sf.machine.table.tool.changing.apply'

108
sf_tool_management/views/tool_base_views.xml
View File

@@ -6,37 +6,102 @@
<field name="name">sf.functional.cutting.tool.entity.list.tree</field> <field name="name">sf.functional.cutting.tool.entity.list.tree</field>
<field name="model">sf.functional.cutting.tool.entity</field> <field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="功能刀具"> <tree string="功能刀具列表">
<field name="code" /> <field name="code" />
<field name="name" /> <field name="name" />
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_type_id" /> <field name="mrs_cutting_tool_type_id" />
<field name="mrs_cutting_tool_model_id"/> <field name="image" widget='image'/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="show"/>
<field name="diameter" optional="show"/>
<field name="tool_grade" optional="show"/>
<field name="machining_accuracy" optional="hide"/>
<field name="tool_length" optional="show"/>
<field name="blade_number" optional="show"/>
<field name="integral_blade_length" optional="show"/>
<field name="effective_blade_length" optional="show"/>
<field name="max_life" optional="show"/>
<field name="is_standard" optional="show"/>
<field name="applicable_range" optional="show"/>
<field name="image" widget='image' optional="show"/>
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_functional_cutting_tool_list_form" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.entity.list.form</field>
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<form>
<sheet>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="mrs_cutting_tool_type_id" options="{'no_create': True, 'no_quick_create': True}"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>
</group>
</group>
<group>
<group>
<field name="mrs_cutting_tool_model_id" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': True}"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
</group>
<group>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
</group>
</group>
<group string="参数信息">
<group>
<field name="diameter"/>
<field name="tool_grade"/>
<field name="machining_accuracy"/>
<field name="tool_length"/>
<field name="blade_number"/>
</group>
<group>
<field name="integral_blade_length"/>
<field name="effective_blade_length"/>
<field name="max_life"/>
<field name="is_standard"/>
</group>
</group>
<group string="其他信息">
<group>
<field name="applicable_range"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="view_functional_cutting_tool_list_search" model="ir.ui.view">
<field name="name">sf.functional.cutting.tool.entity.list.tree</field>
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<search>
<field name="code" />
<field name="name" />
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>
<searchpanel>
<field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
</record>
<record id="sf_function_tool_entry_list_view_act" model="ir.actions.act_window"> <record id="sf_function_tool_entry_list_view_act" model="ir.actions.act_window">
<field name="name">功能刀具列表</field> <field name="name">功能刀具列表</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.cutting.tool.entity</field> <field name="res_model">sf.functional.cutting.tool.entity</field>
<field name="view_mode">tree</field> <field name="view_mode">tree,form,search</field>
<field name="view_id" ref="view_functional_cutting_tool_list_tree"/> <field name="view_id" ref="view_functional_cutting_tool_list_tree"/>
</record> </record>
@@ -49,7 +114,6 @@
<field name="code" /> <field name="code" />
<field name="name" /> <field name="name" />
<field name="mrs_cutting_tool_type_id" /> <field name="mrs_cutting_tool_type_id" />
<field name="mrs_cutting_tool_model_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/> <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/> <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/> <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
@@ -106,7 +170,6 @@
<field name="code"/> <field name="code"/>
<field name="name"/> <field name="name"/>
<field name="mrs_cutting_tool_type_id"/> <field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_model_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/> <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/> <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/> <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>
@@ -164,7 +227,6 @@
<tree> <tree>
<!-- <field name="order"/>--> <!-- <field name="order"/>-->
<field name="mrs_cutting_tool_type_id"/> <field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_model_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="show"/> <field name="mrs_cutting_tool_integral_model_ids" optional="show"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="show"/> <field name="mrs_cutting_tool_blade_model_ids" optional="show"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/> <field name="mrs_cutting_tool_cutterbar_model_ids" optional="show"/>