diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index 16f12fc2..2583dadc 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -38,13 +38,13 @@ /> - + + + + + + + - - 产品 - ir.actions.act_window + + + - product.template - tree,form - + + + - - 创建产品吧 - - + + + + - + @@ -302,17 +302,17 @@ - - product.template.materials.search - product.template - - - + + + + + + + - - - + + + diff --git a/sf_mrs_sync/models/res_config_setting.py b/sf_mrs_sync/models/res_config_setting.py index d6f2444b..596ab4eb 100644 --- a/sf_mrs_sync/models/res_config_setting.py +++ b/sf_mrs_sync/models/res_config_setting.py @@ -16,16 +16,26 @@ class ResConfigSettings(models.TransientModel): def sf_all_sync(self): self.env['mrs.production.materials'].sync_all_production_materials() + _logger.info("同步资源库材料") self.env['mrs.materials.model'].sync_all_materials_model() + _logger.info("同步资源库材料型号") self.env['mrs.production.process'].sync_all_production_process() + _logger.info("同步资源库表面工艺") self.env['mrs.processing.technology'].sync_all_processing_technology() + _logger.info("同步资源库加工工艺") self.env['mrs.machine.brand.tags'].sync_all_machine_brand_tags() + _logger.info("同步资源库品牌类别") self.env['mrs.machine.brand'].sync_all_machine_brand() + _logger.info("同步资源库品牌") self.env['mrs.machine.control_system'].sync_all_machine_tool_type_control_system() + _logger.info("同步资源库控制系统") # self.env['mrs.machine_tool'].sync_all_machine_tool() self.env['mrs.machine_tool.type'].sync_all_machine_tool_type() + _logger.info("同步资源库机床型号") self.env['mrs.cutting_tool.category'].sync_all_cutting_tool_category() + _logger.info("同步资源库刀具类别") self.env['mrs.cutting_tool.type'].sync_all_cutting_tool_type() + _logger.info("同步资源库刀具") # self.env['mrs.processing.order'].sync_all_processing_order() return _logger.info("同步资源库成功") diff --git a/sf_mrs_sync/models/sf_sync_common.py b/sf_mrs_sync/models/sf_sync_common.py index 56297353..8cdd50ce 100644 --- a/sf_mrs_sync/models/sf_sync_common.py +++ b/sf_mrs_sync/models/sf_sync_common.py @@ -104,7 +104,7 @@ class MrsMaterialModel(models.Model): for item in result['materials_model_yesterday_list']: if item: brand = self.env['mrs.materials.model'].search( - [("materials_num", '=', item['materials_num'])]) + [("materials_no", '=', item['materials_no'])]) if brand: brand.id = item['id'], brand.name = item['name'], @@ -119,7 +119,7 @@ class MrsMaterialModel(models.Model): self.env['mrs.materials.model'].create({ "id": item['id'], "name": item['name'], - "materials_num": item['materials_num'], + "materials_no": item['materials_no'], "remark": item['remark'], "active": item['active'], "materials_id": item['materials_id'], @@ -148,7 +148,7 @@ class MrsMaterialModel(models.Model): self.env['mrs.materials.model'].create({ "id": item['id'], "name": item['name'], - "materials_num": item['materials_num'], + "materials_no": item['materials_no'], "remark": item['remark'], "active": item['active'], "materials_id": item['materials_id'],
- 创建产品吧 -