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

sf处功能刀具修改及其同步，目录位置调整

Browse Source
This commit is contained in:
mgw
2023-07-19 10:03:53 +08:00
parent b614eed79d
commit e44e44df41
4 changed files with 143 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
sf_mrs_connect/models/sync_common.py
View File

@@ -815,7 +815,7 @@ class MachineToolType(models.Model):
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
'machine_tool_picture':image,
'machine_tool_picture': image,
"heightened_way": item['heightened_way'],
"workpiece_load": item['workpiece_load'],
"lead_screw": item['lead_screw'],
@@ -1186,9 +1186,21 @@ class sfSyncFunctional_cutting_tool(models.Model):
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
# 刀具型号
"mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_model_id'])]).id,
# # 刀具型号
# "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
# [('code', '=', item['mrs_cutting_tool_model_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),
"mrs_cutting_tool_blade_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_blade_model_ids']),
"mrs_cutting_tool_cutterbar_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterbar_model_ids']),
"mrs_cutting_tool_cutterpad_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterpad_model_ids']),
"mrs_cutting_tool_cutterhandle_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhandle_model_ids']),
"mrs_cutting_tool_cutterhead_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhead_model_ids']),
"diameter": item['diameter'],
"tool_grade": item['tool_grade'],
"machining_accuracy": item['machining_accuracy'],
@@ -1209,9 +1221,18 @@ class sfSyncFunctional_cutting_tool(models.Model):
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
# 刀具型号
"mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_model_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),
"mrs_cutting_tool_blade_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_blade_model_ids']),
"mrs_cutting_tool_cutterbar_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterbar_model_ids']),
"mrs_cutting_tool_cutterpad_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterpad_model_ids']),
"mrs_cutting_tool_cutterhandle_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhandle_model_ids']),
"mrs_cutting_tool_cutterhead_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhead_model_ids']),
"diameter": item['diameter'],
"tool_grade": item['tool_grade'],
"machining_accuracy": item['machining_accuracy'],
@@ -1257,9 +1278,18 @@ class sfSyncFunctional_cutting_tool(models.Model):
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
# 刀具型号
"mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_model_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),
"mrs_cutting_tool_blade_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_blade_model_ids']),
"mrs_cutting_tool_cutterbar_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterbar_model_ids']),
"mrs_cutting_tool_cutterpad_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterpad_model_ids']),
"mrs_cutting_tool_cutterhandle_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhandle_model_ids']),
"mrs_cutting_tool_cutterhead_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhead_model_ids']),
"diameter": item['diameter'],
"tool_grade": item['tool_grade'],
"machining_accuracy": item['machining_accuracy'],
@@ -1280,9 +1310,18 @@ class sfSyncFunctional_cutting_tool(models.Model):
# 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
# 刀具型号
"mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_model_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']),
"mrs_cutting_tool_blade_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_blade_model_ids']),
"mrs_cutting_tool_cutterbar_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterbar_model_ids']),
"mrs_cutting_tool_cutterpad_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterpad_model_ids']),
"mrs_cutting_tool_cutterhandle_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhandle_model_ids']),
"mrs_cutting_tool_cutterhead_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_cutterhead_model_ids']),
"diameter": item['diameter'],
"tool_grade": item['tool_grade'],
"machining_accuracy": item['machining_accuracy'],
@@ -1561,7 +1600,7 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
[('code', '=', item['apply_machine_tool_type_code'])]).id,
"through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'],
@@ -1590,7 +1629,7 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
[('code', '=', item['apply_machine_tool_type_code'])]).id,
"through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'],
@@ -1641,7 +1680,7 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
[('code', '=', item['apply_machine_tool_type_code'])]).id,
"through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'],
@@ -1670,7 +1709,7 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
[('code', '=', item['apply_machine_tool_type_code'])]).id,
"through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'],
@@ -1983,14 +2022,14 @@ class SfToolModel(models.Model):
mrs_cutting_tool_model_blade_cutter_bar_ids_list = []
if item.get('mrs_cutting_tool_model_blade_cutter_bar_ids'):
for mrs_cutting_tool_model_blade_cutter_bar_id in item[
'mrs_cutting_tool_model_blade_cutter_bar_ids']:
'mrs_cutting_tool_model_blade_cutter_bar_ids']:
mrs_cutting_tool_model_blade_cutter_bar_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_blade_cutter_bar_id)]).id)
mrs_cutting_tool_model_blade_cutter_pad_ids_list = []
if item.get('mrs_cutting_tool_model_blade_cutter_pad_ids'):
for mrs_cutting_tool_model_blade_cutter_pad_id in item[
'mrs_cutting_tool_model_blade_cutter_pad_ids']:
'mrs_cutting_tool_model_blade_cutter_pad_ids']:
mrs_cutting_tool_model_blade_cutter_pad_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_blade_cutter_pad_id)]).id)
@@ -2007,14 +2046,14 @@ class SfToolModel(models.Model):
mrs_cutting_tool_model_handle_chuck_model_ids_list = []
if item.get('mrs_cutting_tool_model_handle_chuck_model_ids'):
for mrs_cutting_tool_model_handle_chuck_model_id in item[
'mrs_cutting_tool_model_handle_chuck_model_ids']:
'mrs_cutting_tool_model_handle_chuck_model_ids']:
mrs_cutting_tool_model_handle_chuck_model_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_handle_chuck_model_id)]).id)
mrs_cutting_tool_model_chuck_handle_model_ids_list = []
if item.get('mrs_cutting_tool_model_chuck_handle_model_ids'):
for mrs_cutting_tool_model_chuck_handle_model_id in item[
'mrs_cutting_tool_model_chuck_handle_model_ids']:
'mrs_cutting_tool_model_chuck_handle_model_ids']:
mrs_cutting_tool_model_chuck_handle_model_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_chuck_handle_model_id)]).id)
@@ -2061,8 +2100,10 @@ class SfToolModel(models.Model):
"blade_hardness": item['blade_hardness'],
"blade_radius": item['blade_radius'],
"blade_nut": item['blade_nut'],
"mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"mrs_cutting_tool_model_blade_cutter_bar_ids":
mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids":
mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"bar_code": item['bar_code'],
"bar_c_diameter": item['bar_c_diameter'],
"bar_total_length": item['bar_total_length'],
@@ -2111,7 +2152,8 @@ class SfToolModel(models.Model):
"chuck_inner_diameter": item['chuck_inner_diameter'],
"chuck_height": item['chuck_height'],
"chuck_nut": item['chuck_nut'],
"mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list,
"mrs_cutting_tool_model_chuck_handle_model_ids":
mrs_cutting_tool_model_chuck_handle_model_ids_list,
"chuck_clamping_range": item['chuck_clamping_range'],
"chuck_feature": item['chuck_feature'],
"image": image,
@@ -2168,8 +2210,10 @@ class SfToolModel(models.Model):
"blade_hardness": item['blade_hardness'],
"blade_radius": item['blade_radius'],
"blade_nut": item['blade_nut'],
"mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"mrs_cutting_tool_model_blade_cutter_bar_ids":
mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids":
mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"bar_code": item['bar_code'],
"bar_c_diameter": item['bar_c_diameter'],
"bar_total_length": item['bar_total_length'],
@@ -2218,7 +2262,8 @@ class SfToolModel(models.Model):
"chuck_inner_diameter": item['chuck_inner_diameter'],
"chuck_height": item['chuck_height'],
"chuck_nut": item['chuck_nut'],
"mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list,
"mrs_cutting_tool_model_chuck_handle_model_ids":
mrs_cutting_tool_model_chuck_handle_model_ids_list,
"chuck_clamping_range": item['chuck_clamping_range'],
"chuck_feature": item['chuck_feature'],
"image": image,
@@ -2261,14 +2306,14 @@ class SfToolModel(models.Model):
mrs_cutting_tool_model_blade_cutter_bar_ids_list = []
if item.get('mrs_cutting_tool_model_blade_cutter_bar_ids'):
for mrs_cutting_tool_model_blade_cutter_bar_id in item[
'mrs_cutting_tool_model_blade_cutter_bar_ids']:
'mrs_cutting_tool_model_blade_cutter_bar_ids']:
mrs_cutting_tool_model_blade_cutter_bar_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_blade_cutter_bar_id)]).id)
mrs_cutting_tool_model_blade_cutter_pad_ids_list = []
if item.get('mrs_cutting_tool_model_blade_cutter_pad_ids'):
for mrs_cutting_tool_model_blade_cutter_pad_id in item[
'mrs_cutting_tool_model_blade_cutter_pad_ids']:
'mrs_cutting_tool_model_blade_cutter_pad_ids']:
mrs_cutting_tool_model_blade_cutter_pad_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_blade_cutter_pad_id)]).id)
@@ -2285,14 +2330,14 @@ class SfToolModel(models.Model):
mrs_cutting_tool_model_handle_chuck_model_ids_list = []
if item.get('mrs_cutting_tool_model_handle_chuck_model_ids'):
for mrs_cutting_tool_model_handle_chuck_model_id in item[
'mrs_cutting_tool_model_handle_chuck_model_ids']:
'mrs_cutting_tool_model_handle_chuck_model_ids']:
mrs_cutting_tool_model_handle_chuck_model_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_handle_chuck_model_id)]).id)
mrs_cutting_tool_model_chuck_handle_model_ids_list = []
if item.get('mrs_cutting_tool_model_chuck_handle_model_ids'):
for mrs_cutting_tool_model_chuck_handle_model_id in item[
'mrs_cutting_tool_model_chuck_handle_model_ids']:
'mrs_cutting_tool_model_chuck_handle_model_ids']:
mrs_cutting_tool_model_chuck_handle_model_ids_list.append(
self.env['sf.cutting.tool.model'].search(
[("code", '=', mrs_cutting_tool_model_chuck_handle_model_id)]).id)
@@ -2339,8 +2384,10 @@ class SfToolModel(models.Model):
"blade_hardness": item['blade_hardness'],
"blade_radius": item['blade_radius'],
"blade_nut": item['blade_nut'],
"mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"mrs_cutting_tool_model_blade_cutter_bar_ids":
mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids":
mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"bar_code": item['bar_code'],
"bar_c_diameter": item['bar_c_diameter'],
"bar_total_length": item['bar_total_length'],
@@ -2388,7 +2435,8 @@ class SfToolModel(models.Model):
"chuck_inner_diameter": item['chuck_inner_diameter'],
"chuck_height": item['chuck_height'],
"chuck_nut": item['chuck_nut'],
"mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list,
"mrs_cutting_tool_model_chuck_handle_model_ids":
mrs_cutting_tool_model_chuck_handle_model_ids_list,
"chuck_clamping_range": item['chuck_clamping_range'],
"chuck_feature": item['chuck_feature'],
"image": image,
@@ -2441,8 +2489,10 @@ class SfToolModel(models.Model):
"blade_hardness": item['blade_hardness'],
"blade_radius": item['blade_radius'],
"blade_nut": item['blade_nut'],
"mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"mrs_cutting_tool_model_blade_cutter_bar_ids":
mrs_cutting_tool_model_blade_cutter_bar_ids_list,
"mrs_cutting_tool_model_blade_cutter_pad_ids":
mrs_cutting_tool_model_blade_cutter_pad_ids_list,
"bar_code": item['bar_code'],
"bar_c_diameter": item['bar_c_diameter'],
"bar_total_length": item['bar_total_length'],
@@ -2491,7 +2541,8 @@ class SfToolModel(models.Model):
"chuck_inner_diameter": item['chuck_inner_diameter'],
"chuck_height": item['chuck_height'],
"chuck_nut": item['chuck_nut'],
"mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list,
"mrs_cutting_tool_model_chuck_handle_model_ids":
mrs_cutting_tool_model_chuck_handle_model_ids_list,
"chuck_clamping_range": item['chuck_clamping_range'],
"chuck_feature": item['chuck_feature'],
"image": image,