修改机床设备参数，处理同步bug，以及机床设备视图布局
This commit is contained in:
qihao.gong@jikimo.com
@@ -615,123 +615,21 @@ class MachineToolType(models.Model):
|
||||
result = json.loads(r['result'])
|
||||
if result['status'] == 1:
|
||||
for item in result['machine_tool_type_yesterday_list']:
|
||||
machine_tool_type = self.search([("code", '=', item['code'])])
|
||||
control_system = self.env['sf.machine.control_system'].search(
|
||||
[('code', '=', item['control_system_id'])])
|
||||
brand = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])])
|
||||
category = self.env['sf.machine_tool.category'].search([('code', '=', item['machine_tool_category'])])
|
||||
if machine_tool_type:
|
||||
machine_tool_type.write({
|
||||
"name": item['name'],
|
||||
"number_of_knife_library": item['number_of_knife_library'],
|
||||
"rotate_speed": item['rotate_speed'],
|
||||
"number_of_axles": item['number_of_axles'],
|
||||
"x_axis": item['x_axis'],
|
||||
"y_axis": item['y_axis'],
|
||||
"z_axis": item['z_axis'],
|
||||
"b_axis": item['b_axis'],
|
||||
"knife_type": item['knife_type'],
|
||||
"c_axis": item['c_axis'],
|
||||
"remark": item['remark'],
|
||||
"precision_min": item['precision_min'],
|
||||
"precision_max": item['precision_max'],
|
||||
'control_system_id': control_system.id,
|
||||
"active": item['active'],
|
||||
'brand_id': brand.id,
|
||||
'machine_tool_picture': '' if not item['machine_tool_picture'] else base64.b64decode(
|
||||
item['machine_tool_picture']),
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
"lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
"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'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
"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'],
|
||||
"machine_tool_category": category.id,
|
||||
})
|
||||
else:
|
||||
self.create({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"knife_type": item['knife_type'],
|
||||
"number_of_knife_library": item['number_of_knife_library'],
|
||||
"rotate_speed": item['rotate_speed'],
|
||||
"number_of_axles": item['number_of_axles'],
|
||||
"x_axis": item['x_axis'],
|
||||
"y_axis": item['y_axis'],
|
||||
"z_axis": item['z_axis'],
|
||||
"b_axis": item['b_axis'],
|
||||
"c_axis": item['c_axis'],
|
||||
"remark": item['remark'],
|
||||
"precision_min": item['precision_min'],
|
||||
"precision_max": item['precision_max'],
|
||||
'control_system_id': control_system.id,
|
||||
"active": item['active'],
|
||||
'brand_id': brand.id,
|
||||
'machine_tool_picture': '' if not item['machine_tool_picture'] else item[
|
||||
'machine_tool_picture'].encode('utf-8'),
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
"lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
"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'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
"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'],
|
||||
"machine_tool_category": category.id,
|
||||
})
|
||||
else:
|
||||
raise ValidationError("机床型号认证未通过")
|
||||
|
||||
# 同步所有机床型号
|
||||
def sync_all_machine_tool_type(self):
|
||||
config = self.env['res.config.settings'].get_values()
|
||||
headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
|
||||
strUrl = config['sf_url'] + self.url
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
if result['status'] == 1:
|
||||
for item in result['machine_tool_type_all_list']:
|
||||
if item.get('machine_tool_picture'):
|
||||
image = base64.b64decode(item['machine_tool_picture'])
|
||||
else:
|
||||
image = ''
|
||||
taper_type_id = self.env['spindle.taper.type'].search([('name', '=', item['taper_type_id'])])
|
||||
machine_tool_type = self.search([("code", '=', item['code'])])
|
||||
control_system = self.env['sf.machine.control_system'].search(
|
||||
[('code', '=', item['control_system_id'])])
|
||||
brand = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])])
|
||||
jg_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['jg_image_id'])])
|
||||
lq_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['lq_image_id'])])
|
||||
brand = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])])
|
||||
category = self.env['sf.machine_tool.category'].search([('code', '=', item['machine_tool_category'])])
|
||||
taper_type_id = self.env['spindle.taper.type'].search([('name', '=', item['taper_type_id'])])
|
||||
if not machine_tool_type:
|
||||
self.create({
|
||||
if machine_tool_type:
|
||||
machine_tool_type.update({
|
||||
'code': item['code'],
|
||||
"name": item['name'],
|
||||
"number_of_knife_library": item['number_of_knife_library'],
|
||||
"rotate_speed": item['rotate_speed'],
|
||||
@@ -812,7 +710,204 @@ class MachineToolType(models.Model):
|
||||
|
||||
})
|
||||
else:
|
||||
machine_tool_type.write({
|
||||
self.create({
|
||||
'code': item['code'],
|
||||
"name": item['name'],
|
||||
"number_of_knife_library": item['number_of_knife_library'],
|
||||
"rotate_speed": item['rotate_speed'],
|
||||
"number_of_axles": item['number_of_axles'],
|
||||
"x_axis": item['x_axis'],
|
||||
"y_axis": item['y_axis'],
|
||||
"z_axis": item['z_axis'],
|
||||
"b_axis": item['b_axis'],
|
||||
"knife_type": item['knife_type'],
|
||||
"c_axis": item['c_axis'],
|
||||
"remark": item['remark'],
|
||||
# "precision_min": item['precision_min'],
|
||||
# "precision_max": item['precision_max'],
|
||||
'control_system_id': control_system.id,
|
||||
"active": item['active'],
|
||||
'brand_id': brand.id,
|
||||
'machine_tool_picture': image,
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
#"lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
#"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'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
#"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'],
|
||||
"machine_tool_category": category.id,
|
||||
'taper_type_id': taper_type_id.id,
|
||||
"function_type": item['function_type'],
|
||||
"a_axis": item['a_axis'],
|
||||
"T_trough_num": item['T_trough_num'],
|
||||
"T_trough_wide": item['T_trough_wide'],
|
||||
"T_trough_distance": item['T_trough_distance'],
|
||||
"spindle_center_distance": item['spindle_center_distance'],
|
||||
"spindle_continuous_power": item['spindle_continuous_power'],
|
||||
"spindle_peak_power": item['spindle_peak_power'],
|
||||
"spindle_sustained_torque": item['spindle_sustained_torque'],
|
||||
"spindle_peak_torque": item['spindle_peak_torque'],
|
||||
"linear_axis_guides_type": item['linear_axis_guides_type'],
|
||||
"axis_driven_type": item['axis_driven_type'],
|
||||
"X_axis_rapid_traverse_speed": item['X_axis_rapid_traverse_speed'],
|
||||
"Y_axis_rapid_traverse_speed": item['Y_axis_rapid_traverse_speed'],
|
||||
"Z_axis_rapid_traverse_speed": item['Z_axis_rapid_traverse_speed'],
|
||||
"a_axis_rapid_traverse_speed": item['a_axis_rapid_traverse_speed'],
|
||||
"b_axis_rapid_traverse_speed": item['b_axis_rapid_traverse_speed'],
|
||||
"c_axis_rapid_traverse_speed": item['c_axis_rapid_traverse_speed'],
|
||||
"straight_cutting_feed_rate": item['straight_cutting_feed_rate'],
|
||||
"rotary_cutting_feed_rate": item['rotary_cutting_feed_rate'],
|
||||
"X_precision": item['X_precision'],
|
||||
"X_precision_repeat": item['X_precision_repeat'],
|
||||
"Y_precision": item['Y_precision'],
|
||||
"Y_precision_repeat": item['Y_precision_repeat'],
|
||||
"Z_precision": item['Z_precision'],
|
||||
"Z_precision_repeat": item['Z_precision_repeat'],
|
||||
"a_precision": item['a_precision'],
|
||||
"a_precision_repeat": item['a_precision_repeat'],
|
||||
"b_precision": item['b_precision'],
|
||||
"b_precision_repeat": item['b_precision_repeat'],
|
||||
"c_precision": item['c_precision'],
|
||||
"c_precision_repeat": item['c_precision_repeat'],
|
||||
"tool_full_diameter_max": item['tool_full_diameter_max'],
|
||||
"tool_perimeter_diameter_max": item['tool_perimeter_diameter_max'],
|
||||
"T_tool_time": item['T_tool_time'],
|
||||
"C_tool_time": item['C_tool_time'],
|
||||
"jg_image_id": jg_image_id.ids,
|
||||
"lq_image_id": lq_image_id.ids,
|
||||
|
||||
})
|
||||
else:
|
||||
raise ValidationError("机床型号认证未通过")
|
||||
|
||||
# 同步所有机床型号
|
||||
def sync_all_machine_tool_type(self):
|
||||
config = self.env['res.config.settings'].get_values()
|
||||
headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
|
||||
strUrl = config['sf_url'] + self.url
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
if result['status'] == 1:
|
||||
for item in result['machine_tool_type_all_list']:
|
||||
if item.get('machine_tool_picture'):
|
||||
image = base64.b64decode(item['machine_tool_picture'])
|
||||
else:
|
||||
image = ''
|
||||
taper_type_id = self.env['spindle.taper.type'].search([('name', '=', item['taper_type_id'])])
|
||||
if not taper_type_id:
|
||||
taper_type_id = self.env['spindle.taper.type'].create({
|
||||
'name': item['taper_type_id']
|
||||
})
|
||||
|
||||
machine_tool_type = self.search([("code", '=', item['code'])])
|
||||
control_system = self.env['sf.machine.control_system'].search(
|
||||
[('code', '=', item['control_system_id'])])
|
||||
brand = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])])
|
||||
jg_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['jg_image_id'])])
|
||||
lq_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['lq_image_id'])])
|
||||
category = self.env['sf.machine_tool.category'].search([('code', '=', item['machine_tool_category'])])
|
||||
|
||||
if not machine_tool_type:
|
||||
self.create({
|
||||
'code': item['code'],
|
||||
"name": item['name'],
|
||||
"number_of_knife_library": item['number_of_knife_library'],
|
||||
"rotate_speed": item['rotate_speed'],
|
||||
"number_of_axles": item['number_of_axles'],
|
||||
"x_axis": item['x_axis'],
|
||||
"y_axis": item['y_axis'],
|
||||
"z_axis": item['z_axis'],
|
||||
"b_axis": item['b_axis'],
|
||||
"knife_type": item['knife_type'],
|
||||
"c_axis": item['c_axis'],
|
||||
"remark": item['remark'],
|
||||
# "precision_min": item['precision_min'],
|
||||
# "precision_max": item['precision_max'],
|
||||
'control_system_id': control_system.id,
|
||||
"active": item['active'],
|
||||
'brand_id': brand.id,
|
||||
'machine_tool_picture': image,
|
||||
"heightened_way": item['heightened_way'],
|
||||
"workpiece_load": item['workpiece_load'],
|
||||
#"lead_screw": item['lead_screw'],
|
||||
"workbench_L": item['workbench_L'],
|
||||
"workbench_W": item['workbench_W'],
|
||||
#"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'],
|
||||
"distance_min": item['distance_min'],
|
||||
"distance_max": item['distance_max'],
|
||||
#"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'],
|
||||
"machine_tool_category": category.id,
|
||||
'taper_type_id': taper_type_id.id,
|
||||
"function_type": item['function_type'],
|
||||
"a_axis": item['a_axis'],
|
||||
"T_trough_num": item['T_trough_num'],
|
||||
"T_trough_wide": item['T_trough_wide'],
|
||||
"T_trough_distance": item['T_trough_distance'],
|
||||
"spindle_center_distance": item['spindle_center_distance'],
|
||||
"spindle_continuous_power": item['spindle_continuous_power'],
|
||||
"spindle_peak_power": item['spindle_peak_power'],
|
||||
"spindle_sustained_torque": item['spindle_sustained_torque'],
|
||||
"spindle_peak_torque": item['spindle_peak_torque'],
|
||||
"linear_axis_guides_type": item['linear_axis_guides_type'],
|
||||
"axis_driven_type": item['axis_driven_type'],
|
||||
"X_axis_rapid_traverse_speed": item['X_axis_rapid_traverse_speed'],
|
||||
"Y_axis_rapid_traverse_speed": item['Y_axis_rapid_traverse_speed'],
|
||||
"Z_axis_rapid_traverse_speed": item['Z_axis_rapid_traverse_speed'],
|
||||
"a_axis_rapid_traverse_speed": item['a_axis_rapid_traverse_speed'],
|
||||
"b_axis_rapid_traverse_speed": item['b_axis_rapid_traverse_speed'],
|
||||
"c_axis_rapid_traverse_speed": item['c_axis_rapid_traverse_speed'],
|
||||
"straight_cutting_feed_rate": item['straight_cutting_feed_rate'],
|
||||
"rotary_cutting_feed_rate": item['rotary_cutting_feed_rate'],
|
||||
"X_precision": item['X_precision'],
|
||||
"X_precision_repeat": item['X_precision_repeat'],
|
||||
"Y_precision": item['Y_precision'],
|
||||
"Y_precision_repeat": item['Y_precision_repeat'],
|
||||
"Z_precision": item['Z_precision'],
|
||||
"Z_precision_repeat": item['Z_precision_repeat'],
|
||||
"a_precision": item['a_precision'],
|
||||
"a_precision_repeat": item['a_precision_repeat'],
|
||||
"b_precision": item['b_precision'],
|
||||
"b_precision_repeat": item['b_precision_repeat'],
|
||||
"c_precision": item['c_precision'],
|
||||
"c_precision_repeat": item['c_precision_repeat'],
|
||||
"tool_full_diameter_max": item['tool_full_diameter_max'],
|
||||
"tool_perimeter_diameter_max": item['tool_perimeter_diameter_max'],
|
||||
"T_tool_time": item['T_tool_time'],
|
||||
"C_tool_time": item['C_tool_time'],
|
||||
"jg_image_id": jg_image_id.ids,
|
||||
"lq_image_id": lq_image_id.ids,
|
||||
|
||||
|
||||
})
|
||||
else:
|
||||
machine_tool_type.update({
|
||||
'code': item['code'],
|
||||
"name": item['name'],
|
||||
"number_of_knife_library": item['number_of_knife_library'],
|
||||
"rotate_speed": item['rotate_speed'],
|
||||
|
||||
Reference in New Issue
Block a user