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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

Browse Source 
# Conflicts:
#	sf_base/views/base_view.xml
This commit is contained in:
jinling.yang
2023-08-17 18:03:12 +08:00
parent 8a99bd8589 42066865be
commit 97fcf6d91f
16 changed files with 1038 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sf_tool_management/models/tool_material_search.py
View File

@@ -13,10 +13,11 @@ class SfToolMaterialSearch(models.Model):
# 关联刀具类型
mrs_cutting_tool_type_id = fields.Many2one(
'sf.cutting.tool.type', '刀具类型',
domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
domain="[('cutting_tool_material_id.name', '=', cutting_tool_material_name)]")
# 关联刀具物料名称
mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
store=True)
cutting_tool_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型', store=True)
mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
# 关联刀具型号
# mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
@@ -57,7 +58,7 @@ class SfToolMaterialSearch(models.Model):
relation='sf_tool_material_search_blade_cutter_bar_rel',
column1='model_id_1',
column2='model_id_2',
domain="[('mrs_cutting_tool_material_id.name', '=', '刀杆')]",
domain="[('cutting_tool_type', '=', '刀杆')]",
string='适用刀杆型号',
default=lambda self: [], # 使用空列表作为默认值
)
@@ -66,7 +67,7 @@ class SfToolMaterialSearch(models.Model):
relation='sf_tool_material_search_blade_cutter_pad_rel',
column1='model_id_1',
column2='model_id_2',
domain="[('mrs_cutting_tool_material_id.name', '=', '刀盘')]",
domain="[('cutting_tool_type', '=', '刀盘')]",
string='适用刀盘型号',
default=lambda self: [], # 使用空列表作为默认值
)
@@ -99,7 +100,7 @@ class SfToolMaterialSearch(models.Model):
relation='sf_tool_material_search_bar_blade_rel',
column1='model_id_1',
column2='model_id_2',
domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
domain="[('cutting_tool_type', '=', '刀片')]",
string='适用刀片型号'
)
bar_wrench = fields.Float('配对扳手(mm)')
@@ -121,7 +122,7 @@ class SfToolMaterialSearch(models.Model):
relation='sf_tool_material_search_pad_blade_rel',
column1='model_id_1',
column2='model_id_2',
domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
domain="[('cutting_tool_type', '=', '刀片')]",
string='适用刀片型号'
)
pad_wrench = fields.Float('配对扳手(mm)')
@@ -151,7 +152,7 @@ class SfToolMaterialSearch(models.Model):
relation='sf_tool_material_search_handle_chuck_rel',
column1='model_id_1',
column2='model_id_2',
domain="[('mrs_cutting_tool_material_id.name', '=', '夹头')]",
domain="[('cutting_tool_type', '=', '夹头')]",
string='适用夹头型号'
)
handle_clamping_range = fields.Float('夹持范围(mm)')
@@ -175,7 +176,7 @@ class SfToolMaterialSearch(models.Model):
relation='sf_tool_material_search_chuck_handle_rel',
column1='model_id_1',
column2='model_id_2',
domain="[('mrs_cutting_tool_material_id.name', '=', '刀柄')]",
domain="[('cutting_tool_type', '=', '刀柄')]",
string='适用刀柄型号'
)
chuck_clamping_range = fields.Float('夹持范围(mm)')