Merge remote-tracking branch 'origin/feature/夹具型号同步' into feature/产品添加夹具型号信息
This commit is contained in:
yuxianghui
@@ -649,24 +649,24 @@ class MachineToolType(models.Model):
|
||||
'machine_tool_picture': image,
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
#"lead_screw": item['lead_screw'],
|
||||
# "lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
#"guide_rail": item['guide_rail'],
|
||||
# "guide_rail": item['guide_rail'],
|
||||
"machine_tool_L": item['machine_tool_L'],
|
||||
"machine_tool_W": item['machine_tool_W'],
|
||||
"machine_tool_H": item['machine_tool_H'],
|
||||
#"feed_speed": item['feed_speed'],
|
||||
#"tool_speed": item['tool_speed'],
|
||||
# "feed_speed": item['feed_speed'],
|
||||
# "tool_speed": item['tool_speed'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
#"taper": item['taper'],
|
||||
#"torque": item['torque'],
|
||||
#"motor_power": item['motor_power'],
|
||||
# "taper": item['taper'],
|
||||
# "torque": item['torque'],
|
||||
# "motor_power": item['motor_power'],
|
||||
"tool_quality_max": item['tool_quality_max'],
|
||||
"tool_long_max": item['tool_long_max'],
|
||||
#"tool_diameter_max": item['tool_diameter_max'],
|
||||
#"tool_diameter_min": item['tool_diameter_min'],
|
||||
# "tool_diameter_max": item['tool_diameter_max'],
|
||||
# "tool_diameter_min": item['tool_diameter_min'],
|
||||
"machine_tool_category": category.id,
|
||||
'taper_type_id': taper_type_id.id,
|
||||
"function_type": item['function_type'],
|
||||
@@ -731,24 +731,24 @@ class MachineToolType(models.Model):
|
||||
'machine_tool_picture': image,
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
#"lead_screw": item['lead_screw'],
|
||||
# "lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
#"guide_rail": item['guide_rail'],
|
||||
# "guide_rail": item['guide_rail'],
|
||||
"machine_tool_L": item['machine_tool_L'],
|
||||
"machine_tool_W": item['machine_tool_W'],
|
||||
"machine_tool_H": item['machine_tool_H'],
|
||||
#"feed_speed": item['feed_speed'],
|
||||
#"tool_speed": item['tool_speed'],
|
||||
# "feed_speed": item['feed_speed'],
|
||||
# "tool_speed": item['tool_speed'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
#"taper": item['taper'],
|
||||
#"torque": item['torque'],
|
||||
#"motor_power": item['motor_power'],
|
||||
# "taper": item['taper'],
|
||||
# "torque": item['torque'],
|
||||
# "motor_power": item['motor_power'],
|
||||
"tool_quality_max": item['tool_quality_max'],
|
||||
"tool_long_max": item['tool_long_max'],
|
||||
#"tool_diameter_max": item['tool_diameter_max'],
|
||||
#"tool_diameter_min": item['tool_diameter_min'],
|
||||
# "tool_diameter_max": item['tool_diameter_max'],
|
||||
# "tool_diameter_min": item['tool_diameter_min'],
|
||||
"machine_tool_category": category.id,
|
||||
'taper_type_id': taper_type_id.id,
|
||||
"function_type": item['function_type'],
|
||||
@@ -844,24 +844,24 @@ class MachineToolType(models.Model):
|
||||
'machine_tool_picture': image,
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
#"lead_screw": item['lead_screw'],
|
||||
# "lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
#"guide_rail": item['guide_rail'],
|
||||
# "guide_rail": item['guide_rail'],
|
||||
"machine_tool_L": item['machine_tool_L'],
|
||||
"machine_tool_W": item['machine_tool_W'],
|
||||
"machine_tool_H": item['machine_tool_H'],
|
||||
#"feed_speed": item['feed_speed'],
|
||||
#"tool_speed": item['tool_speed'],
|
||||
# "feed_speed": item['feed_speed'],
|
||||
# "tool_speed": item['tool_speed'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
#"taper": item['taper'],
|
||||
#"torque": item['torque'],
|
||||
#"motor_power": item['motor_power'],
|
||||
# "taper": item['taper'],
|
||||
# "torque": item['torque'],
|
||||
# "motor_power": item['motor_power'],
|
||||
"tool_quality_max": item['tool_quality_max'],
|
||||
"tool_long_max": item['tool_long_max'],
|
||||
#"tool_diameter_max": item['tool_diameter_max'],
|
||||
#"tool_diameter_min": item['tool_diameter_min'],
|
||||
# "tool_diameter_max": item['tool_diameter_max'],
|
||||
# "tool_diameter_min": item['tool_diameter_min'],
|
||||
"machine_tool_category": category.id,
|
||||
'taper_type_id': taper_type_id.id,
|
||||
"function_type": item['function_type'],
|
||||
@@ -903,7 +903,6 @@ class MachineToolType(models.Model):
|
||||
"jg_image_id": jg_image_id.ids,
|
||||
"lq_image_id": lq_image_id.ids,
|
||||
|
||||
|
||||
})
|
||||
else:
|
||||
machine_tool_type.update({
|
||||
@@ -927,24 +926,24 @@ class MachineToolType(models.Model):
|
||||
'machine_tool_picture': image,
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
#"lead_screw": item['lead_screw'],
|
||||
# "lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
#"guide_rail": item['guide_rail'],
|
||||
# "guide_rail": item['guide_rail'],
|
||||
"machine_tool_L": item['machine_tool_L'],
|
||||
"machine_tool_W": item['machine_tool_W'],
|
||||
"machine_tool_H": item['machine_tool_H'],
|
||||
#"feed_speed": item['feed_speed'],
|
||||
#"tool_speed": item['tool_speed'],
|
||||
# "feed_speed": item['feed_speed'],
|
||||
# "tool_speed": item['tool_speed'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
#"taper": item['taper'],
|
||||
#"torque": item['torque'],
|
||||
#"motor_power": item['motor_power'],
|
||||
# "taper": item['taper'],
|
||||
# "torque": item['torque'],
|
||||
# "motor_power": item['motor_power'],
|
||||
"tool_quality_max": item['tool_quality_max'],
|
||||
"tool_long_max": item['tool_long_max'],
|
||||
#"tool_diameter_max": item['tool_diameter_max'],
|
||||
#"tool_diameter_min": item['tool_diameter_min'],
|
||||
# "tool_diameter_max": item['tool_diameter_max'],
|
||||
# "tool_diameter_min": item['tool_diameter_min'],
|
||||
"machine_tool_category": category.id,
|
||||
'taper_type_id': taper_type_id.id,
|
||||
"function_type": item['function_type'],
|
||||
@@ -1459,6 +1458,39 @@ class SyncFixtureModel(models.Model):
|
||||
for item in result['fixture_model_yesterday_list']:
|
||||
if item:
|
||||
fixture_model = self.search([("code", '=', item['code'])])
|
||||
zero_chuck_list = []
|
||||
for zero_chuck_id in item['zero_chuck_ids']:
|
||||
zero_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
|
||||
zero_tray_list = []
|
||||
for zero_tray_id in item['zero_tray_ids']:
|
||||
zero_tray_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
|
||||
pneumatic_fixture_list = []
|
||||
for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
|
||||
pneumatic_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
|
||||
pneumatic_fixture_id))
|
||||
jaw_vice_fixture_list = []
|
||||
for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
|
||||
jaw_vice_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
|
||||
jaw_vice_fixture_id))
|
||||
magnet_fixture_list = []
|
||||
for magnet_fixture_id in item['magnet_fixture_ids']:
|
||||
magnet_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
|
||||
magnet_fixture_id))
|
||||
adapter_board_fixture_list = []
|
||||
for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
|
||||
adapter_board_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
|
||||
adapter_board_fixture_id))
|
||||
scroll_chuck_list = []
|
||||
for scroll_chuck_id in item['scroll_chuck_ids']:
|
||||
scroll_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
|
||||
scroll_chuck_id))
|
||||
if not fixture_model:
|
||||
self.create({
|
||||
"name": item['name'],
|
||||
@@ -1468,56 +1500,35 @@ class SyncFixtureModel(models.Model):
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"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_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
fixture_model.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"fixture_material_id": self.env['sf.fixture.material'].search(
|
||||
[('code', '=', item['fixture_material_code'])]).id,
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"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_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
@@ -1537,6 +1548,39 @@ class SyncFixtureModel(models.Model):
|
||||
for item in result['fixture_model_all_list']:
|
||||
if item:
|
||||
fixture_model = self.search([("code", '=', item['code'])])
|
||||
zero_chuck_list = []
|
||||
for zero_chuck_id in item['zero_chuck_ids']:
|
||||
zero_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
|
||||
zero_tray_list = []
|
||||
for zero_tray_id in item['zero_tray_ids']:
|
||||
zero_tray_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
|
||||
pneumatic_fixture_list = []
|
||||
for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
|
||||
pneumatic_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
|
||||
pneumatic_fixture_id))
|
||||
jaw_vice_fixture_list = []
|
||||
for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
|
||||
jaw_vice_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
|
||||
jaw_vice_fixture_id))
|
||||
magnet_fixture_list = []
|
||||
for magnet_fixture_id in item['magnet_fixture_ids']:
|
||||
magnet_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
|
||||
magnet_fixture_id))
|
||||
adapter_board_fixture_list = []
|
||||
for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
|
||||
adapter_board_fixture_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
|
||||
adapter_board_fixture_id))
|
||||
scroll_chuck_list = []
|
||||
for scroll_chuck_id in item['scroll_chuck_ids']:
|
||||
scroll_chuck_list.append(
|
||||
self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
|
||||
scroll_chuck_id))
|
||||
if not fixture_model:
|
||||
self.create({
|
||||
"name": item['name'],
|
||||
@@ -1546,56 +1590,35 @@ class SyncFixtureModel(models.Model):
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"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_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
fixture_model.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"fixture_material_id": self.env['sf.fixture.material'].search(
|
||||
[('code', '=', item['fixture_material_code'])]).id,
|
||||
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
|
||||
[('code', '=', item['multi_mounting_type_code'])]).id,
|
||||
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
|
||||
"clamping_way": item['clamping_way'],
|
||||
"port_type": item['port_type'],
|
||||
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
"weight": item['weight'],
|
||||
"clamp_workpiece_length_max": item['clamp_workpiece_length_max'],
|
||||
"clamp_workpiece_width_max": item['clamp_workpiece_width_max'],
|
||||
"clamp_workpiece_height_max": item['clamp_workpiece_height_max'],
|
||||
"clamp_workpiece_diameter_max": item['clamp_workpiece_diameter_max'],
|
||||
"maximum_carrying_weight": item['maximum_carrying_weight'],
|
||||
"maximum_clamping_force": item['maximum_clamping_force'],
|
||||
"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_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
|
||||
item['apply_machine_tool_type_code']),
|
||||
"through_hole_size": item['through_hole_size'],
|
||||
"screw_size": item['screw_size'],
|
||||
"zero_chuck_ids": zero_chuck_list,
|
||||
"zero_tray_ids": zero_tray_list,
|
||||
"pneumatic_fixture_ids": pneumatic_fixture_list,
|
||||
"jaw_vice_fixture_ids": jaw_vice_fixture_list,
|
||||
"magnet_fixture_ids": magnet_fixture_list,
|
||||
"adapter_board_fixture_ids": adapter_board_fixture_list,
|
||||
"scroll_chuck_ids": scroll_chuck_list,
|
||||
"status": item['status'],
|
||||
"active": item['active'],
|
||||
})
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user