jikimo/jikimo_sf
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_mrs_connect/models/res_config_setting.py
This commit is contained in:
jinling.yang
2023-08-08 17:18:06 +08:00
parent b3f2065edd be53b012f1
commit e638245b8a
22 changed files with 797 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_mrs_connect/models/res_config_setting.py
View File

@@ -36,8 +36,7 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步资源库品牌")
self.env['sf.machine.control_system'].sync_all_machine_tool_type_control_system()
_logger.info("同步资源库控制系统")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
self.env['sf.machine_tool.category'].sync_all_machine_tool_category()
_logger.info("同步资源库机床类型")
# self.env['sf.production.process.parameter'].sync_all_production_process_parameter()
@@ -66,7 +65,16 @@ class ResConfigSettings(models.TransientModel):
self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
_logger.info("同步功能夹具类型")
# self.env['sf.functional.fixture'].sync_all_functional_fixture()
# self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
# _logger.info("同步联装类型")
# self.env['sf.fixture.model'].sync_all_fixture_model()
# _logger.info("同步夹具型号")
# self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
# _logger.info("同步功能夹具类型")
# self.env['sf.functional.fixture'].sync_all_functional_fixture()
# _logger.info("同步功能夹具")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
except Exception as e:
_logger.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员")

28
sf_mrs_connect/models/sync_common.py
View File

@@ -708,9 +708,11 @@ class MachineToolType(models.Model):
[("code", '=', item['code'])])
if brand:
brand.id = item['id'],
brand.knife_type = item['knife_type'],
brand.name = item['name'],
brand.code = item['code'],
brand.precision = item['precision'],
brand.precision_min = item['precision_min'],
brand.precision_max = item['precision_max'],
brand.number_of_knife_library = item['number_of_knife_library'],
brand.rotate_speed = item['rotate_speed'],
brand.number_of_axles = item['number_of_axles'],
@@ -734,6 +736,7 @@ class MachineToolType(models.Model):
"id": item['id'],
"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'],
@@ -746,7 +749,8 @@ class MachineToolType(models.Model):
"b_axis": item['b_axis'],
"c_axis": item['c_axis'],
"remark": item['remark'],
"precision": item['precision'],
"precision_min": item['precision_min'],
"precision_max": item['precision_max'],
'control_system_id': self.env['sf.machine.control_system'].search(
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
@@ -763,13 +767,15 @@ class MachineToolType(models.Model):
"machine_tool_H": item['machine_tool_H'],
"feed_speed": item['feed_speed'],
"tool_speed": item['tool_speed'],
"distance": item['distance'],
"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": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,
@@ -812,8 +818,10 @@ class MachineToolType(models.Model):
"z_axis": item['z_axis'],
"b_axis": item['b_axis'],
"c_axis": item['c_axis'],
"knife_type": item['knife_type'],
"remark": item['remark'],
"precision": item['precision'],
"precision_min": item['precision_min'],
"precision_max": item['precision_max'],
'control_system_id': self.env['sf.machine.control_system'].search(
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
@@ -830,13 +838,15 @@ class MachineToolType(models.Model):
"machine_tool_H": item['machine_tool_H'],
"feed_speed": item['feed_speed'],
"tool_speed": item['tool_speed'],
"distance": item['distance'],
"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": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,
@@ -856,9 +866,11 @@ class MachineToolType(models.Model):
"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": item['precision'],
"precision_min": item['precision_min'],
"precision_max": item['precision_max'],
'control_system_id': self.env['sf.machine.control_system'].search(
[('code', '=', item['control_system_id'])]).id,
"active": item['active'],
@@ -875,13 +887,15 @@ class MachineToolType(models.Model):
"machine_tool_H": item['machine_tool_H'],
"feed_speed": item['feed_speed'],
"tool_speed": item['tool_speed'],
"distance": item['distance'],
"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": self.env['sf.machine_tool.category'].search(
[('code', '=', item['machine_tool_category'])]).id,