diff --git a/sf_mrs_connect/data/ir_cron_data.xml b/sf_mrs_connect/data/ir_cron_data.xml
index 9efe1537..513d5dee 100644
--- a/sf_mrs_connect/data/ir_cron_data.xml
+++ b/sf_mrs_connect/data/ir_cron_data.xml
@@ -143,8 +143,8 @@
-
- 同步资源库机床型号
+
+ 同步资源库机床类型
code
model.sync_machine_tool_category()
@@ -153,4 +153,158 @@
-1
+
+
+ 同步功能刀具型号
+
+ code
+ model.sync_functional_cutting_tool()
+ 1
+ days
+ -1
+
+
+
+
+ 同步功能刀具类型
+
+ code
+ model.sync_functional_cutting_tool_model()
+ 1
+ days
+ -1
+
+
+
+
+ 同步整体式刀具型号
+
+ code
+ model.sync_integral_cutting_tool()
+ 1
+ days
+ -1
+
+
+
+
+ 同步整体式刀具类型
+
+ code
+ model.sync_integral_cutting_tool_model()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀片型号
+
+ code
+ model.sync_blade()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀片类型
+
+ code
+ model.sync_blade_model()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀杆型号
+
+ code
+ model.sync_cutter_bar()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀杆类型
+
+ code
+ model.sync_cutter_bar_model()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀盘型号
+
+ code
+ model.sync_cutter_pad()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀盘类型
+
+ code
+ model.sync_cutter_pad_model()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀柄型号
+
+ code
+ model.sync_handle()
+ 1
+ days
+ -1
+
+
+
+
+ 同步刀柄类型
+
+ code
+ model.sync_handle_model()
+ 1
+ days
+ -1
+
+
+
+
+ 同步夹头型号
+
+ code
+ model.sync_chuck()
+ 1
+ days
+ -1
+
+
+
+
+ 同步夹头类型
+
+ code
+ model.sync_chuck_model()
+ 1
+ days
+ -1
+
+
\ No newline at end of file
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 53e7006f..bb996fdf 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -50,7 +50,7 @@ class ResConfigSettings(models.TransientModel):
# self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model()
_logger.info("同步每日功能刀具类型完成")
_logger.info("同步所有功能刀具类型...")
- # self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
+ self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
_logger.info("同步所有功能刀具类型完成")
_logger.info("定时同步每日整体式刀具类型列表...")
# self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool()
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index fefbc9c2..601b9212 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -833,6 +833,51 @@ class MachineToolType(models.Model):
"machine_tool_category": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,
+ })
+ else:
+ brand.write({
+ "id": item['id'],
+ "name": item['name'],
+ "code": item['code'],
+
+ "number_of_knife_library": item['number_of_knife_library'],
+ "rotate_speed": item['rotate_speed'],
+ 'machine_tool_id': self.env['sf.machine_tool'].search(
+ [('code', '=', item['machine_tool_id'])]).id,
+ "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": item['precision'],
+ 'control_system_id': self.env['sf.machine.control_system'].search(
+ [('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': 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": item['distance'],
+ "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'],
+ "machine_tool_category": self.env['sf.machine_tool.category'].search(
+ [('code', '=', item['machine_tool_category'])]).id,
+
})
else:
raise ValidationError("认证未通过")