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

Accept Merge Request #275: (feature/修改缺陷 -> develop)

Browse Source 
Merge Request: 修改功能刀具模块继承方式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/275?initial=true
This commit is contained in:
马广威
2023-07-20 09:18:34 +08:00
parent 80616bf9bd b37656d4fe
commit fe8402b856
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_tool_management/models/base.py
View File

@@ -2,11 +2,17 @@
from odoo import fields, models, api from odoo import fields, models, api
# class FunctionalCuttingToolEntity(models.Model):
# _name = 'sf.functional.cutting.tool.entity'
# _inherit = 'sf.functional.cutting.tool'
# _description = '功能刀具管理'
class FunctionalCuttingToolEntity(models.Model): class FunctionalCuttingToolEntity(models.Model):
_name = 'sf.functional.cutting.tool.entity' _name = 'sf.functional.cutting.tool.entity'
_inherit = 'sf.functional.cutting.tool'
_description = '功能刀具管理' _description = '功能刀具管理'
_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')
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)
# 功能刀具预警 特有字段 # 功能刀具预警 特有字段

2
sf_tool_management/models/tool_material_search.py
View File

@@ -16,7 +16,7 @@ class SfToolMaterialSearch(models.Model):
domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]") domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌') mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
# 关联刀具型号 # 关联刀具型号
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号') # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
# 关联刀具物料模型 # 关联刀具物料模型
mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料') mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')

2
sf_tool_management/views/tool_material_search.xml
View File

@@ -11,7 +11,7 @@
<field name="name"/> <field name="name"/>
<field name="mrs_cutting_tool_type_id"/> <field name="mrs_cutting_tool_type_id"/>
<field name="mrs_machine_brand_id"/> <field name="mrs_machine_brand_id"/>
<field name="mrs_cutting_tool_model_id"/> <!-- <field name="mrs_cutting_tool_model_id"/> -->
<field name="mrs_materials_model_id"/> <field name="mrs_materials_model_id"/>
<field name="mrs_cutting_tool_material_id"/> <field name="mrs_cutting_tool_material_id"/>