解决冲突

2023-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -38,6 +38,8 @@ class ResConfigSettings(models.TransientModel):
            _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.cutting_tool.category'].sync_all_cutting_tool_category()
            _logger.info("同步资源库刀具类别")
            self.env['sf.cutting_tool.type'].sync_all_cutting_tool_type()