From 2eadcbe31af671b8a767a7b0f83cc55541404654 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Tue, 13 Jun 2023 10:40:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=80=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=20=E5=8F=8A=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/__init__.py | 2 ++ sf_tool_management/__manifest__.py | 30 ++++++++++++++++++++++++++ sf_tool_management/models/__init__.py | 4 ++++ sf_tool_management/models/base.py | 3 +++ sf_tool_management/views/menu_view.xml | 18 ++++++++++++++++ 5 files changed, 57 insertions(+) create mode 100644 sf_tool_management/__init__.py create mode 100644 sf_tool_management/__manifest__.py create mode 100644 sf_tool_management/models/__init__.py create mode 100644 sf_tool_management/models/base.py create mode 100644 sf_tool_management/views/menu_view.xml diff --git a/sf_tool_management/__init__.py b/sf_tool_management/__init__.py new file mode 100644 index 00000000..041ffad6 --- /dev/null +++ b/sf_tool_management/__init__.py @@ -0,0 +1,2 @@ +# -*-coding:utf-8-*- +from . import models \ No newline at end of file diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py new file mode 100644 index 00000000..571b1a6b --- /dev/null +++ b/sf_tool_management/__manifest__.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. +{ + 'name': '机企猫智能工厂 刀具管理', + 'version': '1.0', + 'summary': '智能工厂刀具管理', + 'sequence': 1, + 'description': """ +在本模块，定义了主要的角色、菜单、基础业务对象 + """, + 'category': 'sf', + 'website': 'https://www.sf.jikimo.com', + 'depends': ['account', 'sf_base', 'mrp'], + 'data': [ + 'views/menu_view.xml' + ], + 'demo': [ + ], + 'assets': { + + 'web.assets_qweb': [ + ], + + + }, + 'license': 'LGPL-3', + 'installable': True, + 'application': False, + 'auto_install': False, +} diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py new file mode 100644 index 00000000..61a05d94 --- /dev/null +++ b/sf_tool_management/models/__init__.py @@ -0,0 +1,4 @@ +from . import base + + + diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py new file mode 100644 index 00000000..faaaf799 --- /dev/null +++ b/sf_tool_management/models/base.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + + diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml new file mode 100644 index 00000000..82d38b81 --- /dev/null +++ b/sf_tool_management/views/menu_view.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file From c919dac8cbed984b4f5d247ee6d3d1bb22f16e3d Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Tue, 13 Jun 2023 17:33:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/views/tool_base_views.xml | 24 +++- sf_tool_management/__manifest__.py | 5 +- sf_tool_management/models/base.py | 21 ++++ .../security/group_security.xml | 4 + .../security/ir.model.access.csv | 7 ++ sf_tool_management/views/menu_view.xml | 27 ++++- sf_tool_management/views/tool_base_views.xml | 108 ++++++++++++++++++ 7 files changed, 186 insertions(+), 10 deletions(-) create mode 100644 sf_tool_management/security/group_security.xml create mode 100644 sf_tool_management/security/ir.model.access.csv create mode 100644 sf_tool_management/views/tool_base_views.xml diff --git a/sf_base/views/tool_base_views.xml b/sf_base/views/tool_base_views.xml index 417d96c1..9da3b89c 100644 --- a/sf_base/views/tool_base_views.xml +++ b/sf_base/views/tool_base_views.xml @@ -7,10 +7,26 @@ sf.functional.cutting.tool - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index 571b1a6b..da1ea72c 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -12,7 +12,10 @@ 'website': 'https://www.sf.jikimo.com', 'depends': ['account', 'sf_base', 'mrp'], 'data': [ - 'views/menu_view.xml' + 'security/group_security.xml', + 'security/ir.model.access.csv', + 'views/tool_base_views.xml', + 'views/menu_view.xml', ], 'demo': [ ], diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index faaaf799..dae9ca9f 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,3 +1,24 @@ # -*- coding: utf-8 -*- +from odoo import fields, models, api +# 功能刀具预警 +class FunctionalCuttingToolWarning(models.Model): + _name = 'sf.functional.cutting.tool.warning' + _inherit = 'sf.functional.cutting.tool' + _description = '功能刀具预警' + + install_tool_time = fields.Char("装刀时间") + outbound_time = fields.Char('出库时间') + on_board_time = fields.Char('上机时间') + machine_tool_code = fields.Char('机台号') + cutting_tool_code = fields.Char('刀位号') + idle_time = fields.Char('闲置时长') + alarm_value = fields.Char('报警值') + used_value = fields.Char('已使用值') + alarm_type = fields.Char('报警类型') + alarm_time = fields.Char('报警时间') + dispose_user = fields.Char('处理人') + dispose_time = fields.Char('处理时间') + dispose_func = fields.Char('处理方法/措施') + remake = fields.Char('备注') diff --git a/sf_tool_management/security/group_security.xml b/sf_tool_management/security/group_security.xml new file mode 100644 index 00000000..b8668782 --- /dev/null +++ b/sf_tool_management/security/group_security.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv new file mode 100644 index 00000000..d1ff33f5 --- /dev/null +++ b/sf_tool_management/security/ir.model.access.csv @@ -0,0 +1,7 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_sf_functional_cutting_tool_warning,sf.functional.cutting.tool.warning,model_sf_functional_cutting_tool_warning,base.group_user,1,1,1,1 + + + + + diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml index 82d38b81..1ac1c750 100644 --- a/sf_tool_management/views/menu_view.xml +++ b/sf_tool_management/views/menu_view.xml @@ -1,18 +1,35 @@ + + + 功能刀具预警 + ir.actions.act_window + sf.functional.cutting.tool.warning + tree,form + + + + name="功能刀具列表" + sequence="3" + action="sf_base.action_sf_functional_cutting_tool" + /> + + \ No newline at end of file diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml new file mode 100644 index 00000000..11527768 --- /dev/null +++ b/sf_tool_management/views/tool_base_views.xml @@ -0,0 +1,108 @@ + + + + + + sf.functional.cutting.tool.warning.tree + sf.functional.cutting.tool.warning + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sf.functional.cutting.tool.warning.form + sf.functional.cutting.tool.warning + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + From b8dc06a7c71bef5d4559540809242697510d395a Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Wed, 14 Jun 2023 17:18:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?sf=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 4 ++-- sf_tool_management/views/menu_view.xml | 2 +- sf_tool_management/views/tool_base_views.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index dae9ca9f..e83e9277 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -2,8 +2,8 @@ from odoo import fields, models, api # 功能刀具预警 -class FunctionalCuttingToolWarning(models.Model): - _name = 'sf.functional.cutting.tool.warning' +class FunctionalCuttingToolEntity(models.Model): + _name = 'sf.functional.cutting.tool.entity' _inherit = 'sf.functional.cutting.tool' _description = '功能刀具预警' diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml index 1ac1c750..67ccc2aa 100644 --- a/sf_tool_management/views/menu_view.xml +++ b/sf_tool_management/views/menu_view.xml @@ -5,7 +5,7 @@ 功能刀具预警 ir.actions.act_window - sf.functional.cutting.tool.warning + sf.functional.cutting.tool.entity tree,form diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 11527768..f473dcc5 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -3,8 +3,8 @@ - sf.functional.cutting.tool.warning.tree - sf.functional.cutting.tool.warning + sf.functional.cutting.tool.entity.tree + sf.functional.cutting.tool.entity @@ -37,8 +37,8 @@ - sf.functional.cutting.tool.warning.form - sf.functional.cutting.tool.warning + sf.functional.cutting.tool.entity.form + sf.functional.cutting.tool.entity
From 018fecfc59ae2955547efe4d4d90f12d65426cf3 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 16 Jun 2023 10:02:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 2 + sf_base/models/__init__.py | 1 + sf_base/models/base.py | 27 - sf_base/models/fixture_base.py | 240 ++++++ sf_base/models/tool_base.py | 38 +- sf_base/security/ir.model.access.csv | 20 +- sf_base/views/base_view.xml | 150 ---- sf_base/views/fixture_base_view.xml | 681 ++++++++++++++++ sf_base/views/menu_fixture_view.xml | 106 +++ sf_base/views/menu_view.xml | 20 - sf_base/views/tool_base_menu.xml | 44 +- sf_base/views/tool_base_views.xml | 166 +++- sf_dlm/__manifest__.py | 7 +- sf_dlm/data/cutting_tool_data.xml | 30 + sf_dlm/data/product_data.xml | 31 +- sf_dlm/models/__init__.py | 3 +- sf_dlm/models/product_template.py | 356 --------- sf_dlm/views/product_template_view.xml | 170 +++- sf_manufacturing/models/__init__.py | 2 + sf_manufacturing/models/model_type.py | 22 +- sf_manufacturing/models/product_template.py | 684 ++++++++++++++++ sf_manufacturing/models/product_workorder.py | 12 + sf_mrs_connect/data/ir_cron_data.xml | 66 +- sf_mrs_connect/models/res_config_setting.py | 109 +-- sf_mrs_connect/models/sync_common.py | 773 ++++++++++++++----- 25 files changed, 2855 insertions(+), 905 deletions(-) create mode 100644 sf_base/models/fixture_base.py create mode 100644 sf_base/views/fixture_base_view.xml create mode 100644 sf_base/views/menu_fixture_view.xml create mode 100644 sf_dlm/data/cutting_tool_data.xml delete mode 100644 sf_dlm/models/product_template.py create mode 100644 sf_manufacturing/models/product_template.py create mode 100644 sf_manufacturing/models/product_workorder.py diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index 21f4d41d..2c05e1a2 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -19,6 +19,8 @@ "views/menu_view.xml", "views/tool_base_views.xml", "views/tool_base_menu.xml", + 'views/fixture_base_view.xml', + 'views/menu_fixture_view.xml', ], 'demo': [ diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index f6e247d2..5b9136ae 100644 --- a/sf_base/models/__init__.py +++ b/sf_base/models/__init__.py @@ -1,5 +1,6 @@ from . import base from . import common from . import tool_base +from . import fixture_base diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 4c77c114..aeb0c0ac 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -304,33 +304,6 @@ class MachineToolType(models.Model): code = fields.Char('编码') -# 刀具 -class CuttingTool(models.Model): - _name = 'sf.cutting_tool.category' - _description = '刀具类别' - code = fields.Char('编码') - name = fields.Char('名称') - remark = fields.Text('备注') - active = fields.Boolean('有效', default=True) - - -class CuttingToolType(models.Model): - _name = 'sf.cutting_tool.type' - _description = '刀具型号' - code = fields.Char('编码') - name = fields.Char('名称') - diameter = fields.Integer('直径') - long_blade = fields.Integer('避空长/刃长') - cone_angle_pitch = fields.Integer('锥角/节距') - shank_diameter = fields.Integer('柄径') - taper_shank_length = fields.Integer('锥柄长') - tool_length = fields.Integer('刀具总长') - blade_number = fields.Integer('刃数') - category_id = fields.Many2one('sf.cutting_tool.category', string='刀具类别') - brand_id = fields.Many2one('sf.machine.brand', string='品牌') - remark = fields.Text('备注') - active = fields.Boolean('有效', default=True) - class MachineToolCategory(models.Model): _name = 'sf.machine_tool.category' _description = '机床类型' diff --git a/sf_base/models/fixture_base.py b/sf_base/models/fixture_base.py new file mode 100644 index 00000000..6ca48f71 --- /dev/null +++ b/sf_base/models/fixture_base.py @@ -0,0 +1,240 @@ +from odoo import models, fields + +'''============================定位元件型号=====================================''' + + +class FixtureSettingElement(models.Model): + _name = 'sf.fixture.setting.element' + _description = "定位元件型号" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="型号名称", readonly=True) + setting_ele_type_id = fields.Many2one('sf.setting.element.type', string="定位元件类型", readonly=True) + brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True) + + length = fields.Char(string='长度(mm)', readonly=True) + width = fields.Char(string='宽度(mm)', readonly=True) + height = fields.Char(string='高度(mm)', readonly=True) + diameter = fields.Char(string='直径(mm)', readonly=True) + + material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True) + hardness = fields.Char(string='硬度(°)', readonly=True) + chucking_power = fields.Char(string='夹持力', readonly=True) + surface_treatment = fields.Char(string='表面处理', readonly=True) + accuracy_grade = fields.Char(string='精度等级', readonly=True) + + picture = fields.Binary(string="图片", readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''=============================定位原件类型=============================================''' + + +class SettingElementType(models.Model): + _name = 'sf.setting.element.type' + _description = "定位原件类型" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string='定位原件类型', readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''==============================夹紧元件型号==============================================''' + + +class FixtureClampingElement(models.Model): + _name = 'sf.fixture.clamping.element' + _description = "夹紧元件型号" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="型号名称", readonly=True) + clamping_ele_type_id = fields.Many2one('sf.clamping.element.type', string="夹紧元件类型", readonly=True) + brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True) + + length = fields.Char(string='长度(mm)', readonly=True) + width = fields.Char(string='宽度(mm)', readonly=True) + height = fields.Char(string='高度(mm)', readonly=True) + diameter = fields.Char(string='直径(mm)', readonly=True) + + material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True) + hardness = fields.Char(string='硬度(°)', readonly=True) + chucking_power = fields.Char(string='夹持力', readonly=True) + surface_treatment = fields.Char(string='夹持方式', readonly=True) + accuracy_grade = fields.Char(string='精度等级', readonly=True) + + picture = fields.Binary(string="图片", readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''============================夹紧元件类型=======================================''' + + +# 夹紧元件类型 +class ClampingElementType(models.Model): + _name = "sf.clamping.element.type" + _description = "夹紧元件类型" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(name='夹紧元件类型', readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''=========================对刀夹具型号=====================================''' + + +class FixtureToolSetting(models.Model): + _name = 'sf.fixture.tool.setting' + _description = "对刀夹具型号" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="型号名称", readonly=True) + tool_setting_type_id = fields.Many2one('sf.tool.setting.type', string="对刀夹具类型", readonly=True) + brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True) + + length = fields.Char(string='长度(mm)', readonly=True) + width = fields.Char(string='宽度(mm)', readonly=True) + height = fields.Char(string='高度(mm)', readonly=True) + diameter = fields.Char(string='直径(mm)', readonly=True) + + material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True) + hardness = fields.Char(string='硬度(°)', readonly=True) + chucking_power = fields.Char(string='夹持力', readonly=True) + clamp_mode = fields.Char(string='夹持方式', readonly=True) + accuracy_grade = fields.Char(string='精度等级', readonly=True) + max_clamp_diameter = fields.Char('最大夹持直接(mm)', readonly=True) + + picture = fields.Binary(string="图片", readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''===========================对刀夹具类型==========================================''' + + +class ToolSettingType(models.Model): + _name = 'sf.tool.setting.type' + _description = "对刀夹具类型" + + code = fields.Char('编码', readonly=True) + name = fields.Char(string='对刀夹具类型', readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''==========================定位装置型号=======================================''' + + +class FixtureLocatingDevice(models.Model): + _name = 'sf.fixture.locating.device' + _description = "定位装置型号" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="型号名称", readonly=True) + locating_device_type_id = fields.Many2one('sf.locating.device.type', string="定位装置类型", readonly=True) + brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True) + + length = fields.Char(string='长度(mm)', readonly=True) + width = fields.Char(string='宽度(mm)', readonly=True) + height = fields.Char(string='高度(mm)', readonly=True) + diameter = fields.Char(string='直径(mm)', readonly=True) + + material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True) + weight = fields.Char(string='重量(kg)', readonly=True) + accuracy_grade = fields.Char(string='精度等级', readonly=True) + locate_mode_ids = fields.Many2many('sf.locating.device.locate.mode', string='定位装置定位方式', readonly=True) + max_bearing_capacity = fields.Char(string='最大承载力', readonly=True) + + picture = fields.Binary(string="图片", readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''==============================定位装置类型================================''' + + +# 定位装置型号 +class LocatingDeviceType(models.Model): + _name = 'sf.locating.device.type' + _description = "定位装置类型" + + code = fields.Char('编码', readonly=True) + name = fields.Char(string='定位装置类型', readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''============================定位装置定位方式========================================''' + + +# 定位装置定位方式 +class LocatingDeviceLocateMode(models.Model): + _name = 'sf.locating.device.locate.mode' + _description = "定位装置定位方式" + + code = fields.Char('编码', readonly=True) + name = fields.Char('定位方式', readonly=True) + name_id = fields.Many2many('sf.fixture.locating.device', string='定位装置', readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''===========================导向元件型号====================================''' + + +class FixtureGuideElement(models.Model): + _name = 'sf.fixture.guide.element' + _description = "导向元件型号" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="型号名称", readonly=True) + guide_ele_type_id = fields.Many2one('sf.guide.element.type', string="导向元件类型", readonly=True) + brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True) + + length = fields.Char(string='长度(mm)', readonly=True) + width = fields.Char(string='宽度(mm)', readonly=True) + height = fields.Char(string='高度(mm)', readonly=True) + diameter = fields.Char(string='直径(mm)', readonly=True) + + material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True) + weight = fields.Char(string='重量', readonly=True) + accuracy_grade = fields.Char(string='精度等级', readonly=True) + guide_ele_guide_mode_id = fields.Many2many('sf.guide.element.guide.mode', string='导向元件导向方式', readonly=True) + scope_of_application = fields.Char(string='适用范围', readonly=True) + guide_ele_way_to_install_id = fields.Many2many('sf.guide.element.way.to.install', string='导向元件安装方式', + readonly=True) + + picture = fields.Binary(string="图片", readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''=============================导向元件类型============================================''' + + +class GuideElementType(models.Model): + _name = 'sf.guide.element.type' + _description = "导向元件类型" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="导向元件类型", readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''================================导向元件导向方式==========================================''' + + +class GuideElementGuideMode(models.Model): + _name = 'sf.guide.element.guide.mode' + _description = "导向元件导向方式" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="导向元件导向方式", readonly=True) + name_id = fields.Many2many('sf.fixture.guide.element', string='导向元件', readonly=True) + comment = fields.Text(string='备注', readonly=True) + + +'''=============================导向元件安装方式===========================================''' + + +class GuideElementWayToInstall(models.Model): + _name = 'sf.guide.element.way.to.install' + _description = '导向元件安装方式' + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="导向元件安装方式", readonly=True) + name_id = fields.Many2many('sf.fixture.guide.element', string='导向元件', readonly=True) + comment = fields.Text(string='备注', readonly=True) diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py index b41a1075..33426cd4 100644 --- a/sf_base/models/tool_base.py +++ b/sf_base/models/tool_base.py @@ -7,6 +7,16 @@ from odoo.exceptions import UserError from datetime import datetime +# 功能刀具物料 +class CuttingToolMaterial(models.Model): + _name = 'sf.cutting.tool.material' + _description = '刀具物料' + + code = fields.Char('编码') + name = fields.Char('名称') + remark = fields.Char('备注') + + # 功能刀具 class FunctionalCuttingTool(models.Model): _name = 'sf.functional.cutting.tool' @@ -53,6 +63,8 @@ class IntegralCuttingTool(models.Model): code = fields.Char('编码') name = fields.Char('型号名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 整体式刀具类型字段，关联整体式刀具类型对象 integral_model_number = fields.Many2one('sf.integral.cutting.tool.model', '整体式刀具类型') # 增加品牌、总长度(mm)、柄部长度(mm)、刃部长度(mm)、直径(mm)、刃数、前角(°)、后角(°)、主偏角(°)、材料型号、配对螺母(mm)、适用夹头型号、适用范围、图片、创建人、创建时间等字段 @@ -80,6 +92,8 @@ class IntegralCuttingToolModel(models.Model): code = fields.Char('编码') name = fields.Char('名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') remark = fields.Text('备注') @@ -90,10 +104,12 @@ class Blade(models.Model): code = fields.Char('编码') name = fields.Char('型号名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 刀片类型字段，关联刀片类型对象 blade_model_number = fields.Many2one('sf.blade.model', '刀片类型') # 编码、型号名称、刀片类型、品牌、长度L(mm)、宽度D(mm)、高度T(mm)、顶角(°)、前角(°)、后角(°)、主偏角(°)、R角(°)、材料型号、加工硬度、配对螺母(mm)、适用刀杆/刀盘型号、刀尖半径(mm)、图片、创建人、创建时间字段 - brand = fields.Many2one('sf.machine.brand', '品牌',) + brand = fields.Many2one('sf.machine.brand', '品牌', ) length = fields.Float('长度L(mm)') width = fields.Float('宽度D(mm)') height = fields.Float('高度T(mm)') @@ -120,6 +136,8 @@ class BladeModel(models.Model): code = fields.Char('编码') name = fields.Char('名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 刀片类型字段，关联刀片对象 blade_ids = fields.One2many('sf.blade', 'blade_model_number', '刀片类型') remark = fields.Text('备注') @@ -132,6 +150,8 @@ class CutterBar(models.Model): code = fields.Char('编码') name = fields.Char('型号名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 刀杆类型字段，关联刀杆类型对象 cutter_bar_model_number = fields.Many2one('sf.cutter.bar.model', '刀杆类型') # 品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间 @@ -158,6 +178,8 @@ class CutterBarModel(models.Model): code = fields.Char('编码') name = fields.Char('名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') remark = fields.Text('备注') @@ -168,6 +190,8 @@ class CutterPad(models.Model): code = fields.Char('编码') name = fields.Char('型号名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 刀盘类型字段，关联刀盘类型对象 cutter_pad_model_number = fields.Many2one('sf.cutter.pad.model', '刀盘类型') # 增加品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间 @@ -194,6 +218,8 @@ class CutterPadModel(models.Model): code = fields.Char('编码') name = fields.Char('名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') remark = fields.Text('备注') @@ -204,6 +230,8 @@ class Handle(models.Model): code = fields.Char('编码') name = fields.Char('型号名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 刀柄类型字段，关联刀柄类型对象 handle_model_number = fields.Many2one('sf.handle.model', '刀柄类型') # 增加、刀柄类型、品牌、L(mm)、L1(mm)、D1(mm)、重量(kg)、材料型号、本体精度(mm)、配对螺母(mm)、适用夹头型号、夹持范围(mm)、检测精度、检测硬度、标准转速、图片、创建人、创建时间 @@ -230,6 +258,8 @@ class HandleModel(models.Model): code = fields.Char('编码') name = fields.Char('名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') remark = fields.Text('备注') @@ -237,9 +267,12 @@ class HandleModel(models.Model): class Chuck(models.Model): _name = 'sf.chuck' _description = '夹头' + _rec_name = 'code' code = fields.Char('编码') name = fields.Char('型号名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') # 夹头类型字段，关联夹头类型对象 chuck_model_number = fields.Many2one('sf.chuck.model', '夹头类型') # 增加品牌、精度(mm)、外径(mm)、内径(mm)、高度(mm)、材料型号、配对螺母(mm)、适用刀柄型号、夹持范围(mm)、特性、图片、创建人、创建时间 @@ -263,5 +296,6 @@ class ChuckModel(models.Model): code = fields.Char('编码') name = fields.Char('名称') + # 关联刀具物料 + cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料') remark = fields.Text('备注') - diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index b75eee63..ad1e2ff2 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -1,8 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_sf_machine_tool,sf_machine_tool,model_sf_machine_tool,base.group_user,1,1,1,1 -access_sf_cutting_tool_category,sf_cutting_tool_category,model_sf_cutting_tool_category,base.group_user,1,1,1,1 access_sf_machine_tool_type,sf_machine_tool_type,model_sf_machine_tool_type,base.group_user,1,1,1,1 -access_sf_cutting_tool_type,sf_cutting_tool_type,model_sf_cutting_tool_type,base.group_user,1,1,1,1 access_sf_machine_brand,sf_machine_brand,model_sf_machine_brand,base.group_user,1,1,1,1 access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,base.group_user,1,1,1,1 access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,base.group_user,1,1,1,1 @@ -31,8 +29,20 @@ access_sf_handle,sf.handle,model_sf_handle,base.group_user,1,1,1,1 access_sf_handle_model,sf.handle.model,model_sf_handle_model,base.group_user,1,1,1,1 access_sf_chuck,sf.chuck,model_sf_chuck,base.group_user,1,1,1,1 access_sf_chuck_model,sf.chuck.model,model_sf_chuck_model,base.group_user,1,1,1,1 - - - +access_sf_cutting_tool_material,sf.cutting.tool.material,model_sf_cutting_tool_material,base.group_user,1,1,1,1 + +access_sf_fixture_setting_element,sf_fixture_setting_element,model_sf_fixture_setting_element,base.group_user,1,1,1,1 +access_sf_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,base.group_user,1,1,1,1 +access_sf_fixture_clamping_element,sf_fixture_clamping_element,model_sf_fixture_clamping_element,base.group_user,1,1,1,1 +access_sf_clamping_element_type,sf_clamping_element_type,model_sf_clamping_element_type,base.group_user,1,1,1,1 +access_sf_fixture_tool_setting,sf_fixture_tool_setting,model_sf_fixture_tool_setting,base.group_user,1,1,1,1 +access_sf_tool_setting_type,sf_tool_setting_type,model_sf_tool_setting_type,base.group_user,1,1,1,1 +access_sf_fixture_locating_device,sf_fixture_locating_device,model_sf_fixture_locating_device,base.group_user,1,1,1,1 +access_sf_locating_device_type,sf_locating_device_type,model_sf_locating_device_type,base.group_user,1,1,1,1 +access_sf_locating_device_locate_mode,sf_locating_device_locate_mode,model_sf_locating_device_locate_mode,base.group_user,1,1,1,1 +access_sf_fixture_guide_element,sf_fixture_guide_element,model_sf_fixture_guide_element,base.group_user,1,1,1,1 +access_sf_guide_element_type,sf_guide_element_type,model_sf_guide_element_type,base.group_user,1,1,1,1 +access_sf_guide_element_guide_mode,sf_guide_element_guide_mode,model_sf_guide_element_guide_mode,base.group_user,1,1,1,1 +access_sf_guide_element_way_to_install,sf_guide_element_way_to_install,model_sf_guide_element_way_to_install,base.group_user,1,1,1,1 diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 7aa192c1..75d481c8 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -255,156 +255,6 @@

- #------------------刀具型号------------------ - - - search.sf.cutting_tool.type - sf.cutting_tool.type - - - - - - - - - tree.sf.cutting_tool.type - sf.cutting_tool.type - - - - - - - - - - - form.sf.cutting_tool.type - sf.cutting_tool.type - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 刀具型号 - ir.actions.act_window - sf.cutting_tool.type - tree,form - -

- [刀具型号] 还没有哦！点左上角的[创建]按钮，沙发归你了! -

-

-

- - - - #------------------刀具类别------------------ - - - search.sf.cutting_tool.category - sf.cutting_tool.category - - - - - - - - - tree.sf.cutting_tool.category - sf.cutting_tool.category - - - - - - - - - - form.sf.cutting_tool.category - sf.cutting_tool.category - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - 刀具类别 - ir.actions.act_window - sf.cutting_tool.category - tree,form - -

- [刀具类别] 还没有哦！点左上角的[创建]按钮，沙发归你了! -

-

-

- - #------------------机床注册------------------ diff --git a/sf_base/views/fixture_base_view.xml b/sf_base/views/fixture_base_view.xml new file mode 100644 index 00000000..09cd4b86 --- /dev/null +++ b/sf_base/views/fixture_base_view.xml @@ -0,0 +1,681 @@ + + + + + + 定位元件型号 + sf.fixture.setting.element + + + + + + + + + + + + + 定位元件型号 + sf.fixture.setting.element + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 定位元件型号 + ir.actions.act_window + sf.fixture.setting.element + tree,form + + + + + + + 定位原件类型 + sf.setting.element.type + + + + + + + + + + 定位元件类型 + sf.setting.element.type + +
+ + + + + + + + + + + + + +
+ + + + + 定位元件类型 + ir.actions.act_window + sf.setting.element.type + tree,form + + + + + + + + 夹紧元件型号 + sf.fixture.clamping.element + + + + + + + + + + + + + 夹紧元件型号 + sf.fixture.clamping.element + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 夹紧元件型号 + ir.actions.act_window + sf.fixture.clamping.element + tree,form + + + + + + + + 夹紧元件类型 + sf.clamping.element.type + + + + + + + + + + 夹紧元件类型 + sf.clamping.element.type + +
+ + + + + + + + + + + + + +
+ + + + + 夹紧元件类型 + ir.actions.act_window + sf.clamping.element.type + tree,form + + + + + + + 对刀夹具型号 + sf.fixture.tool.setting + + + + + + + + + + + + + 对刀夹具型号 + sf.fixture.tool.setting + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 对刀夹具型号 + ir.actions.act_window + sf.fixture.tool.setting + tree,form + + + + + + 对刀夹具类型 + sf.tool.setting.type + + + + + + + + + + 对刀夹具类型 + sf.tool.setting.type + +
+ + + + + + + + + + + + + +
+ + + + + 对刀夹具类型 + ir.actions.act_window + sf.tool.setting.type + tree,form + + + + + + + 定位装置型号 + sf.fixture.locating.device + + + + + + + + + + + + + 定位装置型号 + sf.fixture.locating.device + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 定位装置型号 + ir.actions.act_window + sf.fixture.locating.device + tree,form + + + + + + 定位装置类型 + sf.locating.device.type + + + + + + + + + + 定位装置类型 + sf.locating.device.type + +
+ + + + + + + + + + + + + +
+ + + + + 定位装置类型 + ir.actions.act_window + sf.locating.device.type + tree,form + + + + + + 定位装置定位方式 + sf.locating.device.locate.mode + + + + + + + + + + 定位装置定位方式 + sf.locating.device.locate.mode + +
+ + + + + + + + + + + + + + +
+ + + + + 定位装置定位方式 + ir.actions.act_window + sf.locating.device.locate.mode + tree,form + + + + + + 导向元件型号 + sf.fixture.guide.element + + + + + + + + + + + + + 导向元件型号 + sf.fixture.guide.element + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 导向元件型号 + ir.actions.act_window + sf.fixture.guide.element + tree,form + + + + + + 导向元件类型 + sf.guide.element.type + + + + + + + + + + 导向元件类型 + sf.guide.element.type + +
+ + + + + + + + + + + + + +
+ + + + + 导向元件类型 + ir.actions.act_window + sf.guide.element.type + tree,form + + + + + + + 导向元件导向方式 + sf.guide.element.guide.mode + + + + + + + + + + 导向元件导向方式 + sf.guide.element.guide.mode + +
+ + + + + + + + + + + + + + +
+ + + + + 导向元件导向方式 + ir.actions.act_window + sf.guide.element.guide.mode + tree,form + + + + + + + 导向元件安装方式 + sf.guide.element.way.to.install + + + + + + + + + + 导向元件安装方式 + sf.guide.element.way.to.install + +
+ + + + + + + + + + + + + + +
+ + + + + 导向元件安装方式 + ir.actions.act_window + sf.guide.element.way.to.install + tree,form + + + + + \ No newline at end of file diff --git a/sf_base/views/menu_fixture_view.xml b/sf_base/views/menu_fixture_view.xml new file mode 100644 index 00000000..4a5e1283 --- /dev/null +++ b/sf_base/views/menu_fixture_view.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index e011a29d..c9b8f1c1 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -127,26 +127,6 @@ sequence="1" action="action_sf_machine_tool_category"/> - - - - - - - 功能刀具型号 + 功能刀具 ir.actions.act_window sf.functional.cutting.tool tree,form @@ -100,17 +100,15 @@ sf.chuck.model tree,form + + + 刀具物料 + ir.actions.act_window + sf.cutting.tool.material + tree,form + - - - - - - - - - - + - - - - - - - + + - - - - - - - - -
diff --git a/sf_base/views/tool_base_views.xml b/sf_base/views/tool_base_views.xml index 9da3b89c..382c4647 100644 --- a/sf_base/views/tool_base_views.xml +++ b/sf_base/views/tool_base_views.xml @@ -1,6 +1,52 @@ + + + sf.cutting.tool.material.tree + sf.cutting.tool.material + + + + + + + + + + + sf.cutting.tool.material.form + sf.cutting.tool.material + +
+ + + + + + + + + + + + + +
+ + + + + sf.cutting.tool.material.search + sf.cutting.tool.material + + + + + + + + sf.functional.cutting.tool.tree @@ -82,6 +128,17 @@ + + + sf.functional.cutting.tool.search + sf.functional.cutting.tool + + + + + + + @@ -113,6 +170,7 @@ + @@ -126,6 +184,8 @@ + + @@ -137,17 +197,28 @@ - - - + + + + + + sf.integral.cutting.tool.search + sf.integral.cutting.tool + + + + + + + sf.blade.tree @@ -176,6 +247,7 @@ + @@ -189,7 +261,8 @@ - + + @@ -197,15 +270,12 @@ + - - - - @@ -213,6 +283,17 @@ + + + sf.blade.search + sf.blade + + + + + + + sf.cutter.bar.tree @@ -241,6 +322,9 @@ + + + @@ -269,7 +353,6 @@ - @@ -278,6 +361,17 @@ + + + sf.cutter.bar.search + sf.cutter.bar + + + + + + + @@ -307,6 +401,9 @@ + + + @@ -334,7 +431,6 @@ - @@ -342,6 +438,17 @@ + + + sf.cutter.pad.search + sf.cutter.pad + + + + + + + @@ -371,6 +478,9 @@ + + + @@ -396,7 +506,6 @@ - @@ -408,6 +517,17 @@ + + + sf.handle.search + sf.handle + + + + + + + @@ -437,6 +557,9 @@ + + + @@ -459,7 +582,6 @@ - @@ -471,6 +593,17 @@ + + + sf.chuck.search + sf.chuck + + + + + + + @@ -529,6 +662,7 @@ + @@ -562,7 +696,7 @@ - + @@ -596,6 +730,7 @@ + @@ -629,6 +764,7 @@ + @@ -663,6 +799,7 @@ + @@ -696,6 +833,7 @@ + @@ -705,7 +843,5 @@ - - diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py index ae978ecf..3fd71ad3 100644 --- a/sf_dlm/__manifest__.py +++ b/sf_dlm/__manifest__.py @@ -10,13 +10,14 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['mrp', 'base', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock', + 'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock', 'uom'], 'data': [ 'data/product_data.xml', 'data/uom_data.xml', - # 'views/product_template_view.xml', - # 'views/product_workorder.xml' + 'data/cutting_tool_data.xml', + 'views/product_template_view.xml', + 'views/product_workorder.xml' ], 'demo': [ ], diff --git a/sf_dlm/data/cutting_tool_data.xml b/sf_dlm/data/cutting_tool_data.xml new file mode 100644 index 00000000..80578737 --- /dev/null +++ b/sf_dlm/data/cutting_tool_data.xml @@ -0,0 +1,30 @@ + + + + + 刀具 + 刀具 + + + + 夹具 + 夹具 + + + + 刀具标准模板 + + + + + product + true + + + + serial + + + + diff --git a/sf_dlm/data/product_data.xml b/sf_dlm/data/product_data.xml index 54a468ad..8cd8ecf7 100644 --- a/sf_dlm/data/product_data.xml +++ b/sf_dlm/data/product_data.xml @@ -20,21 +20,32 @@ 表面工艺 + + + + + + + + + + + CNC加工产品模板 - delivery + product false - true + serial - false + 坯料自加工模板 @@ -42,15 +53,15 @@ - delivery + product false - true + serial - false + @@ -59,14 +70,14 @@ - delivery + product true serial - false + 坯料采购模板 @@ -74,14 +85,14 @@ - delivery + product true serial - false + \ No newline at end of file diff --git a/sf_dlm/models/__init__.py b/sf_dlm/models/__init__.py index c6b96570..a8d31912 100644 --- a/sf_dlm/models/__init__.py +++ b/sf_dlm/models/__init__.py @@ -1,6 +1,5 @@ -from. import product_template from. import product_supplierinfo -from. import product_workorder + diff --git a/sf_dlm/models/product_template.py b/sf_dlm/models/product_template.py deleted file mode 100644 index 55bfc854..00000000 --- a/sf_dlm/models/product_template.py +++ /dev/null @@ -1,356 +0,0 @@ -from odoo import models, fields, api -from odoo.exceptions import ValidationError -from odoo.modules import get_resource_path -from OCC.Extend.DataExchange import read_step_file -from OCC.Extend.DataExchange import write_stl_file -import logging -import base64 -import hashlib -import os - - -class ResProductTemplate(models.Model): - _inherit = 'product.template' - - # 模型的长,宽,高,体积,精度,材料 - model_name = fields.Char('模型名称') - categ_type = fields.Selection( - [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺")], - string='产品的类别', related='categ_id.type', - store=True) - model_long = fields.Float('模型长[mm]', digits=(16, 3)) - model_width = fields.Float('模型宽[mm]', digits=(16, 3)) - model_height = fields.Float('模型高[mm]', digits=(16, 3)) - model_volume = fields.Float('模型体积[m³]') - model_machining_precision = fields.Selection([ - ('0.10', '±0.10mm'), - ('0.05', '±0.05mm'), - ('0.03', '±0.03mm'), - ('0.02', '±0.02mm'), - ('0.01', '±0.01mm')], string='加工精度') - product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型') - embryo_model_type_id = fields.Many2one('sf.model.type', string='坯料模型类型') - model_processing_panel = fields.Char('模型加工面板') - # model_surface_process_category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别') - # model_surface_process_ids = fields.Many2many('sf.production.process', 'rel_product_process', string='表面工艺') - server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter', - string='表面工艺参数(服务产品)') - model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel', - string='表面工艺参数') - # model_price = fields.Float('模型单价', digits=(16, 3)) - model_remark = fields.Char('模型备注说明') - length = fields.Float('长[mm]', digits=(16, 3)) - width = fields.Float('宽[mm]', digits=(16, 3)) - height = fields.Float('高[mm]', digits=(16, 3)) - materials_id = fields.Many2one('sf.production.materials', string='材料') - materials_type_id = fields.Many2one('sf.materials.model', string='材料型号') - single_manufacturing = fields.Boolean(string="单个制造") - upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件') - model_code = fields.Char('模型编码') - is_bfm = fields.Boolean('业务平台是否自动创建', default=False) - - def _get_volume_uom_id_from_ir_config_parameter(self): - product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet') - if product_length_in_feet_param == '1': - return self.env.ref('uom.product_uom_cubic_foot') - else: - return self.env.ref('sf_dlm.product_uom_cubic_millimeter') - - # model_file = fields.Binary('模型文件') - - # 坯料的库存路线设置 - # def _get_routes(self, route_type): - # route_manufacture = self.env.ref('mrp.route_warehouse0_manufacture', raise_if_not_found=False).sudo() - # route_mto = self.env.ref('stock.route_warehouse0_mto', raise_if_not_found=False).sudo() - # route_purchase = self.env.ref('purchase_stock.route_warehouse0_buy', raise_if_not_found=False).sudo() - # if route_manufacture and route_mto: - # # 外协 - # if route_type == 'subcontract': - # route_subcontract = self.env.ref('mrp_subcontracting.route_resupply_subcontractor_mto', - # raise_if_not_found=False).sudo() - # return [route_mto.id, route_purchase.id, route_subcontract.id] - # elif route_type == 'purchase': - # # 采购 - # return [route_mto.id, route_purchase.id] - # else: - # return [route_mto.id, route_manufacture.id] - # return [] - - # route_ids = fields.Many2many(default=lambda self: self._get_route()) - - # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品 - def product_create(self, product_id, item, order_id, order_number, i): - copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy() - copy_product_id.product_tmpl_id.active = True - model_type = self.env['sf.model.type'].search([], limit=1) - attachment = self.attachment_create(item['model_name'], item['model_data']) - vals = { - 'name': '%s-%s-%s' % ('P', order_id.name, i), - 'model_long': item['model_long'] + model_type.embryo_tolerance, - 'model_width': item['model_width'] + model_type.embryo_tolerance, - 'model_height': item['model_height'] + model_type.embryo_tolerance, - 'model_volume': (item['model_long'] + model_type.embryo_tolerance) * ( - item['model_width'] + model_type.embryo_tolerance) * ( - item['model_height'] + model_type.embryo_tolerance), - 'product_model_type_id': model_type.id, - 'model_processing_panel': 'R', - 'model_machining_precision': item['model_machining_precision'], - 'model_code': item['barcode'], - 'length': item['model_long'], - 'width': item['model_width'], - 'height': item['model_height'], - 'volume': item['model_long'] * item['model_width'] * item['model_height'], - 'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']), - 'model_name': attachment.name, - 'upload_model_file': [(6, 0, [attachment.id])], - # 'tag_ids': [(6, 0, [t.id for t in account_template.tag_ids])], - # 'single_manufacturing': True, - # 'tracking': 'serial', - 'list_price': item['price'], - # 'categ_id': self.env.ref('sf_dlm.product_category_finished_sf').id, - 'materials_id': self.env['sf.production.materials'].search( - [('materials_no', '=', item['texture_code'])]).id, - 'materials_type_id': self.env['sf.materials.model'].search( - [('materials_no', '=', item['texture_type_code'])]).id, - # 'model_surface_process_ids': self.get_production_process_id(item['surface_process_code']), - 'model_process_parameters_ids': self.get_process_parameters_id(item['process_parameters_code']), - 'model_remark': item['remark'], - 'default_code': '%s-%s' % (order_number, i), - # 'barcode': item['barcode'], - 'active': True, - # 'route_ids': self._get_routes('') - } - copy_product_id.sudo().write(vals) - # product_id.product_tmpl_id.active = False - return copy_product_id - - # def get_production_process_id(self, surface_process_code): - # production_process_ids = [] - # for item in surface_process_code: - # production_process = self.env['sf.production.process'].search([('process_encode', '=', item)]) - # production_process_ids.append(production_process.id) - # return [(6, 0, production_process_ids)] - - def get_process_parameters_id(self, process_parameters_code): - process_parameters_ids = [] - for item in process_parameters_code: - process_parameters = self.env['sf.production.process.parameter'].search([('code', '=', item)]) - process_parameters_ids.append(process_parameters.id) - return [(6, 0, process_parameters_ids)] - - def attachment_create(self, name, data): - attachment = self.env['ir.attachment'].create({ - 'datas': base64.b64decode(data), - 'type': 'binary', - 'public': True, - 'description': '模型文件', - 'name': name - }) - return attachment - - # 创建坯料 - def no_bom_product_create(self, product_id, item, order_id, route_type, i): - no_bom_copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy() - no_bom_copy_product_id.product_tmpl_id.active = True - materials_id = self.env['sf.production.materials'].search( - [('materials_no', '=', item['texture_code'])]) - materials_type_id = self.env['sf.materials.model'].search( - [('materials_no', '=', item['texture_type_code'])]) - model_type = self.env['sf.model.type'].search([], limit=1) - supplier = self.env['mrp.bom'].get_supplier(materials_type_id) - logging.info('no_bom_copy_product_supplier-vals:%s' % supplier) - vals = { - 'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R', - order_id.name, i, materials_id.name, materials_type_id.name, - item['model_long'] + model_type.embryo_tolerance, - item['model_width'] + model_type.embryo_tolerance, - item['model_height'] + model_type.embryo_tolerance), - 'length': item['model_long'] + model_type.embryo_tolerance, - 'width': item['model_width'] + model_type.embryo_tolerance, - 'height': item['model_height'] + model_type.embryo_tolerance, - 'volume': (item['model_long'] + model_type.embryo_tolerance) * ( - item['model_width'] + model_type.embryo_tolerance) * ( - item['model_height'] + model_type.embryo_tolerance), - 'embryo_model_type_id': model_type.id, - 'list_price': item['price'], - 'materials_id': materials_id.id, - 'materials_type_id': materials_type_id.id, - 'is_bfm': True, - # 'route_ids': self._get_routes(route_type), - # 'categ_id': self.env.ref('sf_dlm.product_category_embryo_sf').id, - # 'model_surface_process_id': self.env['sf.production.process'].search( - # [('process_encode', '=', item['surface_process_code'])]).id, - # 'model_process_parameters_id': self.env['sf.processing.technology'].search( - # [('process_encode', '=', item['process_parameters_code'])]).id, - 'active': True - } - # 外协和采购生成的坯料需要根据材料型号绑定供应商 - if route_type == 'subcontract' or route_type == 'purchase': - no_bom_copy_product_id.purchase_ok = True - no_bom_copy_product_id.seller_ids = [ - (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})] - if route_type == 'subcontract': - partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)]) - partner.is_subcontractor = True - no_bom_copy_product_id.write(vals) - logging.info('no_bom_copy_product_id-vals:%s' % vals) - # product_id.product_tmpl_id.active = False - return no_bom_copy_product_id - - @api.model_create_multi - def create(self, vals_list): - for vals in vals_list: - if vals.get('upload_model_file'): - if vals.get('is_bfm') is False and vals.get('categ_type') == '成品': - for item in vals['upload_model_file']: - logging.info('create-attachment:%s' % int(item[2][0])) - attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item[2][0]))]) - base64_data = base64.b64encode(attachment.datas) - base64_datas = base64_data.decode('utf-8') - model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() - report_path = attachment._full_path(attachment.store_fname) - vals['model_file'] = self.transition_glb_file(report_path, model_code) - logging.info('create-model_file:%s' % len(vals['model_file'])) - self._sanitize_vals(vals) - templates = super(ResProductTemplate, self).create(vals_list) - if "create_product_product" not in self._context: - templates._create_variant_ids() - - # This is needed to set given values to first variant after creation - for template, vals in zip(templates, vals_list): - related_vals = {} - for field_name in self._get_related_fields_variant_template(): - if vals.get(field_name): - related_vals[field_name] = vals[field_name] - if related_vals: - template.write(related_vals) - logging.info('create-model_file:%s' % templates.model_file) - return templates - - @api.onchange('upload_model_file') - def onchange_model_file(self): - for item in self: - if item.upload_model_file: - if len(item.upload_model_file) > 1: - raise ValidationError('只允许上传一个文件') - manufacturing_order = self.env['mrp.production'].search([('product_id', '=', self.id)]) - if manufacturing_order: - raise ValidationError('该产品已生成制造订单，无法进行修改') - file_attachment_id = item.upload_model_file[0] - # 附件路径 - report_path = file_attachment_id._full_path(file_attachment_id.store_fname) - base64_data = base64.b64encode(file_attachment_id.datas) - base64_datas = base64_data.decode('utf-8') - model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() - item.model_file = self.transition_glb_file(report_path, model_code) - - # 将attach的datas内容转为glb文件 - def transition_glb_file(self, report_path, code): - shapes = read_step_file(report_path) - output_file = os.path.join('/tmp', str(code) + '.stl') - write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) - # 转化为glb - output_glb_file = os.path.join('/tmp', str(code) + '.glb') - util_path = get_resource_path('sf_dlm', 'static/util') - cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file) - os.system(cmd) - # 转base64 - with open(output_glb_file, 'rb') as fileObj: - image_data = fileObj.read() - base64_data = base64.b64encode(image_data) - return base64_data - - -class ResMrpBom(models.Model): - _inherit = 'mrp.bom' - - subcontractor_id = fields.Many2one('res.partner', string='外包商') - - def bom_create_line_has(self, embryo): - vals = { - 'bom_id': self.id, - 'product_id': embryo.id, - 'product_tmpl_id': embryo.product_tmpl_id.id, - 'product_qty': 1, - 'product_uom_id': 1 - } - return self.env['mrp.bom.line'].create(vals) - - # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom - def bom_create(self, product, bom_type, product_type): - bom_id = self.env['mrp.bom'].create({ - 'product_tmpl_id': product.product_tmpl_id.id, - 'type': bom_type, - # 'subcontractor_id': '' or subcontract.partner_id.id, - 'product_qty': 1, - 'product_uom_id': 1 - }) - if bom_type == 'subcontract' and product_type is not False: - subcontract = self.get_supplier(product.materials_type_id) - bom_id.subcontractor_id = subcontract.partner_id.id - return bom_id - - # 坯料BOM组件：选取当前坯料原材料， - # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤） - # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤） - def bom_create_line(self, embryo): - # 选取当前坯料原材料 - raw_bom_line = self.get_raw_bom(embryo) - if raw_bom_line: - bom_line = self.env['mrp.bom.line'].create({ - 'bom_id': self.id, - 'product_id': raw_bom_line.id, - 'product_tmpl_id': raw_bom_line.product_tmpl_id.id, - 'product_qty': round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000), - 'product_uom_id': raw_bom_line.uom_id.id, - }) - return bom_line - else: - return False - - # 查询材料型号默认排第一的供应商 - def get_supplier(self, materials_type): - seller_id = self.env['sf.supplier.sort'].search( - [('materials_model_id', '=', materials_type.id)], - limit=1, - order='sequence asc') - return seller_id - - # 匹配bom - def get_bom(self, product): - embryo_has = self.env['product.product'].search( - [('categ_id.type', '=', '坯料'), ('materials_type_id', '=', product.materials_type_id.id), - ('length', '>', product.length), ('width', '>', product.width), - ('height', '>', product.height), ('is_bfm', '=', False) - ], - limit=1, - order='volume desc' - ) - logging.info('get_bom-vals:%s' % embryo_has) - if embryo_has: - rate_of_waste = ((embryo_has.volume - product.model_volume) % embryo_has.volume) * 100 - if rate_of_waste <= 20: - return embryo_has - else: - return - - # 查bom的原材料 - def get_raw_bom(self, product): - raw_bom = self.env['product.product'].search( - [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)]) - return raw_bom - - -class ResProductCategory(models.Model): - _inherit = "product.category" - - type = fields.Selection( - [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺")], - default="", string="类型") - - # @api.constrains('type') - # def _check_type(self): - # category = self.env['product.category'].search( - # [('type', '=', self.type)]) - # if category: - # raise ValidationError("该类别已存在,请选择其他类别") diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index efcab98d..e499dc4b 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -4,13 +4,8 @@ product.template.form.inherit.sf product.template - + - - - - - + - + + attrs="{'invisible': ['|',('categ_type', '=', '表面工艺'),('categ_type', '=', '刀具')]}"/> + + + + + + + @@ -55,21 +65,15 @@
- - - - @@ -77,6 +81,144 @@ + + + + + + + + + + + + + + + + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py index 419dee46..c174827d 100644 --- a/sf_manufacturing/models/__init__.py +++ b/sf_manufacturing/models/__init__.py @@ -5,6 +5,8 @@ from . import mrp_maintenance from . import mrp_routing_workcenter from . import mrp_workorder from . import model_type +from . import product_template +from . import product_workorder from . import stock from . import res_user diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py index 14315148..c665de36 100644 --- a/sf_manufacturing/models/model_type.py +++ b/sf_manufacturing/models/model_type.py @@ -1,6 +1,25 @@ from odoo import fields, models +class ResProductCategory(models.Model): + _inherit = "product.category" + + type = fields.Selection( + [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"), + ("夹具", "夹具")], + default="", string="类型") + +# +# class ResProductTemplateCateg(models.Model): +# _inherit = 'product.template' +# +# categ_type = fields.Selection( +# [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"), +# ("夹具", "夹具")], +# string='产品的类别', related='categ_id.type', +# store=True) + + class ModelType(models.Model): _name = 'sf.model.type' _description = '模型类型' @@ -82,5 +101,6 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model): _sql_constraints = [ ( - 'route_model_type_uniq', 'unique (route_workcenter_id,surface_technics_model_type_id)', '表面工艺工序不能重复!') + 'route_model_type_uniq', 'unique (route_workcenter_id,surface_technics_model_type_id)', + '表面工艺工序不能重复!') ] diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py new file mode 100644 index 00000000..5653ac7b --- /dev/null +++ b/sf_manufacturing/models/product_template.py @@ -0,0 +1,684 @@ +from odoo import models, fields, api +from odoo.exceptions import ValidationError +from odoo.modules import get_resource_path +from OCC.Extend.DataExchange import read_step_file +from OCC.Extend.DataExchange import write_stl_file +import logging +import base64 +import hashlib +import os + + +class ResProductTemplate(models.Model): + _inherit = 'product.template' + + # 模型的长,宽,高,体积,精度,材料 + model_name = fields.Char('模型名称') + categ_type = fields.Selection( + [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"), + ("夹具", "夹具")], + string='产品的类别', related='categ_id.type', + store=True) + model_long = fields.Float('模型长[mm]', digits=(16, 3)) + model_width = fields.Float('模型宽[mm]', digits=(16, 3)) + model_height = fields.Float('模型高[mm]', digits=(16, 3)) + model_volume = fields.Float('模型体积[m³]') + model_machining_precision = fields.Selection([ + ('0.10', '±0.10mm'), + ('0.05', '±0.05mm'), + ('0.03', '±0.03mm'), + ('0.02', '±0.02mm'), + ('0.01', '±0.01mm')], string='加工精度') + product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型') + embryo_model_type_id = fields.Many2one('sf.model.type', string='坯料模型类型') + model_processing_panel = fields.Char('模型加工面板') + # model_surface_process_category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别') + # model_surface_process_ids = fields.Many2many('sf.production.process', 'rel_product_process', string='表面工艺') + server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter', + string='表面工艺参数(服务产品)') + model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel', + string='表面工艺参数') + # model_price = fields.Float('模型单价', digits=(16, 3)) + model_remark = fields.Char('模型备注说明') + length = fields.Float('长[mm]', digits=(16, 3)) + width = fields.Float('宽[mm]', digits=(16, 3)) + height = fields.Float('高[mm]', digits=(16, 3)) + materials_id = fields.Many2one('sf.production.materials', string='材料') + materials_type_id = fields.Many2one('sf.materials.model', string='材料型号') + single_manufacturing = fields.Boolean(string="单个制造") + upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件') + model_code = fields.Char('模型编码') + is_bfm = fields.Boolean('业务平台是否自动创建', default=False) + + cutting_tool = fields.Selection([ + ('整体式刀具', '整体式刀具'), + ('刀片', '刀片'), + ('刀杆', '刀杆'), + ('刀盘', '刀盘'), + ('刀柄', '刀柄'), + ('夹头', '夹头')], string='刀具') + # 关联整体式刀具型号 + integral_cutting_tool_type_id = fields.Many2one('sf.integral.cutting.tool', '整体式刀具型号') + # 关联刀片型号 + blade_type_id = fields.Many2one('sf.blade', '刀片型号') + # 关联刀杆型号 + cutter_bar_type_id = fields.Many2one('sf.cutter.bar', '刀杆型号') + # 关联刀盘型号 + cutter_pad_type_id = fields.Many2one('sf.cutter.pad', '刀盘型号') + # 关联刀柄型号 + handle_type_id = fields.Many2one('sf.handle', '刀柄型号') + # 关联夹头型号 + chuck_type_id = fields.Many2one('sf.chuck', '夹头型号') + cutting_tool_parameter_brand_id = fields.Many2one('sf.machine.brand', '品牌') + # 整体式刀具参数 + cutting_tool_parameter_total_length = fields.Float('总长度[mm]') + cutting_tool_parameter_shank_length = fields.Float('柄部长度[mm]') + cutting_tool_parameter_blade_length = fields.Float('刃部长度[mm]') + cutting_tool_parameter_diameter = fields.Float('直径[mm]') + cutting_tool_parameter_blade_number = fields.Integer('刃数') + cutting_tool_parameter_front_angle = fields.Float('前角(°)') + cutting_tool_parameter_rear_angle = fields.Float('后角(°)') + cutting_tool_parameter_main_included_angle = fields.Float('主偏角(°)') + cutting_tool_parameter_material_model_id = fields.Many2one('sf.materials.model', '材料型号') + cutting_tool_parameter_nut = fields.Float('配对螺母[mm]') + # 适用夹头型号可以多选 + cutting_tool_parameter_chuck_model_ids = fields.Many2many('sf.chuck', string='适用夹头型号') + cutting_tool_parameter_scope = fields.Char('适用范围') + # 刀片参数 + cutting_tool_parameter_length = fields.Float('长度L[mm]') + cutting_tool_parameter_width = fields.Float('宽度D[mm])') + cutting_tool_parameter_height = fields.Float('高度T[mm]') + cutting_tool_parameter_top_angle = fields.Float('顶角(°)') + cutting_tool_parameter_r_angle = fields.Float('R角(°)') + cutting_tool_parameter_working_hardness = fields.Char('加工硬度') + cutting_tool_parameter_cutter_bar_ids = fields.Many2many('sf.cutter.bar', string='适用刀杆型号') + cutting_tool_parameter_cutter_pad_ids = fields.Many2many('sf.cutter.pad', string='适用刀盘型号') + cutting_tool_parameter_radius = fields.Float('刀尖半径[mm]') + # 刀杆/刀盘参数 + cutting_tool_parameter_c_diameter = fields.Float('C柄径[mm]') + cutting_tool_parameter_l_total_length = fields.Float('L总长[mm]') + cutting_tool_parameter_d_diameter = fields.Float('D刃径[mm]') + cutting_tool_parameter_blade_ids = fields.Many2many('sf.blade', string='适用刀片型号') + cutting_tool_parameter_wrench = fields.Float('配对扳手[mm]') + cutting_tool_parameter_screw = fields.Float('配备螺丝[mm]') + cutting_tool_parameter_accuracy_level = fields.Char('精度等级') + cutting_tool_parameter_rounded_corner = fields.Float('刀尖圆角半径[mm]') + cutting_tool_parameter_hardness = fields.Char('硬度(°)') + # 刀柄参数 + cutting_tool_parameter_handle_length = fields.Float('L[mm]') + cutting_tool_parameter_length1 = fields.Float('L1[mm]') + cutting_tool_parameter_diameter1 = fields.Float('D1[mm]') + cutting_tool_parameter_weight = fields.Float('重量(kg)') + cutting_tool_parameter_body_accuracy = fields.Float('本体精度[mm]') + cutting_tool_parameter_clamping_range = fields.Float('夹持范围[mm]') + cutting_tool_parameter_detection_accuracy = fields.Float('检测精度') + cutting_tool_parameter_detection_hardness = fields.Float('检测硬度') + cutting_tool_parameter_standard_speed = fields.Float('标准转速') + # 夹头参数 + cutting_tool_parameter_accuracy = fields.Float('精度[mm]') + cutting_tool_parameter_outer_diameter = fields.Float('外径[mm]') + cutting_tool_parameter_inner_diameter = fields.Float('内径[mm]') + cutting_tool_parameter_handle_model_ids = fields.Many2many('sf.handle.model', string='适用刀柄型号') + cutting_tool_parameter_feature = fields.Char('特性') + + # image_1920 = fields.Image(related='cutting_tool_parameter_image', store=True, + # domain=[('cutting_tool_parameter_image', '!=', False)]) + + # @api.constrains('cutting_tool_parameter_length',) + # def _check_length_or_width(self): + # for record in self: + # if record.cutting_tool == '刀片': + # if record.cutting_tool_parameter_length <= 0 \ + # and record.cutting_tool_parameter_width <= 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + # + # + # @api.constrains('cutting_tool_parameter_length', + # 'cutting_tool_parameter_width') + # def _check_length_or_width(self): + # for record in self: + # if record.cutting_tool == '刀片': + # if record.cutting_tool_parameter_length <= 0 \ + # and record.cutting_tool_parameter_width <= 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + # # if self.cutting_tool == '刀片': + # # if self.cutting_tool_parameter_length == 0 \ + # # or self.cutting_tool_parameter_width == 0: + # # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_height') + # def _check_height(self): + # if self.cutting_tool == '刀片': + # if self.cutting_tool_parameter_height <= 0: + # raise ValueError('该产品中高度不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_top_angle') + # def _check_top_angle(self): + # if self.cutting_tool == '刀片': + # if self.cutting_tool_parameter_top_angle <= 0: + # raise ValueError('该产品中顶角不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_r_angle') + # def _check_r_angle(self): + # if self.cutting_tool == '刀片': + # if self.cutting_tool_parameter_r_angle <= 0: + # raise ValueError('该产品中R角不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_radius') + # def _check_radius(self): + # if self.cutting_tool == '刀片': + # if self.cutting_tool_parameter_radius <= 0: + # raise ValueError('该产品中刀尖半径不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_handle_length', + # 'cutting_tool_parameter_length1', + # 'cutting_tool_parameter_diameter1') + # # 'cutting_tool_parameter_body_accuracy', + # # 'cutting_tool_parameter_detection_accuracy', + # # 'cutting_tool_parameter_detection_hardness') + # def _check_handle(self): + # for record in self: + # if record.cutting_tool == '刀柄': + # if record.cutting_tool_parameter_handle_length == 0 \ + # or record.cutting_tool_parameter_diameter1 == 0 \ + # or record.cutting_tool_parameter_length1 == 0: + # # or record.cutting_tool_parameter_detection_accuracy == 0 \ + # # or record.cutting_tool_parameter_detection_hardness == 0 \ + # # or record.cutting_tool_parameter_body_accuracy == 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + # # if self.cutting_tool == '刀柄': + # # if self.cutting_tool_parameter_handle_length == 0 \ + # # or self.cutting_tool_parameter_diameter1 == 0 \ + # # or self.cutting_tool_parameter_length1 == 0 \ + # # or self.cutting_tool_parameter_detection_accuracy == 0 \ + # # or self.cutting_tool_parameter_detection_hardness == 0 \ + # # or self.cutting_tool_parameter_body_accuracy == 0: + # # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_weight') + # def _check_weight(self): + # if self.cutting_tool == '刀柄': + # if self.cutting_tool_parameter_weight == 0: + # raise ValueError('该产品中重量不能为零，请确认并重新输入！') + + # @api.constrains('cutting_tool_parameter_c_diameter', + # 'cutting_tool_parameter_l_total_length', + # 'cutting_tool_parameter_d_diameter', + # 'cutting_tool_parameter_wrench', + # 'cutting_tool_parameter_screw', + # 'cutting_tool_parameter_rounded_corner', + # 'cutting_tool_parameter_hardness') + # def _check_angle(self): + # if self.cutting_tool in ['刀杆', '刀盘']: + # if self.cutting_tool_parameter_c_diameter == 0 \ + # or self.cutting_tool_parameter_l_total_length == 0 \ + # or self.cutting_tool_parameter_d_diameter == 0 \ + # or self.cutting_tool_parameter_wrench == 0 \ + # or self.cutting_tool_parameter_screw == 0 \ + # or self.cutting_tool_parameter_rounded_corner == 0 \ + # or self.cutting_tool_parameter_hardness: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + + # @api.constrains('cutting_tool_parameter_c_diameter', + # 'cutting_tool_parameter_l_total_length', + # 'cutting_tool_parameter_diameter1') + # def _check_angle(self): + # for record in self: + # if record.cutting_tool == '整体式刀具' or record.cutting_tool == '刀片': + # if record.cutting_tool_parameter_c_diameter == 0 \ + # or record.cutting_tool_parameter_l_total_length == 0 \ + # or record.cutting_tool_parameter_diameter1 == 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + + # @api.constrains('cutting_tool_parameter_outer_diameter', + # 'cutting_tool_parameter_inner_diameter', + # 'cutting_tool_parameter_body_accuracy', + # 'cutting_tool_parameter_handle_length', + # 'cutting_tool_parameter_length1', + # 'cutting_tool_parameter_diameter1') + # def _check_angle(self): + # for record in self: + # if record.cutting_tool == '整体式刀具' or record.cutting_tool == '刀片': + # if record.cutting_tool_parameter_front_angle == 0 \ + # or record.cutting_tool_parameter_rear_angle == 0 \ + # or record.cutting_tool_parameter_main_included_angle == 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + + # @api.constrains('cutting_tool_parameter_front_angle', + # 'cutting_tool_parameter_rear_angle', + # 'cutting_tool_parameter_main_included_angle') + # def _check_angle(self): + # for record in self: + # if record.cutting_tool == '整体式刀具' or record.cutting_tool == '刀片': + # if record.cutting_tool_parameter_front_angle <= 0 \ + # or record.cutting_tool_parameter_rear_angle <= 0 \ + # or record.cutting_tool_parameter_main_included_angle <= 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_total_length', + # 'cutting_tool_parameter_shank_length', + # 'cutting_tool_parameter_blade_length', + # 'cutting_tool_parameter_diameter') + # def _check_length(self): + # for record in self: + # if record.cutting_tool == '整体式刀具': + # if record.cutting_tool_parameter_total_length <= 0 \ + # or record.cutting_tool_parameter_shank_length <= 0 \ + # or record.cutting_tool_parameter_blade_length <= 0 \ + # or record.cutting_tool_parameter_diameter <= 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + + # @api.constrains('cutting_tool_parameter_total_length', + # 'cutting_tool_parameter_shank_length', + # 'cutting_tool_parameter_blade_length', + # 'cutting_tool_parameter_diameter') + # def _check_length(self): + # for record in self: + # if record.cutting_tool == '整体式刀具': + # if record.cutting_tool_parameter_total_length == 0 \ + # or record.cutting_tool_parameter_shank_length == 0 \ + # or record.cutting_tool_parameter_blade_length == 0 \ + # or record.cutting_tool_parameter_diameter == 0: + # raise ValueError('该产品中有字段不能为零，请确认并重新输入！') + + # @api.constrains('cutting_tool_parameter_blade_number') + # def _check_blade_number(self): + # if self.cutting_tool in ['整体式刀具', '刀杆', '刀盘']: + # if self.cutting_tool_parameter_blade_number <= 0: + # raise ValueError('该产品中刃数不能为零，请确认并重新输入！') + # + # @api.constrains('cutting_tool_parameter_nut') + # def _check_nut(self): + # if self.cutting_tool in ['整体式刀具', '刀片', '刀柄', '夹头']: + # if self.cutting_tool_parameter_nut <= 0: + # raise ValueError('该产品中配对螺母不能为零，请确认并重新输入！') + + def _get_volume_uom_id_from_ir_config_parameter(self): + product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet') + if product_length_in_feet_param == '1': + return self.env.ref('uom.product_uom_cubic_foot') + else: + return self.env.ref('sf_dlm.product_uom_cubic_millimeter') + + # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品 + def product_create(self, product_id, item, order_id, order_number, i): + copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy() + copy_product_id.product_tmpl_id.active = True + model_type = self.env['sf.model.type'].search([], limit=1) + attachment = self.attachment_create(item['model_name'], item['model_data']) + vals = { + 'name': '%s-%s-%s' % ('P', order_id.name, i), + 'model_long': item['model_long'] + model_type.embryo_tolerance, + 'model_width': item['model_width'] + model_type.embryo_tolerance, + 'model_height': item['model_height'] + model_type.embryo_tolerance, + 'model_volume': (item['model_long'] + model_type.embryo_tolerance) * ( + item['model_width'] + model_type.embryo_tolerance) * ( + item['model_height'] + model_type.embryo_tolerance), + 'product_model_type_id': model_type.id, + 'model_processing_panel': 'R', + 'model_machining_precision': item['model_machining_precision'], + 'model_code': item['barcode'], + 'length': item['model_long'], + 'width': item['model_width'], + 'height': item['model_height'], + 'volume': item['model_long'] * item['model_width'] * item['model_height'], + 'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']), + 'model_name': attachment.name, + 'upload_model_file': [(6, 0, [attachment.id])], + # 'tag_ids': [(6, 0, [t.id for t in account_template.tag_ids])], + # 'single_manufacturing': True, + # 'tracking': 'serial', + 'list_price': item['price'], + # 'categ_id': self.env.ref('sf_dlm.product_category_finished_sf').id, + 'materials_id': self.env['sf.production.materials'].search( + [('materials_no', '=', item['texture_code'])]).id, + 'materials_type_id': self.env['sf.materials.model'].search( + [('materials_no', '=', item['texture_type_code'])]).id, + # 'model_surface_process_ids': self.get_production_process_id(item['surface_process_code']), + 'model_process_parameters_ids': self.get_process_parameters_id(item['process_parameters_code']), + 'model_remark': item['remark'], + 'default_code': '%s-%s' % (order_number, i), + # 'barcode': item['barcode'], + 'active': True, + # 'route_ids': self._get_routes('') + } + copy_product_id.sudo().write(vals) + # product_id.product_tmpl_id.active = False + return copy_product_id + + def _get_ids(self, param): + type_ids = [] + if not param: + return [] + for item in param: + type_ids.append(item.id) + return [(6, 0, type_ids)] + + def get_process_parameters_id(self, process_parameters_code): + process_parameters_ids = [] + for item in process_parameters_code: + process_parameters = self.env['sf.production.process.parameter'].search([('code', '=', item)]) + process_parameters_ids.append(process_parameters.id) + return [(6, 0, process_parameters_ids)] + + def attachment_create(self, name, data): + attachment = self.env['ir.attachment'].create({ + 'datas': base64.b64decode(data), + 'type': 'binary', + 'public': True, + 'description': '模型文件', + 'name': name + }) + return attachment + + # 创建坯料 + def no_bom_product_create(self, product_id, item, order_id, route_type, i): + no_bom_copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy() + no_bom_copy_product_id.product_tmpl_id.active = True + materials_id = self.env['sf.production.materials'].search( + [('materials_no', '=', item['texture_code'])]) + materials_type_id = self.env['sf.materials.model'].search( + [('materials_no', '=', item['texture_type_code'])]) + model_type = self.env['sf.model.type'].search([], limit=1) + supplier = self.env['mrp.bom'].get_supplier(materials_type_id) + logging.info('no_bom_copy_product_supplier-vals:%s' % supplier) + vals = { + 'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R', + order_id.name, i, materials_id.name, materials_type_id.name, + item['model_long'] + model_type.embryo_tolerance, + item['model_width'] + model_type.embryo_tolerance, + item['model_height'] + model_type.embryo_tolerance), + 'length': item['model_long'] + model_type.embryo_tolerance, + 'width': item['model_width'] + model_type.embryo_tolerance, + 'height': item['model_height'] + model_type.embryo_tolerance, + 'volume': (item['model_long'] + model_type.embryo_tolerance) * ( + item['model_width'] + model_type.embryo_tolerance) * ( + item['model_height'] + model_type.embryo_tolerance), + 'embryo_model_type_id': model_type.id, + 'list_price': item['price'], + 'materials_id': materials_id.id, + 'materials_type_id': materials_type_id.id, + 'is_bfm': True, + # 'route_ids': self._get_routes(route_type), + # 'categ_id': self.env.ref('sf_dlm.product_category_embryo_sf').id, + # 'model_surface_process_id': self.env['sf.production.process'].search( + # [('process_encode', '=', item['surface_process_code'])]).id, + # 'model_process_parameters_id': self.env['sf.processing.technology'].search( + # [('process_encode', '=', item['process_parameters_code'])]).id, + 'active': True + } + # 外协和采购生成的坯料需要根据材料型号绑定供应商 + if route_type == 'subcontract' or route_type == 'purchase': + no_bom_copy_product_id.purchase_ok = True + no_bom_copy_product_id.seller_ids = [ + (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})] + if route_type == 'subcontract': + partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)]) + partner.is_subcontractor = True + no_bom_copy_product_id.write(vals) + logging.info('no_bom_copy_product_id-vals:%s' % vals) + # product_id.product_tmpl_id.active = False + return no_bom_copy_product_id + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if vals.get('upload_model_file'): + if vals.get('is_bfm') is False and vals.get('categ_type') == '成品': + for item in vals['upload_model_file']: + logging.info('create-attachment:%s' % int(item[2][0])) + attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item[2][0]))]) + base64_data = base64.b64encode(attachment.datas) + base64_datas = base64_data.decode('utf-8') + model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() + report_path = attachment._full_path(attachment.store_fname) + vals['model_file'] = self.transition_glb_file(report_path, model_code) + logging.info('create-model_file:%s' % len(vals['model_file'])) + self._sanitize_vals(vals) + templates = super(ResProductTemplate, self).create(vals_list) + if "create_product_product" not in self._context: + templates._create_variant_ids() + + # This is needed to set given values to first variant after creation + for template, vals in zip(templates, vals_list): + related_vals = {} + for field_name in self._get_related_fields_variant_template(): + if vals.get(field_name): + related_vals[field_name] = vals[field_name] + if related_vals: + template.write(related_vals) + logging.info('create-model_file:%s' % templates.model_file) + return templates + + @api.onchange('upload_model_file') + def onchange_model_file(self): + for item in self: + if item.upload_model_file: + if len(item.upload_model_file) > 1: + raise ValidationError('只允许上传一个文件') + manufacturing_order = self.env['mrp.production'].search([('product_id', '=', self.id)]) + if manufacturing_order: + raise ValidationError('该产品已生成制造订单，无法进行修改') + file_attachment_id = item.upload_model_file[0] + # 附件路径 + report_path = file_attachment_id._full_path(file_attachment_id.store_fname) + base64_data = base64.b64encode(file_attachment_id.datas) + base64_datas = base64_data.decode('utf-8') + model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() + item.model_file = self.transition_glb_file(report_path, model_code) + + # 将attach的datas内容转为glb文件 + def transition_glb_file(self, report_path, code): + shapes = read_step_file(report_path) + output_file = os.path.join('/tmp', str(code) + '.stl') + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + # 转化为glb + output_glb_file = os.path.join('/tmp', str(code) + '.glb') + util_path = get_resource_path('sf_dlm', 'static/util') + cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file) + os.system(cmd) + # 转base64 + with open(output_glb_file, 'rb') as fileObj: + image_data = fileObj.read() + base64_data = base64.b64encode(image_data) + return base64_data + + @api.onchange('integral_cutting_tool_type_id') + def _get_integral_cutting_tool_type_info(self): + if self.integral_cutting_tool_type_id: + for item in self: + item.cutting_tool_parameter_brand_id = item.integral_cutting_tool_type_id.brand.id + item.cutting_tool_parameter_total_length = item.integral_cutting_tool_type_id.total_length + item.cutting_tool_parameter_shank_length = item.integral_cutting_tool_type_id.shank_length + item.cutting_tool_parameter_blade_length = item.integral_cutting_tool_type_id.blade_length + item.cutting_tool_parameter_diameter = item.integral_cutting_tool_type_id.diameter + item.cutting_tool_parameter_nut = item.integral_cutting_tool_type_id.nut + item.cutting_tool_parameter_blade_number = item.integral_cutting_tool_type_id.blade_number + item.cutting_tool_parameter_material_model_id = item.integral_cutting_tool_type_id.material_model.id + item.cutting_tool_parameter_front_angle = item.integral_cutting_tool_type_id.front_angle + item.cutting_tool_parameter_rear_angle = item.integral_cutting_tool_type_id.rear_angle + item.cutting_tool_parameter_main_included_angle = item.integral_cutting_tool_type_id.main_included_angle + item.cutting_tool_parameter_chuck_model_ids = self._get_ids( + item.integral_cutting_tool_type_id.chuck_model) + item.cutting_tool_parameter_scope = item.integral_cutting_tool_type_id.scope + item.image_1920 = '' if not item.integral_cutting_tool_type_id.image else item.integral_cutting_tool_type_id.image + + @api.onchange('blade_type_id') + def _get_blade_type_info(self): + if self.blade_type_id: + for item in self: + item.cutting_tool_parameter_brand_id = item.blade_type_id.brand.id + item.cutting_tool_parameter_top_angle = item.blade_type_id.top_angle + item.cutting_tool_parameter_front_angle = item.blade_type_id.front_angle + item.cutting_tool_parameter_rear_angle = item.blade_type_id.rear_angle + item.cutting_tool_parameter_main_included_angle = item.blade_type_id.main_included_angle + item.cutting_tool_parameter_r_angle = item.blade_type_id.r_angle + item.cutting_tool_parameter_working_hardness = item.blade_type_id.hardness + item.cutting_tool_parameter_material_model_id = item.blade_type_id.material_model.id + item.cutting_tool_parameter_length = item.blade_type_id.length + item.cutting_tool_parameter_width = item.blade_type_id.width + item.cutting_tool_parameter_height = item.blade_type_id.height + item.cutting_tool_parameter_radius = item.blade_type_id.radius + item.cutting_tool_parameter_nut = item.blade_type_id.nut + item.cutting_tool_parameter_cutter_bar_ids = self._get_ids(item.blade_type_id.cutter_bar) + item.cutting_tool_parameter_cutter_pad_ids = self._get_ids(item.blade_type_id.cutter_pad) + item.image_1920 = '' if not item.blade_type_id.image else item.blade_type_id.image + + @api.onchange('cutter_bar_type_id') + def _get_cutter_bar_type_info(self): + if self.cutter_bar_type_id: + for item in self: + item.cutting_tool_parameter_brand_id = item.cutter_bar_type_id.brand.id + item.cutting_tool_parameter_c_diameter = item.cutter_bar_type_id.c_diameter + item.cutting_tool_parameter_d_diameter = item.cutter_bar_type_id.d_diameter + item.cutting_tool_parameter_l_total_length = item.cutter_bar_type_id.total_length + item.cutting_tool_parameter_wrench = item.cutter_bar_type_id.wrench + item.cutting_tool_parameter_screw = item.cutter_bar_type_id.screw + item.cutting_tool_parameter_blade_ids = self._get_ids(item.cutter_bar_type_id.blade) + item.cutting_tool_parameter_scope = item.cutter_bar_type_id.scope + item.cutting_tool_parameter_material_model_id = item.cutter_bar_type_id.material_model.id + item.cutting_tool_parameter_rounded_corner = item.cutter_bar_type_id.radius + item.cutting_tool_parameter_accuracy_level = item.cutter_bar_type_id.accuracy + item.cutting_tool_parameter_blade_number = item.cutter_bar_type_id.blade_number + item.cutting_tool_parameter_hardness = item.cutter_bar_type_id.hardness + item.image_1920 = '' if not item.cutter_bar_type_id.image else item.cutter_bar_type_id.image + + @api.onchange('cutter_pad_type_id') + def _get_cutter_pad_type_info(self): + if self.cutter_pad_type_id: + for item in self: + item.cutting_tool_parameter_brand_id = item.cutter_pad_type_id.brand.id + item.cutting_tool_parameter_c_diameter = item.cutter_pad_type_id.c_diameter + item.cutting_tool_parameter_d_diameter = item.cutter_pad_type_id.d_diameter + item.cutting_tool_parameter_l_total_length = item.cutter_pad_type_id.total_length + item.cutting_tool_parameter_wrench = item.cutter_pad_type_id.wrench + item.cutting_tool_parameter_screw = item.cutter_pad_type_id.screw + item.cutting_tool_parameter_blade_ids = item.cutter_pad_type_id.blade.id + item.cutting_tool_parameter_scope = item.cutter_pad_type_id.scope + item.cutting_tool_parameter_material_model_id = item.cutter_pad_type_id.material_model.id + item.cutting_tool_parameter_rounded_corner = item.cutter_pad_type_id.radius + item.cutting_tool_parameter_accuracy_level = item.cutter_pad_type_id.accuracy + item.cutting_tool_parameter_blade_number = item.cutter_pad_type_id.blade_number + item.cutting_tool_parameter_hardness = item.cutter_pad_type_id.hardness + item.image_1920 = '' if not item.cutter_pad_type_id.image else item.cutter_pad_type_id.image + + @api.onchange('handle_type_id') + def _get_handle_type_info(self): + if self.handle_type_id: + for item in self: + item.cutting_tool_parameter_brand_id = item.handle_type_id.brand.id + item.cutting_tool_parameter_handle_length = item.handle_type_id.length + item.cutting_tool_parameter_length1 = item.handle_type_id.length1 + item.cutting_tool_parameter_diameter1 = item.handle_type_id.diameter1 + item.cutting_tool_parameter_body_accuracy = item.handle_type_id.body_accuracy + item.cutting_tool_parameter_nut = item.handle_type_id.nut + item.cutting_tool_parameter_clamping_range = item.handle_type_id.clamping_range + item.cutting_tool_parameter_weight = item.handle_type_id.weight + item.cutting_tool_parameter_material_model_id = item.handle_type_id.material_model.id + item.cutting_tool_parameter_chuck_model_ids = self._get_ids(item.handle_type_id.chuck_model) + item.cutting_tool_parameter_detection_accuracy = item.handle_type_id.detection_accuracy + item.cutting_tool_parameter_detection_hardness = item.handle_type_id.detection_hardness + item.cutting_tool_parameter_standard_speed = item.handle_type_id.standard_speed + item.image_1920 = '' if not item.handle_type_id.image else item.handle_type_id.image + + @api.onchange('chuck_type_id') + def _get_chuck_type_info(self): + if self.chuck_type_id: + for item in self: + item.cutting_tool_parameter_brand_id = item.chuck_type_id.brand.id + item.cutting_tool_parameter_outer_diameter = item.chuck_type_id.diameter + item.cutting_tool_parameter_inner_diameter = item.chuck_type_id.inner_diameter + item.cutting_tool_parameter_accuracy = item.chuck_type_id.accuracy + item.cutting_tool_parameter_nut = item.chuck_type_id.nut + item.cutting_tool_parameter_clamping_range = item.chuck_type_id.clamping_range + item.cutting_tool_parameter_handle_model_ids = self._get_ids(item.chuck_type_id.handle_model) + item.cutting_tool_parameter_material_model_id = item.chuck_type_id.material_model.id + item.cutting_tool_parameter_height = item.chuck_type_id.height + item.cutting_tool_parameter_feature = item.chuck_type_id.feature + item.image_1920 = '' if not item.chuck_type_id.image else item.chuck_type_id.image + +class ResMrpBom(models.Model): + _inherit = 'mrp.bom' + + subcontractor_id = fields.Many2one('res.partner', string='外包商') + + def bom_create_line_has(self, embryo): + vals = { + 'bom_id': self.id, + 'product_id': embryo.id, + 'product_tmpl_id': embryo.product_tmpl_id.id, + 'product_qty': 1, + 'product_uom_id': 1 + } + return self.env['mrp.bom.line'].create(vals) + + # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom + def bom_create(self, product, bom_type, product_type): + bom_id = self.env['mrp.bom'].create({ + 'product_tmpl_id': product.product_tmpl_id.id, + 'type': bom_type, + # 'subcontractor_id': '' or subcontract.partner_id.id, + 'product_qty': 1, + 'product_uom_id': 1 + }) + if bom_type == 'subcontract' and product_type is not False: + subcontract = self.get_supplier(product.materials_type_id) + bom_id.subcontractor_id = subcontract.partner_id.id + return bom_id + + # 坯料BOM组件：选取当前坯料原材料， + # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤） + # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤） + def bom_create_line(self, embryo): + # 选取当前坯料原材料 + raw_bom_line = self.get_raw_bom(embryo) + if raw_bom_line: + bom_line = self.env['mrp.bom.line'].create({ + 'bom_id': self.id, + 'product_id': raw_bom_line.id, + 'product_tmpl_id': raw_bom_line.product_tmpl_id.id, + 'product_qty': round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000), + 'product_uom_id': raw_bom_line.uom_id.id, + }) + return bom_line + else: + return False + + # 查询材料型号默认排第一的供应商 + def get_supplier(self, materials_type): + seller_id = self.env['sf.supplier.sort'].search( + [('materials_model_id', '=', materials_type.id)], + limit=1, + order='sequence asc') + return seller_id + + # 匹配bom + def get_bom(self, product): + embryo_has = self.env['product.product'].search( + [('categ_id.type', '=', '坯料'), ('materials_type_id', '=', product.materials_type_id.id), + ('length', '>', product.length), ('width', '>', product.width), + ('height', '>', product.height), ('is_bfm', '=', False) + ], + limit=1, + order='volume desc' + ) + logging.info('get_bom-vals:%s' % embryo_has) + if embryo_has: + rate_of_waste = ((embryo_has.volume - product.model_volume) % embryo_has.volume) * 100 + if rate_of_waste <= 20: + return embryo_has + else: + return + + # 查bom的原材料 + def get_raw_bom(self, product): + raw_bom = self.env['product.product'].search( + [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)]) + return raw_bom + + # @api.constrains('type') + # def _check_type(self): + # category = self.env['product.category'].search( + # [('type', '=', self.type)]) + # if category: + # raise ValidationError("该类别已存在,请选择其他类别") diff --git a/sf_manufacturing/models/product_workorder.py b/sf_manufacturing/models/product_workorder.py new file mode 100644 index 00000000..bcdc5d86 --- /dev/null +++ b/sf_manufacturing/models/product_workorder.py @@ -0,0 +1,12 @@ +from odoo import fields, models + + +class ResMrpWorkOrder(models.Model): + _inherit = 'mrp.workorder' + _order = 'sequence' + + product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True, check_company=True, string="坯料长度(mm)") + product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True, check_company=True, string="坯料宽度(mm)") + product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True, check_company=True, string="坯料高度(mm)") + product_tmpl_id_materials_id = fields.Many2one(related='production_id.product_tmpl_id.materials_id', readonly=True, store=True, check_company=True, string="材料") + product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id', readonly=True, store=True, check_company=True, string="型号") diff --git a/sf_mrs_connect/data/ir_cron_data.xml b/sf_mrs_connect/data/ir_cron_data.xml index 513d5dee..016789b6 100644 --- a/sf_mrs_connect/data/ir_cron_data.xml +++ b/sf_mrs_connect/data/ir_cron_data.xml @@ -99,28 +99,6 @@ - - 同步资源库刀具类别 - - code - model.sync_cutting_tool_category() - 1 - days - -1 - - - - - 同步资源库刀具型号 - - code - model.sync_cutting_tool_type() - 1 - days - -1 - - - 同步资源库工序 @@ -307,4 +285,48 @@ -1 + + + 同步资源库夹紧元件型号 + + code + model.sync_fixture_clamping_element() + 1 + days + -1 + + + + + 同步资源库夹紧元件类型 + + code + model.sync_clamping_element_type() + 1 + days + -1 + + + + + 同步资源库导向元件类型 + + code + model.sync_guide_element_type() + 1 + days + -1 + + + + + 同步资源库导向元件导向方式 + + code + model.sync_guide_element_guide_mode() + 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 bb996fdf..de7265ba 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -40,100 +40,111 @@ class ResConfigSettings(models.TransientModel): _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() - _logger.info("同步资源库刀具") # self.env['sf.production.process.parameter'].sync_all_production_process_parameter() # _logger.info("同步表面工艺参数") - _logger.info("定时同步每日功能刀具类型列表...") - # self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model() - _logger.info("同步每日功能刀具类型完成") + # _logger.info("定时同步每日功能刀具类型列表...") + # # 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() _logger.info("同步所有功能刀具类型完成") - _logger.info("定时同步每日整体式刀具类型列表...") - # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool() - _logger.info("同步整体式刀具类型完成") - _logger.info("同步每日刀片类型列表...") - self.env['sf.blade.model'].sync_blade_model() - _logger.info("同步每日刀片类型完成") + # _logger.info("定时同步每日整体式刀具类型列表...") + # # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool() + # _logger.info("同步整体式刀具类型完成") + # _logger.info("同步每日刀具物料...") + # self.env['sf.cutting.tool.material'].sync_cutting_tool_material() + # _logger.info("同步每日刀具物料完成") + _logger.info("同步所有刀具物料...") + self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material() + _logger.info("同步所有刀具物料完成") + # _logger.info("同步每日刀片类型列表...") + # self.env['sf.blade.model'].sync_blade_model() + # _logger.info("同步每日刀片类型完成") _logger.info("同步所有刀片类型列表...") self.env['sf.blade.model'].sync_all_blade_model() _logger.info("同步所有刀片类型完成") - _logger.info("同步每日刀杆类型...") - self.env['sf.cutter.bar.model'].sync_cutter_bar_model() - _logger.info("同步每日刀杆类型完成") + # _logger.info("同步每日刀杆类型...") + # self.env['sf.cutter.bar.model'].sync_cutter_bar_model() + # _logger.info("同步每日刀杆类型完成") _logger.info("同步所有刀杆类型...") self.env['sf.cutter.bar.model'].sync_all_cutter_bar_model() _logger.info("同步所有刀杆类型完成") - _logger.info("同步每日刀盘类型...") - self.env['sf.cutter.pad.model'].sync_cutter_pad_model() - _logger.info("同步每日刀盘类型完成") + # _logger.info("同步每日刀盘类型...") + # self.env['sf.cutter.pad.model'].sync_cutter_pad_model() + # _logger.info("同步每日刀盘类型完成") _logger.info("同步所有刀盘类型...") self.env['sf.cutter.pad.model'].sync_all_cutter_pad_model() _logger.info("同步所有刀盘类型完成") - _logger.info("同步每日刀柄类型...") - self.env['sf.handle.model'].sync_handle_model() - _logger.info("同步每日刀柄类型完成") + # _logger.info("同步每日刀柄类型...") + # self.env['sf.handle.model'].sync_handle_model() + # _logger.info("同步每日刀柄类型完成") _logger.info("同步所有刀柄类型...") self.env['sf.handle.model'].sync_all_handle_model() _logger.info("同步所有刀柄类型完成") - _logger.info("同步每日夹头类型...") - self.env['sf.chuck.model'].sync_chuck_model() - _logger.info("同步每日夹头类型完成") + # _logger.info("同步每日夹头类型...") + # self.env['sf.chuck.model'].sync_chuck_model() + # _logger.info("同步每日夹头类型完成") _logger.info("同步所有夹头类型...") self.env['sf.chuck.model'].sync_all_chuck_model() _logger.info("同步所有夹头类型完成") - _logger.info("同步每日整体式刀具类型...") - self.env['sf.integral.cutting.tool.model'].sync_integral_cutting_tool_model() - _logger.info("同步每日整体式刀具类型完成") + # _logger.info("同步每日整体式刀具类型...") + # self.env['sf.integral.cutting.tool.model'].sync_integral_cutting_tool_model() + # _logger.info("同步每日整体式刀具类型完成") _logger.info("同步所有整体式刀具类型...") self.env['sf.integral.cutting.tool.model'].sync_all_integral_cutting_tool_model() _logger.info("同步所有整体式刀具类型完成") - _logger.info("同步每日刀片列表...") - self.env['sf.blade'].sync_blade() - _logger.info("同步每日刀片完成") + # _logger.info("同步每日刀片列表...") + # self.env['sf.blade'].sync_blade() + # _logger.info("同步每日刀片完成") _logger.info("同步所有刀片列表...") self.env['sf.blade'].sync_all_blade() _logger.info("同步所有刀片完成") - _logger.info("同步每日刀杆列表...") - self.env['sf.cutter.bar'].sync_cutter_bar() - _logger.info("同步每日刀杆完成") + # _logger.info("同步每日刀杆列表...") + # self.env['sf.cutter.bar'].sync_cutter_bar() + # _logger.info("同步每日刀杆完成") _logger.info("同步所有刀杆列表...") self.env['sf.cutter.bar'].sync_all_cutter_bar() _logger.info("同步所有刀杆完成") - _logger.info("同步每日刀盘列表...") - self.env['sf.cutter.pad'].sync_cutter_pad() - _logger.info("同步每日刀盘完成") + # _logger.info("同步每日刀盘列表...") + # self.env['sf.cutter.pad'].sync_cutter_pad() + # _logger.info("同步每日刀盘完成") _logger.info("同步所有刀盘列表...") self.env['sf.cutter.pad'].sync_all_cutter_pad() _logger.info("同步所有刀盘完成") - _logger.info("同步每日刀柄列表...") - self.env['sf.handle'].sync_handle() - _logger.info("同步每日刀柄完成") + # _logger.info("同步每日刀柄列表...") + # self.env['sf.handle'].sync_handle() + # _logger.info("同步每日刀柄完成") _logger.info("同步所有刀柄列表...") self.env['sf.handle'].sync_all_handle() _logger.info("同步所有刀柄完成") - _logger.info("同步每日夹头列表...") - self.env['sf.chuck'].sync_chuck() - _logger.info("同步每日夹头完成") + # _logger.info("同步每日夹头列表...") + # self.env['sf.chuck'].sync_chuck() + # _logger.info("同步每日夹头完成") _logger.info("同步所有夹头列表...") self.env['sf.chuck'].sync_all_chuck() _logger.info("同步所有夹头完成") - _logger.info("同步每日整体式刀具列表...") - self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool() - _logger.info("同步每日整体式刀具完成") + # _logger.info("同步每日整体式刀具列表...") + # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool() + # _logger.info("同步每日整体式刀具完成") _logger.info("同步所有整体式刀具列表...") self.env['sf.integral.cutting.tool'].sync_all_integral_cutting_tool() _logger.info("同步所有整体式刀具完成") - _logger.info("同步每日同步功能刀具列表...") - self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool() - _logger.info("同步每日功能刀具列表完成") + # _logger.info("同步每日同步功能刀具列表...") + # self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool() + # _logger.info("同步每日功能刀具列表完成") _logger.info("同步所有功能刀具列表...") self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool() _logger.info("同步所有功能刀具列表完成") + # self.env['sf.fixture.clamping.element'].sync_all_fixture_clamping_element() + # _logger.info("同步资源库夹紧元件型号") + # self.env['sf.clamping.element.type'].sync_all_clamping_element_type() + # _logger.info("同步资源库夹紧元件类型") + # self.env['sf.guide.element.type'].sync_all_guide_element_type() + # _logger.info("同步资源库导向元件类型") + # self.env['sf.guide.element.guide.mode'].sync_all_guide_element_guide_mode() + # _logger.info("同步资源库导向元件导向方式") + except Exception as e: _logger.info("捕获错误信息:%s" % e) raise ValidationError("数据错误导致同步失败,请联系管理员") diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 601b9212..bd236f9c 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -726,7 +726,7 @@ class MachineToolType(models.Model): [('code', '=', item['machine_tool_id'])]).id else: - print(item['machine_tool_picture'].encode('utf-8')) + # print(item['machine_tool_picture'].encode('utf-8')) self.env['sf.machine_tool.type'].create({ "id": item['id'], "name": item['name'], @@ -883,168 +883,6 @@ class MachineToolType(models.Model): raise ValidationError("认证未通过") -class CuttingTool(models.Model): - _inherit = 'sf.cutting_tool.category' - _description = '刀具类别' - url = '/api/cutting_tool_category/list' - - # 定时同步刀具类别 - def sync_cutting_tool_category(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_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['cutting_tool_category_yesterday_list']: - brand = self.env['sf.cutting_tool.category'].search( - [("code", '=', item['code'])]) - if brand: - brand.id = item['id'], - brand.name = item['name'], - brand.code = item['code'], - brand.active = item['active'], - brand.remark = item['remark'] - else: - self.env['sf.cutting_tool.category'].create({ - "id": item['id'], - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "active": item['active'], - # "tag_ids": item['tag_ids'] - - }) - else: - raise ValidationError("认证未通过") - - # 同步所有刀具类别 - def sync_all_cutting_tool_category(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_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['cutting_tool_category_all_list']: - brand = self.env['sf.cutting_tool.category'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.cutting_tool.category'].create({ - "id": item['id'], - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "active": item['active'], - # "tag_ids": item['tag_ids'] - - }) - else: - raise ValidationError("认证未通过") - - -class CuttingToolType(models.Model): - _inherit = 'sf.cutting_tool.type' - _description = '刀具型号' - url = '/api/cutting_tool_type/list' - - # 定时同步刀具型号 - def sync_cutting_tool_type(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_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['cutting_tool_type_yesterday_list']: - brand = self.env['sf.cutting_tool.type'].search( - [("code", '=', item['code'])]) - if brand: - brand.id = item['id'], - brand.name = item['name'], - brand.code = item['code'], - brand.active = item['active'], - brand.remark = item['remark'], - brand.diameter = item['diameter'], - brand.cone_angle_pitch = item['cone_angle_pitch'], - brand.shank_diameter = item['shank_diameter'], - brand.long_blade = item['long_blade'], - brand.taper_shank_length = item['taper_shank_length'], - brand.tool_length = item['tool_length'], - brand.blade_number = item['blade_number'] - brand.brand_id = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id, - brand.category_id = self.env['sf.cutting_tool.category'].search( - [('code', '=', item['category_id'])]).id - else: - self.env['sf.cutting_tool.type'].create({ - "id": item['id'], - "name": item['name'], - "remark": item['remark'], - "code": item['code'], - "active": item['active'], - "diameter": item['diameter'], - "cone_angle_pitch": item['cone_angle_pitch'], - "shank_diameter": item['shank_diameter'], - "long_blade": item['long_blade'], - "taper_shank_length": item['taper_shank_length'], - "tool_length": item['tool_length'], - "blade_number": item['blade_number'], - 'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id, - "category_id": self.env['sf.cutting_tool.category'].search( - [('code', '=', item['category_id'])]).id, - }) - else: - raise ValidationError("认证未通过") - - # 同步所有刀具型号 - def sync_all_cutting_tool_type(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_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['cutting_tool_type_all_list']: - brand = self.env['sf.cutting_tool.type'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.cutting_tool.type'].create({ - "id": item['id'], - "name": item['name'], - "remark": item['remark'], - "code": item['code'], - "active": item['active'], - "diameter": item['diameter'], - "cone_angle_pitch": item['cone_angle_pitch'], - "shank_diameter": item['shank_diameter'], - "long_blade": item['long_blade'], - "taper_shank_length": item['taper_shank_length'], - "tool_length": item['tool_length'], - "blade_number": item['blade_number'], - 'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id, - "category_id": self.env['sf.cutting_tool.category'].search( - [('code', '=', item['category_id'])]).id, - }) - else: - raise ValidationError("认证未通过") - - class sfProcessingOrder(models.Model): _inherit = 'sf.processing.order' _description = '工序' @@ -1237,6 +1075,78 @@ class MachineToolCategory(models.Model): raise ValidationError("认证未通过") +# 同步刀具物料 +class sfSyncCutting_tool_Material(models.Model): + _inherit = 'sf.cutting.tool.material' + _description = '刀具物料同步' + + url = '/api/mrs_cutting_tool_material/list' + + # 定时同步每日刀具物料 + def sync_cutting_tool_material(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_config['sf_url'] + self.url + r = requests.post(strUrl, json={}, data=None, headers=headers) + r = r.json() + result = json.loads(r['result']) + # print('result:%s' % result) + if result['status'] == 1: + if result.get('mrs_cutting_tool_material_yesterday_list'): + for item in result['mrs_cutting_tool_material_yesterday_list']: + if item: + brand = self.env['sf.cutting.tool.material'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.cutting.tool.material'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + raise ValidationError("认证未通过") + + # 同步所有刀具物料 + def sync_all_cutting_tool_material(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_config['sf_url'] + self.url + r = requests.post(strUrl, json={}, data=None, headers=headers) + r = r.json() + result = json.loads(r['result']) + # print('result:%s' % result) + if result['status'] == 1: + if result.get('mrs_cutting_tool_material_all_list'): + for item in result['mrs_cutting_tool_material_all_list']: + if item: + brand = self.env['sf.cutting.tool.material'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.cutting.tool.material'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + + # 同步功能刀具列表 class sfSyncFunctional_cutting_tool(models.Model): _inherit = 'sf.functional.cutting.tool' @@ -1254,7 +1164,7 @@ class sfSyncFunctional_cutting_tool(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_functional_cutting_tool_yesterday_list'): for item in result['mrs_functional_cutting_tool_yesterday_list']: @@ -1462,7 +1372,7 @@ class SyncFunctionalCuttingToolModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_functional_cutting_tool_model_yesterday_list'): for item in result['mrs_functional_cutting_tool_model_yesterday_list']: @@ -1495,7 +1405,7 @@ class SyncFunctionalCuttingToolModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_functional_cutting_tool_model_all_list'): for item in result['mrs_functional_cutting_tool_model_all_list']: @@ -1536,7 +1446,7 @@ class SyncIntegralCuttingTool(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_integral_cutting_tool_yesterday_list'): for item in result['mrs_integral_cutting_tool_yesterday_list']: @@ -1561,6 +1471,8 @@ class SyncIntegralCuttingTool(models.Model): [("code", '=', item['integral_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "total_length": item['total_length'], "shank_length": item['shank_length'], "blade_length": item['blade_length'], @@ -1584,6 +1496,8 @@ class SyncIntegralCuttingTool(models.Model): [("code", '=', item['integral_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "total_length": item['total_length'], "shank_length": item['shank_length'], "blade_length": item['blade_length'], @@ -1613,7 +1527,7 @@ class SyncIntegralCuttingTool(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_integral_cutting_tool_all_list'): for item in result['mrs_integral_cutting_tool_all_list']: @@ -1638,6 +1552,8 @@ class SyncIntegralCuttingTool(models.Model): [("code", '=', item['integral_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "total_length": item['total_length'], "shank_length": item['shank_length'], "blade_length": item['blade_length'], @@ -1661,6 +1577,8 @@ class SyncIntegralCuttingTool(models.Model): [("code", '=', item['integral_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "total_length": item['total_length'], "shank_length": item['shank_length'], "blade_length": item['blade_length'], @@ -1698,7 +1616,7 @@ class SyncIntegralCuttingToolModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_integral_cutting_tool_model_list'): for item in result['mrs_integral_cutting_tool_model_list']: @@ -1710,6 +1628,16 @@ class SyncIntegralCuttingToolModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, + }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: raise ValidationError("认证未通过") @@ -1725,7 +1653,7 @@ class SyncIntegralCuttingToolModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_integral_cutting_tool_model_all_list'): for item in result['mrs_integral_cutting_tool_model_all_list']: @@ -1737,6 +1665,16 @@ class SyncIntegralCuttingToolModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, + }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: raise ValidationError("认证未通过") @@ -1759,10 +1697,20 @@ class SyncBlade(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_blade_yesterday_list'): for item in result['mrs_blade_yesterday_list']: + bar_list = [] + pad_list = [] + if item.get('cutter_bar'): + for i in item.get('cutter_bar'): + bar_list.append(self.env['sf.cutter.bar'].search( + [("code", '=', i)]).id) + if item.get('cutter_pad'): + for j in item.get('cutter_pad'): + pad_list.append(self.env['sf.cutter.pad'].search( + [("code", '=', j)]).id) if item: # code, name, blade_model_number, brand, length, width, height, top_angle, front_angle, rear_angle, main_included_angle, r_angle, material_model, hardness, nut, cutter_bar, cutter_pad, radius, image, create_uid, create_date brand = self.env['sf.blade'].search( @@ -1779,6 +1727,8 @@ class SyncBlade(models.Model): [("code", '=', item['blade_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "width": item['width'], "height": item['height'], @@ -1791,8 +1741,8 @@ class SyncBlade(models.Model): [("materials_no", '=', item['material_model'])]).id, "hardness": item['hardness'], "nut": item['nut'], - "cutter_bar": item['cutter_bar'], - "cutter_pad": item['cutter_pad'], + "cutter_bar": bar_list, + "cutter_pad": pad_list, "radius": item['radius'], "image": image, }) @@ -1803,6 +1753,8 @@ class SyncBlade(models.Model): [("code", '=', item['blade_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "width": item['width'], "height": item['height'], @@ -1815,8 +1767,8 @@ class SyncBlade(models.Model): [("materials_no", '=', item['material_model'])]).id, "hardness": item['hardness'], "nut": item['nut'], - "cutter_bar": item['cutter_bar'], - "cutter_pad": item['cutter_pad'], + "cutter_bar": bar_list, + "cutter_pad": pad_list, "radius": item['radius'], "image": image, }) @@ -1838,7 +1790,16 @@ class SyncBlade(models.Model): if result['status'] == 1: if result.get('mrs_blade_all_list'): for item in result['mrs_blade_all_list']: - # print('item_image:%s' % item['image'].encode('utf-8) + bar_list = [] + pad_list = [] + if item.get('cutter_bar'): + for i in item.get('cutter_bar'): + bar_list.append(self.env['sf.cutter.bar'].search( + [("code", '=', i)]).id) + if item.get('cutter_pad'): + for j in item.get('cutter_pad'): + pad_list.append(self.env['sf.cutter.pad'].search( + [("code", '=', j)]).id) if item: brand = self.env['sf.blade'].search( @@ -1855,6 +1816,8 @@ class SyncBlade(models.Model): [("code", '=', item['blade_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "width": item['width'], "height": item['height'], @@ -1867,8 +1830,8 @@ class SyncBlade(models.Model): [("materials_no", '=', item['material_model'])]).id, "hardness": item['hardness'], "nut": item['nut'], - "cutter_bar": item['cutter_bar'], - "cutter_pad": item['cutter_pad'], + "cutter_bar": bar_list, + "cutter_pad": pad_list, "radius": item['radius'], "image": image, }) @@ -1879,6 +1842,8 @@ class SyncBlade(models.Model): [("code", '=', item['blade_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "width": item['width'], "height": item['height'], @@ -1891,8 +1856,8 @@ class SyncBlade(models.Model): [("materials_no", '=', item['material_model'])]).id, "hardness": item['hardness'], "nut": item['nut'], - "cutter_bar": item['cutter_bar'], - "cutter_pad": item['cutter_pad'], + "cutter_bar": bar_list, + "cutter_pad": pad_list, "radius": item['radius'], "image": image, }) @@ -1918,7 +1883,7 @@ class SyncBladeModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_blade_model_yesterday_list'): for item in result['mrs_blade_model_yesterday_list']: @@ -1930,12 +1895,16 @@ class SyncBladeModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步每日刀片类型列表成功') else: @@ -1952,7 +1921,7 @@ class SyncBladeModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_blade_model_all_list'): for item in result['mrs_blade_model_all_list']: @@ -1964,12 +1933,16 @@ class SyncBladeModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步刀片类型列表成功') else: @@ -1994,7 +1967,7 @@ class SyncCutterBar(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_bar_yesterday_list'): for item in result['mrs_cutter_bar_yesterday_list']: @@ -2015,10 +1988,12 @@ class SyncCutterBar(models.Model): self.env['sf.cutter.bar'].create({ "code": item['code'], "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar'].search( + "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( [("code", '=', item['cutter_bar_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2038,10 +2013,12 @@ class SyncCutterBar(models.Model): brand.write({ "code": item['code'], "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar'].search( + "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( [("code", '=', item['cutter_bar_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2093,10 +2070,12 @@ class SyncCutterBar(models.Model): self.env['sf.cutter.bar'].create({ "code": item['code'], "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar'].search( + "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( [("code", '=', item['cutter_bar_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2116,10 +2095,12 @@ class SyncCutterBar(models.Model): brand.write({ "code": item['code'], "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar'].search( + "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( [("code", '=', item['cutter_bar_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2158,7 +2139,7 @@ class SyncCutterBarModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_bar_model_yesterday_list'): for item in result['mrs_cutter_bar_model_yesterday_list']: @@ -2170,18 +2151,22 @@ class SyncCutterBarModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步每日刀片类型列表成功') else: raise ValidationError("认证未通过") - # 定时同步所有刀杆类型列表 + # 同步所有刀杆类型列表 def sync_all_cutter_bar_model(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] @@ -2192,7 +2177,7 @@ class SyncCutterBarModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_bar_model_all_list'): for item in result['mrs_cutter_bar_model_all_list']: @@ -2204,12 +2189,16 @@ class SyncCutterBarModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步刀杆类型列表成功') else: @@ -2234,7 +2223,7 @@ class SyncCutterPad(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_pad_yesterday_list'): for item in result['mrs_cutter_pad_yesterday_list']: @@ -2259,6 +2248,8 @@ class SyncCutterPad(models.Model): [("code", '=', item['cutter_pad_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2283,6 +2274,8 @@ class SyncCutterPad(models.Model): [("code", '=', item['cutter_pad_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2314,7 +2307,7 @@ class SyncCutterPad(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_pad_all_list'): for item in result['mrs_cutter_pad_all_list']: @@ -2339,6 +2332,8 @@ class SyncCutterPad(models.Model): [("code", '=', item['cutter_pad_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2363,6 +2358,8 @@ class SyncCutterPad(models.Model): [("code", '=', item['cutter_pad_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "c_diameter": item['c_diameter'], "total_length": item['total_length'], "material_model": self.env['sf.materials.model'].search( @@ -2402,7 +2399,7 @@ class SyncCutterPadModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_pad_model_yesterday_list'): for item in result['mrs_cutter_pad_model_yesterday_list']: @@ -2414,12 +2411,16 @@ class SyncCutterPadModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步每日刀盘类型列表成功') else: @@ -2436,7 +2437,7 @@ class SyncCutterPadModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_cutter_pad_model_all_list'): for item in result['mrs_cutter_pad_model_all_list']: @@ -2448,12 +2449,16 @@ class SyncCutterPadModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步刀盘类型列表成功') else: @@ -2478,7 +2483,7 @@ class SyncHandle(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_handle_yesterday_list'): for item in result['mrs_handle_yesterday_list']: @@ -2503,6 +2508,8 @@ class SyncHandle(models.Model): [("code", '=', item['handle_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "length1": item['length1'], "diameter1": item['diameter1'], @@ -2527,6 +2534,8 @@ class SyncHandle(models.Model): [("code", '=', item['handle_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "length1": item['length1'], "diameter1": item['diameter1'], @@ -2558,7 +2567,7 @@ class SyncHandle(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_handle_all_list'): for item in result['mrs_handle_all_list']: @@ -2583,6 +2592,8 @@ class SyncHandle(models.Model): [("code", '=', item['handle_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "length1": item['length1'], "diameter1": item['diameter1'], @@ -2607,6 +2618,8 @@ class SyncHandle(models.Model): [("code", '=', item['handle_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "length": item['length'], "length1": item['length1'], "diameter1": item['diameter1'], @@ -2646,7 +2659,7 @@ class SyncHandleModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_handle_model_yesterday_list'): for item in result['mrs_handle_model_yesterday_list']: @@ -2658,12 +2671,16 @@ class SyncHandleModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步每日刀柄类型列表成功') else: @@ -2680,7 +2697,7 @@ class SyncHandleModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_handle_model_all_list'): for item in result['mrs_handle_model_all_list']: @@ -2692,12 +2709,16 @@ class SyncHandleModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步刀柄类型列表成功') else: @@ -2722,7 +2743,7 @@ class SyncChuck(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_chuck_yesterday_list'): for item in result['mrs_chuck_yesterday_list']: @@ -2747,6 +2768,8 @@ class SyncChuck(models.Model): [("code", '=', item['chuck_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "accuracy": item['accuracy'], "diameter": item['diameter'], "inner_diameter": item['inner_diameter'], @@ -2767,6 +2790,8 @@ class SyncChuck(models.Model): [("code", '=', item['chuck_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "accuracy": item['accuracy'], "diameter": item['diameter'], "inner_diameter": item['inner_diameter'], @@ -2794,7 +2819,7 @@ class SyncChuck(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_chuck_all_list'): for item in result['mrs_chuck_all_list']: @@ -2819,6 +2844,8 @@ class SyncChuck(models.Model): [("code", '=', item['chuck_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "accuracy": item['accuracy'], "diameter": item['diameter'], "inner_diameter": item['inner_diameter'], @@ -2839,6 +2866,8 @@ class SyncChuck(models.Model): [("code", '=', item['chuck_model_number'])]).id, "brand": self.env['sf.machine.brand'].search( [("code", '=', item['brand'])]).id, + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, "accuracy": item['accuracy'], "diameter": item['diameter'], "inner_diameter": item['inner_diameter'], @@ -2874,7 +2903,7 @@ class SyncChuckModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_chuck_model_yesterday_list'): for item in result['mrs_chuck_model_yesterday_list']: @@ -2886,12 +2915,16 @@ class SyncChuckModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步每日夹头类型列表成功') else: @@ -2908,7 +2941,7 @@ class SyncChuckModel(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) - print('result:%s' % result) + # print('result:%s' % result) if result['status'] == 1: if result.get('mrs_chuck_model_all_list'): for item in result['mrs_chuck_model_all_list']: @@ -2920,13 +2953,349 @@ class SyncChuckModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) else: brand.write({ "name": item['name'], "code": item['code'], "remark": item['remark'], + "cutting_tool_material": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['cutting_tool_material'])]).id, }) print('同步夹头类型列表成功') else: raise ValidationError("认证未通过") + + +'''=========================================夹紧元件类型===============================================''' + + +class sfClampingElementType(models.Model): + _inherit = 'sf.clamping.element.type' + _description = '夹紧元件类型' + url = '/api/mrs_clamping_element_type/list' + + # 定时同步每日夹紧元件类型 + def sync_clamping_element_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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['mrs_clamping_element_type_yesterday_list']: + if item: + brand = self.env['sf.clamping.element.type'].search( + [("code", '=', item['code'])]) + if brand: + brand.name = item['name'], + brand.code = item['code'], + brand.comment = item['comment'] + else: + self.env['sf.clamping.element.type'].create({ + "name": item['name'], + "code": item['code'], + "comment": item['comment'] + }) + else: + raise ValidationError("认证未通过") + + # 同步所有夹紧元件类型 + def sync_all_clamping_element_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_clamping_element_type_all_list']: + if item: + brand = self.env['sf.clamping.element.type'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.clamping.element.type'].create({ + "name": item['name'], + "code": item['code'], + "comment": item['comment'] + }) + else: + raise ValidationError("认证未通过") + + +'''=================================夹紧元件型号=============================================''' + + +class sfFixtureClampingElement(models.Model): + _inherit = 'sf.fixture.clamping.element' + _description = '夹紧元件型号' + url = '/api/mrs_fixture_clamping_element/list' + + # 定时同步夹紧元件型号 + def sync_fixture_clamping_element(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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['mrs_fixture_clamping_element_yesterday_list']: + brand = self.env['sf.fixture.clamping.element'].search( + [("code", '=', item['code'])]) + if brand: + brand.code = item['code'], + brand.name = item['name'], + + brand.length = item['length'], + brand.width = item['width'], + brand.height = item['height'], + brand.diameter = item['diameter'], + brand.hardness = item['hardness'], + brand.chucking_power = item['chucking_power'], + brand.surface_treatment = item['surface_treatment'], + brand.accuracy_grade = item['accuracy_grade'], + # brand.picture = item['picture'].encode('utf-8'), + brand.picture = base64.b64decode(item['picture']), + brand.comment = item['comment'], + + brand.brand_id = self.env['sf.machine.brand'].search( + [('code', '=', item['brand_id'])]).id, + brand.material_type_id = self.env['sf.materials.model'].search( + [('materials_no', '=', item['material_type_id'])]).id, + brand.clamping_ele_type_id = self.env['sf.clamping.element.type'].search( + [('code', '=', item['clamping_ele_type_id'])]).id + + else: + self.env['sf.fixture.clamping.element'].create({ + "code": item['code'], + "name": item['name'], + + "length": item['length'], + "width": item['width'], + "height": item['height'], + "diameter": item['diameter'], + "hardness": item['hardness'], + "chucking_power": item['chucking_power'], + "surface_treatment": item['surface_treatment'], + "accuracy_grade": item['accuracy_grade'], + + 'picture': base64.b64decode(item['picture']), + # "picture": item['picture'].encode('utf-8'), + "comment": item['comment'], + + 'brand_id': self.env['sf.machine.brand'].search( + [('code', '=', item['brand_id'])]).id, + "material_type_id": self.env['sf.materials.model'].search( + [('materials_no', '=', item['material_type_id'])]).id, + "clamping_ele_type_id": self.env['sf.clamping.element.type'].search( + [('code', '=', item['clamping_ele_type_id'])]).id, + }) + else: + raise ValidationError("认证未通过") + + # 同步所有夹紧元件型号 + def sync_all_fixture_clamping_element(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_config['sf_url'] + self.url + r = requests.post(strUrl, json={}, data=None, headers=headers) + r = r.json() + result = json.loads(r['result']) + print(result) + if result['status'] == 1: + for item in result['mrs_fixture_clamping_element_all_list']: + brand = self.env['sf.fixture.clamping.element'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.fixture.clamping.element'].create({ + "code": item['code'], + "name": item['name'], + + "length": item['length'], + "width": item['width'], + "height": item['height'], + "diameter": item['diameter'], + "hardness": item['hardness'], + "chucking_power": item['chucking_power'], + "surface_treatment": item['surface_treatment'], + "accuracy_grade": item['accuracy_grade'], + + # "picture": item['picture'].encode('utf-8'), + 'picture': base64.b64decode(item['picture']), + "comment": item['comment'], + + 'brand_id': self.env['sf.machine.brand'].search( + [('code', '=', item['brand_id'])]).id, + "material_type_id": self.env['sf.materials.model'].search( + [('materials_no', '=', item['material_type_id'])]).id, + "clamping_ele_type_id": self.env['sf.clamping.element.type'].search( + [('code', '=', item['clamping_ele_type_id'])]).id, + }) + + + else: + raise ValidationError("认证未通过") + + +'''===================================导向元件类型==========================================''' + + +class sfGuideElementType(models.Model): + _inherit = 'sf.guide.element.type' + _description = '导向元件类型' + url = '/api/mrs_guide_element_type/list' + + # 定时同步每日导向元件类型 + def sync_guide_element_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_guide_element_type_yesterday_list']: + if item: + brand = self.env['sf.guide.element.type'].search( + [("code", '=', item['code'])]) + if brand: + brand.name = item['name'], + brand.code = item['code'], + brand.comment = item['comment'] + else: + self.env['sf.guide.element.type'].create({ + "name": item['name'], + "code": item['code'], + "comment": item['comment'] + }) + else: + raise ValidationError("认证未通过") + + # 同步所有导向元件类型 + def sync_all_guide_element_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_guide_element_type_all_list']: + if item: + brand = self.env['sf.guide.element.type'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.guide.element.type'].create({ + "name": item['name'], + "code": item['code'], + "comment": item['comment'] + }) + # guide_element_type = self.env['sf.guide.element.type'].search([('code', '=', code)]) + # tags = self.env['sf.tag'].search([('name', '=', 'new_tag_name')]) + # guide_element_type.write({'tag_ids': [(6, 0, tags.ids)]}) + else: + raise ValidationError("认证未通过") + + +'''===================================导向元件导向方式==========================================''' + + +class sfGuideElementGuideMode(models.Model): + _inherit = 'sf.guide.element.guide.mode' + _description = '导向元件导向方式' + url = '/api/mrs_guide_element_guide_mode/list' + + # 定时同步每日导向元件导向方式 + def sync_guide_element_guide_mode(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_guide_element_guide_mode_yesterday_list']: + name_id_list = [] + if item.get('guide_ele_guide_mode_id'): + for i in item.get('guide_ele_guide_mode_id'): + name_id_list.append(self.env['sf.fixture.guide.element'].search( + [("code", '=', i)]).id) + if item: + brand = self.env['sf.guide.element.guide.mode'].search( + [("code", '=', item['code'])]) + if brand: + brand.name = item['name'], + brand.code = item['code'], + brand.comment = item['comment'] + brand.name_id = name_id_list + + else: + self.env['sf.guide.element.guide.mode'].create({ + "name": item['name'], + "code": item['code'], + "comment": item['comment'], + "name_id": name_id_list + }) + else: + raise ValidationError("认证未通过") + + # 同步所有导向元件导向方式 + def sync_all_guide_element_guide_mode(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_guide_element_guide_mode_all_list']: + name_id_list = [] + if item.get('guide_ele_guide_mode_id'): + for i in item.get('guide_ele_guide_mode_id'): + name_id_list.append(self.env['sf.fixture.guide.element'].search( + [("code", '=', i)]).id) + if item: + brand = self.env['sf.guide.element.guide.mode'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.guide.element.guide.mode'].create({ + "name": item['name'], + "code": item['code'], + "comment": item['comment'], + "name_id": name_id_list + }) + else: + raise ValidationError("认证未通过") From 23aba08c8710945ece3f00df1e7eeb2e579b9c01 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 16 Jun 2023 10:56:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 2 +- sf_base/models/base.py | 4 +- sf_base/static/src/scss/test.scss | 7 + sf_base/views/base_view.xml | 15 +- sf_manufacturing/models/product_template.py | 32 +-- sf_tool_management/__init__.py | 2 +- sf_tool_management/__manifest__.py | 1 + sf_tool_management/models/__init__.py | 2 - sf_tool_management/models/base.py | 81 ++++++- .../security/ir.model.access.csv | 2 +- sf_tool_management/views/menu_view.xml | 26 ++- sf_tool_management/views/tool_base_views.xml | 211 ++++++++++++------ 12 files changed, 286 insertions(+), 99 deletions(-) create mode 100644 sf_base/static/src/scss/test.scss diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index 2c05e1a2..65b76795 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -30,7 +30,7 @@ 'web.assets_qweb': [ ], 'web.assets_backend': [ - 'sf_base/static/src/scss/format_img.scss', + 'sf_base/static/src/scss/*.scss', ], }, diff --git a/sf_base/models/base.py b/sf_base/models/base.py index aeb0c0ac..57453d56 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -85,7 +85,7 @@ class MachineTool(models.Model): [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")], default='正常', string="机床状态") #0606新增字段 - machine_tool_picture = fields.Binary('机床图片') + machine_tool_picture = fields.Binary('图片') heightened_way = fields.Selection([ ('sifudianji', '伺服电机驱动'), ('youyagang', '油压缸驱动'), @@ -260,7 +260,7 @@ class MachineToolType(models.Model): rotate_speed = fields.Integer('转速') #0606新增字段 created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user) - machine_tool_picture = fields.Binary('机床图片') + machine_tool_picture = fields.Binary('图片') heightened_way = fields.Selection([ ('sifudianji', '伺服电机驱动'), ('youyagang', '油压缸驱动'), diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss new file mode 100644 index 00000000..32aba96d --- /dev/null +++ b/sf_base/static/src/scss/test.scss @@ -0,0 +1,7 @@ +.test_model { + display: flex !important; +} +.test_model>.o_form_label { + margin-left: 20px; + margin-right: 0px !important; +} \ No newline at end of file diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 75d481c8..1b51900c 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -96,23 +96,25 @@ - + form.sf.machine_tool.type sf.machine_tool.type
- + - - - + + + + + @@ -177,6 +179,7 @@ + 机床型号 ir.actions.act_window @@ -249,7 +252,7 @@ tree,form

- [机床型号] 还没有哦！点左上角的[创建]按钮，沙发归你了! + [机床类型] 还没有哦！点左上角的[创建]按钮，沙发归你了!

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 5653ac7b..d15741e9 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -1,8 +1,8 @@ from odoo import models, fields, api from odoo.exceptions import ValidationError from odoo.modules import get_resource_path -from OCC.Extend.DataExchange import read_step_file -from OCC.Extend.DataExchange import write_stl_file +# from OCC.Extend.DataExchange import read_step_file +# from OCC.Extend.DataExchange import write_stl_file import logging import base64 import hashlib @@ -468,20 +468,20 @@ class ResProductTemplate(models.Model): item.model_file = self.transition_glb_file(report_path, model_code) # 将attach的datas内容转为glb文件 - def transition_glb_file(self, report_path, code): - shapes = read_step_file(report_path) - output_file = os.path.join('/tmp', str(code) + '.stl') - write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) - # 转化为glb - output_glb_file = os.path.join('/tmp', str(code) + '.glb') - util_path = get_resource_path('sf_dlm', 'static/util') - cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file) - os.system(cmd) - # 转base64 - with open(output_glb_file, 'rb') as fileObj: - image_data = fileObj.read() - base64_data = base64.b64encode(image_data) - return base64_data + # def transition_glb_file(self, report_path, code): + # shapes = read_step_file(report_path) + # output_file = os.path.join('/tmp', str(code) + '.stl') + # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + # # 转化为glb + # output_glb_file = os.path.join('/tmp', str(code) + '.glb') + # util_path = get_resource_path('sf_dlm', 'static/util') + # cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file) + # os.system(cmd) + # # 转base64 + # with open(output_glb_file, 'rb') as fileObj: + # image_data = fileObj.read() + # base64_data = base64.b64encode(image_data) + # return base64_data @api.onchange('integral_cutting_tool_type_id') def _get_integral_cutting_tool_type_info(self): diff --git a/sf_tool_management/__init__.py b/sf_tool_management/__init__.py index 041ffad6..c081ee06 100644 --- a/sf_tool_management/__init__.py +++ b/sf_tool_management/__init__.py @@ -1,2 +1,2 @@ # -*-coding:utf-8-*- -from . import models \ No newline at end of file +from . import models diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index da1ea72c..8368f528 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -16,6 +16,7 @@ 'security/ir.model.access.csv', 'views/tool_base_views.xml', 'views/menu_view.xml', + ], 'demo': [ ], diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py index 61a05d94..c1c7e803 100644 --- a/sf_tool_management/models/__init__.py +++ b/sf_tool_management/models/__init__.py @@ -1,4 +1,2 @@ from . import base - - diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index e83e9277..ae13cb56 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,12 +1,15 @@ # -*- coding: utf-8 -*- from odoo import fields, models, api -# 功能刀具预警 + class FunctionalCuttingToolEntity(models.Model): _name = 'sf.functional.cutting.tool.entity' _inherit = 'sf.functional.cutting.tool' - _description = '功能刀具预警' + _description = '功能刀具管理' + order = fields.Char(string='序') + functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具', invisible=True) + # 功能刀具预警 特有字段 install_tool_time = fields.Char("装刀时间") outbound_time = fields.Char('出库时间') on_board_time = fields.Char('上机时间') @@ -20,5 +23,77 @@ class FunctionalCuttingToolEntity(models.Model): dispose_user = fields.Char('处理人') dispose_time = fields.Char('处理时间') dispose_func = fields.Char('处理方法/措施') - remake = fields.Char('备注') + remark = fields.Char('备注') + # 功能刀具出入库记录 特有字段 + thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '细')], string='粗/中/细') + max_life_span = fields.Char(string='最大寿命值') + # alarm_value = fields.Char(string='报警值') + # used_value = fields.Char(string='已使用值') + current_state = fields.Char(string='当前状态') + current_store_area = fields.Char(string='当前库区') + current_store_place = fields.Char(string='当前库位') + number = fields.Integer(string='数量') + reason_application = fields.Char(string='申请原因') + applicant = fields.Char(string='申请人') + return_staff = fields.Char(string='归还人') + return_time = fields.Date(string='归还入库时间') + tool_state = fields.Char(string="刀具状态") + tool_install_staff = fields.Char(string='装刀人') + tool_install_time = fields.Datetime(string='装刀时间') + receive_equipment = fields.Char(string='领用机台') + receive_staff = fields.Char(string='领用人') + receive_time = fields.Char(string='领用出库时间') + # remark = fields.Text(string='备注/说明') + + # 功能刀具实时分布 + tool_stock_num = fields.Text(string='刀具房库存数量') + side_shelf_num = fields.Text(string='线边货架货架数量') + on_tool_stock_num = fields.Text(string='机内刀库库存数量') + tool_stock_total = fields.Text(string='合计') + return_reuse_num_re = fields.Text(string='归还再用数量(精)') + return_reuse_num_co = fields.Text(string='归还再用数量(粗)') + return_processing_num = fields.Text(string='归还需磨削数量') + return_total = fields.Text(string='合计') + total = fields.Text(string='总计') + # remark = fields.Text(string='备注/说明') + + # @api.onchange('functional_cutting_tool_id') + # def get_functional_cutting_tool_info(self): + # for item in self: + # item.code = item.functional_cutting_tool_id.code, + # item.name = item.functional_cutting_tool_id.name, + # item.functional_model_number = item.functional_cutting_tool_id.functional_model_number, + # item.integral_model_number = item.functional_cutting_tool_id.integral_model_number, + # item.blade_model_number = item.functional_cutting_tool_id.blade_model_number, + # item.cutterbar_model_number = item.functional_cutting_tool_id.cutterbar_model_number, + # item.cutterpad_model_number = item.functional_cutting_tool_id.cutterpad_model_number, + # item.handle_model_number = item.functional_cutting_tool_id.handle_model_number, + # item.chuck_model_number = item.functional_cutting_tool_id.chuck_model_number, + # item.diameter = item.functional_cutting_tool_id.diameter, + # item.tool_grade = item.functional_cutting_tool_id.tool_grade, + # item.machining_accuracy = item.functional_cutting_tool_id.machining_accuracy, + # item.ctool_lengthode = item.functional_cutting_tool_id.tool_length, + # item.blade_number = item.functional_cutting_tool_id.blade_number, + # item.integral_blade_length = item.functional_cutting_tool_id.integral_blade_length, + # item.effective_blade_length = item.functional_cutting_tool_id.effective_blade_length, + # item.max_life = item.functional_cutting_tool_id.max_life, + # item.is_standard = item.functional_cutting_tool_id.is_standard, + # item.applicable_range = item.functional_cutting_tool_id.applicable_range, + + @api.model + def create(self, vals): + + if not vals.get('order'): + vals['order'] = self._generate_code() + return super(FunctionalCuttingToolEntity, self).create(vals) + + @api.model + def _generate_code(self): + last_tool = self.search([], order='id desc', limit=1) + if last_tool: + last_code = int(last_tool.code.split('-')[-1]) + new_code = '{:03d}'.format(last_code + 1) + else: + new_code = '001' + return new_code diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv index d1ff33f5..3156f716 100644 --- a/sf_tool_management/security/ir.model.access.csv +++ b/sf_tool_management/security/ir.model.access.csv @@ -1,5 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_sf_functional_cutting_tool_warning,sf.functional.cutting.tool.warning,model_sf_functional_cutting_tool_warning,base.group_user,1,1,1,1 +access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,1 diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml index 67ccc2aa..5791bf90 100644 --- a/sf_tool_management/views/menu_view.xml +++ b/sf_tool_management/views/menu_view.xml @@ -6,10 +6,11 @@ 功能刀具预警 ir.actions.act_window sf.functional.cutting.tool.entity - tree,form + tree + @@ -28,8 +29,25 @@ id="menu_sf_functional_cutting_tool_warning" parent="menu_sf_tool_manage" name="功能刀具预警" - sequence="3" - action="action_sf_functional_cutting_tool_warning" + sequence="4" + action="sf_function_tool_entry_warning_view_act" /> + + + + + \ No newline at end of file diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index f473dcc5..8e44b693 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -1,6 +1,45 @@ + + + sf.functional.cutting.tool.entity.list.tree + sf.functional.cutting.tool.entity + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 功能刀具列表 + ir.actions.act_window + sf.functional.cutting.tool.entity + tree + + + sf.functional.cutting.tool.entity.tree @@ -30,79 +69,125 @@ - + - - - sf.functional.cutting.tool.entity.form + + + 功能刀具预警 + ir.actions.act_window + sf.functional.cutting.tool.entity + tree + + + + + + 功能刀具出入库记录 sf.functional.cutting.tool.entity - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 功能刀具出入库记录 + ir.actions.act_window + sf.functional.cutting.tool.entity + tree + + + + + 功能刀具实时分布 + sf.functional.cutting.tool.entity + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 功能刀具实时分布 + ir.actions.act_window + sf.functional.cutting.tool.entity + tree + + + From 6dc2935741439b737c6c824d44f673caabae1432 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 16 Jun 2023 17:10:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=8B=A5=E9=80=89=E6=8B=A9=E7=9A=84=E4=BA=A7=E5=93=81=E6=98=AF?= =?UTF-8?q?=E5=88=80=E5=85=B7=EF=BC=8C=E5=88=99=E4=BC=98=E5=8C=96=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 2 +- sf_manufacturing/models/stock.py | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index d15741e9..15a72f6b 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -56,7 +56,7 @@ class ResProductTemplate(models.Model): ('刀杆', '刀杆'), ('刀盘', '刀盘'), ('刀柄', '刀柄'), - ('夹头', '夹头')], string='刀具') + ('夹头', '夹头')], string='刀具物料') # 关联整体式刀具型号 integral_cutting_tool_type_id = fields.Many2one('sf.integral.cutting.tool', '整体式刀具型号') # 关联刀片型号 diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 6fdfbd8d..9def6eb3 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -2,6 +2,7 @@ from collections import defaultdict, namedtuple from odoo.addons.stock.models.stock_rule import ProcurementException from re import findall as regex_findall +from datetime import datetime from re import split as regex_split from odoo import SUPERUSER_ID, _, api, fields, models from odoo.tools import float_compare @@ -228,6 +229,20 @@ class ProductionLot(models.Model): if last_serial: return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name, 2)[ 1] + now = datetime.now().strftime("%Y-%m-%d") + # formatted_date = now.strftime("%Y-%m-%d") + if product.integral_cutting_tool_type_id: + return "%s-%s-%03d" % (product.integral_cutting_tool_type_id.code, now, 1) + if product.blade_type_id: + return "%s-%s-%03d" % (product.blade_type_id.code, now, 1) + if product.cutter_bar_type_id: + return "%s-%s-%03d" % (product.cutter_bar_type_id.code, now, 1) + if product.cutter_pad_type_id: + return "%s-%s-%03d" % (product.cutter_pad_type_id.code, now, 1) + if product.handle_type_id: + return "%s-%s-%03d" % (product.handle_type_id.code, now, 1) + if product.chuck_type_id: + return "%s-%s-%03d" % (product.chuck_type_id.code, now, 1) return "%s-%03d" % (product.name, 1) @@ -261,7 +276,8 @@ class StockPicking(models.Model): lambda p: p.state == 'pending' and p.is_subcontract is True) if workorder_subcontract: raise UserError( - _('该出库单里源单据内的单号为%s的工单还未开始，不能进行验证操作！' % workorder_subcontract[0].name)) + _('该出库单里源单据内的单号为%s的工单还未开始，不能进行验证操作！' % workorder_subcontract[ + 0].name)) # 入库单验证 if self.workorder_in_id: workorder_out = self.workorder_in_id.filtered(lambda p: p.state == 'progress' and p.is_subcontract is True) From 65c8d4a4e9d83bd50df6cbe71d12a767a31dbf4c Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Sun, 25 Jun 2023 16:44:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?sf=E5=88=80=E5=85=B7=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 6 +- sf_base/models/__init__.py | 3 +- sf_base/models/tool_base.py | 7 +- sf_base/models/tool_base_new.py | 267 ++ sf_base/security/ir.model.access.csv | 20 +- sf_base/views/tool_base_views.xml | 4 +- sf_base/views/tool_menu.xml | 89 + sf_base/views/tool_views.xml | 376 ++ sf_manufacturing/models/product_template.py | 4 +- sf_mrs_connect/data/ir_cron_data.xml | 240 +- sf_mrs_connect/models/res_config_setting.py | 106 +- sf_mrs_connect/models/sync_common.py | 3817 +++++++++++-------- 12 files changed, 3091 insertions(+), 1848 deletions(-) create mode 100644 sf_base/models/tool_base_new.py create mode 100644 sf_base/views/tool_menu.xml create mode 100644 sf_base/views/tool_views.xml diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index 2c05e1a2..f2ec7b94 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -17,8 +17,10 @@ 'views/base_view.xml', 'views/common_view.xml', "views/menu_view.xml", - "views/tool_base_views.xml", - "views/tool_base_menu.xml", + "views/tool_views.xml", + "views/tool_menu.xml", + # "views/tool_base_views.xml", + # "views/tool_base_menu.xml", 'views/fixture_base_view.xml', 'views/menu_fixture_view.xml', diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index 5b9136ae..e9b767fd 100644 --- a/sf_base/models/__init__.py +++ b/sf_base/models/__init__.py @@ -1,6 +1,7 @@ from . import base from . import common -from . import tool_base +# from . import tool_base +from . import tool_base_new from . import fixture_base diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py index 33426cd4..9254e4cc 100644 --- a/sf_base/models/tool_base.py +++ b/sf_base/models/tool_base.py @@ -2,9 +2,9 @@ import logging from odoo import fields, models, api -from odoo.exceptions import UserError -# from odoo.addons import sf_base, sf_common -from datetime import datetime +# from odoo.exceptions import UserError +# # from odoo.addons import sf_base, sf_common +# from datetime import datetime # 功能刀具物料 @@ -24,7 +24,6 @@ class FunctionalCuttingTool(models.Model): code = fields.Char('编码') name = fields.Char('名称') - # 增加功能刀具类型、整体式刀具型号、刀片型号、刀杆型号、刀盘型号、刀柄型号、夹头型号、直径(mm)、刀具等级、加工精度(mm)、装刀长、刃数、整体刃长(mm)、有效刃长(mm)、最大寿命值、是否标准刀、适用范围 functional_model_number = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型') integral_model_number = fields.Many2one('sf.integral.cutting.tool', string='整体式刀具型号') blade_model_number = fields.Many2one('sf.blade', string='刀片型号') diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py new file mode 100644 index 00000000..65d2e4cb --- /dev/null +++ b/sf_base/models/tool_base_new.py @@ -0,0 +1,267 @@ +# -*- coding: utf-8 -*- +from odoo import fields, models, api +# from datetime import datetime +# from odoo.exceptions import ValidationError + + +# 刀具物料 +class CuttingToolMaterial(models.Model): + _name = 'sf.cutting.tool.material' + _description = '刀具物料' + + code = fields.Char('编码') + name = fields.Char('名称') + remark = fields.Char('备注') + + +# 功能刀具 +class FunctionalCuttingTool(models.Model): + _name = 'sf.functional.cutting.tool' + _description = '功能刀具' + + code = fields.Char('编码') + name = fields.Char('名称') + mrs_cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='功能刀具类型') + mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号') + diameter = fields.Float('直径(mm)') + tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], + string='刀具等级') + machining_accuracy = fields.Float('加工精度(mm)') + tool_length = fields.Float('装刀长') + blade_number = fields.Integer('刃数') + integral_blade_length = fields.Float('整体刃长(mm)') + effective_blade_length = fields.Float('有效刃长(mm)') + max_life = fields.Float('最大寿命值') + is_standard = fields.Boolean('是否标准刀') + applicable_range = fields.Char('适用范围') + image = fields.Binary('图片') + + +# 功能刀具类型 +class FunctionalCuttingToolModel(models.Model): + _name = 'sf.functional.cutting.tool.model' + _description = '功能刀具类型' + + name = fields.Char('名称', required=True) + code = fields.Char('编码', required=True) + remark = fields.Char('备注') + + +# 刀具型号 +class CuttingToolModel(models.Model): + _name = 'sf.cutting.tool.model' + _description = '刀具型号' + + name = fields.Char('名称') + code = fields.Char('编码') + mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌') + mrs_materials_model_id = fields.Many2one('sf.materials.model', '材料型号') + # 关联刀具物料 + mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True) + # 关联刀具物料名称 + mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称', + store=True) + # 关联刀具类型 + mrs_cutting_tool_type_id = fields.Many2one( + 'sf.cutting.tool.type', '刀具类型', + domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]", required=True) + + # 整体式刀具特有字段 + integral_code = fields.Char('整体式刀具编码') + integral_total_length = fields.Float('总长度(mm)') + integral_shank_length = fields.Float('柄部长度(mm)') + integral_blade_length = fields.Float('刃部长度(mm)') + integral_diameter = fields.Float('直径(mm)') + integral_blade_number = fields.Integer('刃数') + integral_front_angle = fields.Float('前角(°)') + integral_rear_angle = fields.Float('后角(°)') + integral_main_included_angle = fields.Float('主偏角(°)') + integral_nut = fields.Float('配对螺母(mm)') + integral_scope = fields.Char('适用范围') + + # 刀片特有字段 + blade_code = fields.Char('刀片编码') + blade_length = fields.Float('长度L(mm)') + blade_width = fields.Float('宽度D(mm)') + blade_height = fields.Float('高度T(mm)') + blade_top_angle = fields.Float('顶角(°)') + blade_front_angle = fields.Float('前角(°)') + blade_rear_angle = fields.Float('后角(°)') + blade_main_included_angle = fields.Float('主偏角(°)') + blade_r_angle = fields.Float('R角(°)') + blade_hardness = fields.Char('加工硬度') + blade_radius = fields.Float('刀尖半径(mm)') + blade_nut = fields.Float('配对螺母(mm)') + mrs_cutting_tool_model_blade_cutter_bar_ids = fields.Many2many( + 'sf.cutting.tool.model', + relation='sf_cutting_tool_model_blade_cutter_bar_rel', + column1='model_id_1', + column2='model_id_2', + domain="[('mrs_cutting_tool_material_id.name', '=', '刀杆')]", + string='适用刀杆型号', + default=lambda self: [], # 使用空列表作为默认值 + ) + mrs_cutting_tool_model_blade_cutter_pad_ids = fields.Many2many( + 'sf.cutting.tool.model', + relation='sf_cutting_tool_model_blade_cutter_pad_rel', + column1='model_id_1', + column2='model_id_2', + domain="[('mrs_cutting_tool_material_id.name', '=', '刀盘')]", + string='适用刀盘型号', + default=lambda self: [], # 使用空列表作为默认值 + ) + + # 刀杆特有字段 + bar_code = fields.Char('刀杆编码', readonly=True) + bar_c_diameter = fields.Float('C柄径(mm)') + bar_total_length = fields.Float('L总长(mm)') + bar_blade_number = fields.Integer('刃数') + bar_d_diameter = fields.Float('D刃径(mm)') + mrs_cutting_tool_model_bar_blade_ids = fields.Many2many( + 'sf.cutting.tool.model', + relation='sf_cutting_tool_model_bar_blade_rel', + column1='model_id_1', + column2='model_id_2', + domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]", + string='适用刀片型号', + default=lambda self: [], # 使用空列表作为默认值 + ) + bar_wrench = fields.Float('配对扳手(mm)') + bar_screw = fields.Float('配备螺丝(mm)') + bar_radius = fields.Float('刀尖圆角半径') + bar_accuracy = fields.Char('精度等级') + bar_hardness = fields.Char('硬度(°)') + bar_scope = fields.Char('适用范围') + + # 刀盘特有字段 + pad_code = fields.Char('刀盘编码', readonly=True) + pad_c_diameter = fields.Float('C柄径(mm)') + pad_total_length = fields.Float('L总长(mm)') + pad_blade_number = fields.Integer('刃数') + pad_d_diameter = fields.Float('D刃径(mm)') + mrs_cutting_tool_model_pad_blade_ids = fields.Many2many( + 'sf.cutting.tool.model', + relation='sf_cutting_tool_model_pad_blade_rel', + column1='model_id_1', + column2='model_id_2', + domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]", + string='适用刀片型号', + default=lambda self: [], # 使用空列表作为默认值 + ) + pad_wrench = fields.Float('配对扳手(mm)') + pad_screw = fields.Float('配备螺丝(mm)') + pad_radius = fields.Float('刀尖圆角半径') + pad_accuracy = fields.Char('精度等级') + pad_hardness = fields.Char('硬度(°)') + pad_scope = fields.Char('适用范围') + + # 刀柄特有字段 + handle_code = fields.Char('刀柄编码', readonly=True) + handle_length = fields.Float('L(mm)') + handle_length1 = fields.Float('L1(mm)') + handle_diameter1 = fields.Float('D1(mm)') + handle_weight = fields.Float('重量(kg)') + handle_body_accuracy = fields.Float('本体精度(mm)') + handle_nut = fields.Float('配对螺母(mm)') + mrs_cutting_tool_model_handle_chuck_model_ids = fields.Many2many( + 'sf.cutting.tool.model', + relation='sf_cutting_tool_model_handle_chuck_rel', + column1='model_id_1', + column2='model_id_2', + domain="[('mrs_cutting_tool_material_id.name', '=', '夹头')]", + string='适用夹头型号', + + ) + handle_clamping_range = fields.Float('夹持范围(mm)') + handle_detection_accuracy = fields.Float('检测精度') + handle_detection_hardness = fields.Char('检测硬度') + handle_standard_speed = fields.Float('标准转速') + + # 夹头特有字段 + chuck_code = fields.Char('夹头编码', readonly=True) + chuck_accuracy = fields.Float('精度(mm)') + chuck_diameter = fields.Float('外径(mm)') + chuck_inner_diameter = fields.Float('内径(mm)') + chuck_height = fields.Float('高度(mm)') + chuck_nut = fields.Float('配对螺母(mm)') + mrs_cutting_tool_model_chuck_handle_model_ids = fields.Many2many( + 'sf.cutting.tool.model', + relation='sf_cutting_tool_model_chuck_handle_rel', + column1='model_id_1', + column2='model_id_2', + domain="[('mrs_cutting_tool_material_id.name', '=', '刀柄')]", + string='适用刀柄型号', + default=lambda self: [], # 使用空列表作为默认值 + ) + chuck_clamping_range = fields.Float('夹持范围(mm)') + chuck_feature = fields.Char('特性') + + image = fields.Binary('图片') + + hide_integral = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏整体式刀具') + hide_blade = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀片') + hide_cutter_bar = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀杆') + hide_cutter_pad = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀盘') + hide_handler = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀柄') + hide_chuck = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏夹头') + hide_model = fields.Boolean(compute='_compute_hide_model_number', default=True, string='隐藏型号') + + @api.depends('mrs_cutting_tool_material_id') + def _compute_hide_model_number(self): + """ + 根据刀具物料类型，显示不同的字段 + """ + for record in self: + record.hide_integral = False + record.hide_blade = False + record.hide_cutter_bar = False + record.hide_cutter_pad = False + record.hide_handler = False + record.hide_chuck = False + record.hide_model = True + + if record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '整体式刀具': + record.hide_model = False + record.hide_integral = True + elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀片': + record.hide_model = False + record.hide_blade = True + elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀杆': + record.hide_model = False + record.hide_cutter_bar = True + elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀盘': + record.hide_model = False + record.hide_cutter_pad = True + elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀柄': + record.hide_model = False + record.hide_handler = True + elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '夹头': + record.hide_model = False + record.hide_chuck = True + else: + record.hide_model = True + + +# 刀具类型 +class CuttingToolType(models.Model): + _name = 'sf.cutting.tool.type' + _description = '刀具类型' + + code = fields.Char('编码') + name = fields.Char('名称') + # 关联刀具物料 + mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料') + # 整体式刀具类型特有字段 + integral_tool_type_code = fields.Char('整体式刀具类型编码') + # 刀片类型特有字段 + blade_type_code = fields.Char('刀片类型编码') + # 刀杆类型特有字段 + bar_type_code = fields.Char('刀杆类型编码') + # 刀盘类型特有字段 + pad_type_code = fields.Char('刀盘类型编码') + # 刀柄类型特有字段 + handle_type_code = fields.Char('刀柄类型编码') + # 夹头类型特有字段 + chuck_type_code = fields.Char('夹头类型编码') + + remark = fields.Char('备注') diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index ad1e2ff2..b68a00ca 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -15,21 +15,11 @@ access_sf_production_process_parameter,sf_production_process_parameter,model_sf_ access_sf_production_process_category,sf_production_process_category,model_sf_production_process_category,base.group_user,1,1,1,1 access_sf_machine_tool_category,sf_machine_tool_category,model_sf_machine_tool_category,base.group_user,1,1,1,1 -access_sf_functional_cutting_tool,sf.functional.cutting.tool,model_sf_functional_cutting_tool,base.group_user,1,1,1,1 -access_sf_functional_cutting_tool_model,sf.functional.cutting.tool.model,model_sf_functional_cutting_tool_model,base.group_user,1,1,1,1 -access_sf_integral_cutting_tool,sf.integral.cutting.tool,model_sf_integral_cutting_tool,base.group_user,1,1,1,1 -access_sf_integral_cutting_tool_model,sf.integral.cutting.tool.model,model_sf_integral_cutting_tool_model,base.group_user,1,1,1,1 -access_sf_blade,sf.blade,model_sf_blade,base.group_user,1,1,1,1 -access_sf_blade_model,sf.blade.model,model_sf_blade_model,base.group_user,1,1,1,1 -access_sf_cutter_bar,sf.cutter.bar,model_sf_cutter_bar,base.group_user,1,1,1,1 -access_sf_cutter_bar_model,sf.cutter.bar.model,model_sf_cutter_bar_model,base.group_user,1,1,1,1 -access_sf_cutter_pad,sf.cutter.pad,model_sf_cutter_pad,base.group_user,1,1,1,1 -access_sf_cutter_pad_model,sf.cutter.pad.model,model_sf_cutter_pad_model,base.group_user,1,1,1,1 -access_sf_handle,sf.handle,model_sf_handle,base.group_user,1,1,1,1 -access_sf_handle_model,sf.handle.model,model_sf_handle_model,base.group_user,1,1,1,1 -access_sf_chuck,sf.chuck,model_sf_chuck,base.group_user,1,1,1,1 -access_sf_chuck_model,sf.chuck.model,model_sf_chuck_model,base.group_user,1,1,1,1 -access_sf_cutting_tool_material,sf.cutting.tool.material,model_sf_cutting_tool_material,base.group_user,1,1,1,1 +access_sf_cutting_tool_material,sf_cutting_tool_material,model_sf_cutting_tool_material,base.group_user,1,1,1,1 +access_sf_cutting_tool_type,sf_cutting_tool_type,model_sf_cutting_tool_type,base.group_user,1,1,1,1 +access_sf_cutting_tool_model,sf_cutting_tool_model,model_sf_cutting_tool_model,base.group_user,1,1,1,1 +access_sf_functional_cutting_tool,sf_functional_cutting_tool,model_sf_functional_cutting_tool,base.group_user,1,1,1,1 +access_sf_functional_cutting_tool_model,sf_functional_cutting_tool_model,model_sf_functional_cutting_tool_model,base.group_user,1,1,1,1 access_sf_fixture_setting_element,sf_fixture_setting_element,model_sf_fixture_setting_element,base.group_user,1,1,1,1 access_sf_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,base.group_user,1,1,1,1 diff --git a/sf_base/views/tool_base_views.xml b/sf_base/views/tool_base_views.xml index 2d4a88fb..0306b23e 100644 --- a/sf_base/views/tool_base_views.xml +++ b/sf_base/views/tool_base_views.xml @@ -35,7 +35,9 @@
- + + + sf.cutting.tool.material.search sf.cutting.tool.material diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml new file mode 100644 index 00000000..ef11c145 --- /dev/null +++ b/sf_base/views/tool_menu.xml @@ -0,0 +1,89 @@ + + + + + + + 刀具物料 + ir.actions.act_window + sf.cutting.tool.material + tree,form + + + + 刀具类型 + ir.actions.act_window + sf.cutting.tool.type + tree,form + + + + 刀具型号 + ir.actions.act_window + sf.cutting.tool.model + tree,form + + + + 功能刀具 + ir.actions.act_window + sf.functional.cutting.tool + tree,form + + + + 功能刀具类型 + ir.actions.act_window + sf.functional.cutting.tool.model + tree,form + + + + + + + + + + + + + + + + diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml new file mode 100644 index 00000000..6909519a --- /dev/null +++ b/sf_base/views/tool_views.xml @@ -0,0 +1,376 @@ + + + + + + sf.cutting.tool.material.tree + sf.cutting.tool.material + + + + + + + + + + + sf.cutting.tool.material.form + sf.cutting.tool.material + +
+ + + + + + + + + + + + + + +
+ + + + + sf.cutting.tool.material.search + sf.cutting.tool.material + + + + + + + + + + + + sf.functional.cutting.tool.tree + sf.functional.cutting.tool + + + + + + + + + + + + sf.functional.cutting.tool.form + sf.functional.cutting.tool + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + sf.functional.cutting.tool.search + sf.functional.cutting.tool + + + + + + + + + + + + sf.cutter.function.tree + sf.functional.cutting.tool.model + + + + + + + + + + sf.cutter.function.form + sf.functional.cutting.tool.model + +
+ + + + + + + + + + + +
+ + + + + + sf.cutter.function.search + sf.functional.cutting.tool.model + + + + + + + + + + + sf.cutting.tool.model.tree + sf.cutting.tool.model + + + + + + + + + + + + sf.cutting.tool.model.form + sf.cutting.tool.model + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + sf.cutting.tool.model.search + sf.cutting.tool.model + + + + + + + + + + + + + sf.cutting.tool.type.tree + sf.cutting.tool.type + + + + + + + + + + + + sf.cutting.tool.type.form + sf.cutting.tool.type + +
+ + + + + + + + + + + + +
+ + + + + + sf.cutting.tool.type.search + sf.cutting.tool.type + + + + + + + + + + + diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 5653ac7b..5aaecf1d 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -1,8 +1,8 @@ from odoo import models, fields, api from odoo.exceptions import ValidationError from odoo.modules import get_resource_path -from OCC.Extend.DataExchange import read_step_file -from OCC.Extend.DataExchange import write_stl_file +# from OCC.Extend.DataExchange import read_step_file +# from OCC.Extend.DataExchange import write_stl_file import logging import base64 import hashlib diff --git a/sf_mrs_connect/data/ir_cron_data.xml b/sf_mrs_connect/data/ir_cron_data.xml index 016789b6..9ea7dd78 100644 --- a/sf_mrs_connect/data/ir_cron_data.xml +++ b/sf_mrs_connect/data/ir_cron_data.xml @@ -154,137 +154,137 @@ - - 同步整体式刀具型号 - - 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 - - + + + + + + + + + + 同步资源库夹紧元件型号 diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py index de7265ba..0e6f7505 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -42,96 +42,33 @@ class ResConfigSettings(models.TransientModel): _logger.info("同步资源库机床类型") # self.env['sf.production.process.parameter'].sync_all_production_process_parameter() # _logger.info("同步表面工艺参数") - # _logger.info("定时同步每日功能刀具类型列表...") - # # self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model() - # _logger.info("同步每日功能刀具类型完成") + _logger.info("定时同步每日功能刀具类型列表...") + # 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() _logger.info("同步所有功能刀具类型完成") - # _logger.info("定时同步每日整体式刀具类型列表...") - # # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool() - # _logger.info("同步整体式刀具类型完成") - # _logger.info("同步每日刀具物料...") - # self.env['sf.cutting.tool.material'].sync_cutting_tool_material() - # _logger.info("同步每日刀具物料完成") + _logger.info("同步每日刀具物料...") + self.env['sf.cutting.tool.material'].sync_cutting_tool_material() + _logger.info("同步每日刀具物料完成") _logger.info("同步所有刀具物料...") self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material() _logger.info("同步所有刀具物料完成") - # _logger.info("同步每日刀片类型列表...") - # self.env['sf.blade.model'].sync_blade_model() - # _logger.info("同步每日刀片类型完成") - _logger.info("同步所有刀片类型列表...") - self.env['sf.blade.model'].sync_all_blade_model() - _logger.info("同步所有刀片类型完成") - # _logger.info("同步每日刀杆类型...") - # self.env['sf.cutter.bar.model'].sync_cutter_bar_model() - # _logger.info("同步每日刀杆类型完成") - _logger.info("同步所有刀杆类型...") - self.env['sf.cutter.bar.model'].sync_all_cutter_bar_model() - _logger.info("同步所有刀杆类型完成") - # _logger.info("同步每日刀盘类型...") - # self.env['sf.cutter.pad.model'].sync_cutter_pad_model() - # _logger.info("同步每日刀盘类型完成") - _logger.info("同步所有刀盘类型...") - self.env['sf.cutter.pad.model'].sync_all_cutter_pad_model() - _logger.info("同步所有刀盘类型完成") - # _logger.info("同步每日刀柄类型...") - # self.env['sf.handle.model'].sync_handle_model() - # _logger.info("同步每日刀柄类型完成") - _logger.info("同步所有刀柄类型...") - self.env['sf.handle.model'].sync_all_handle_model() - _logger.info("同步所有刀柄类型完成") - # _logger.info("同步每日夹头类型...") - # self.env['sf.chuck.model'].sync_chuck_model() - # _logger.info("同步每日夹头类型完成") - _logger.info("同步所有夹头类型...") - self.env['sf.chuck.model'].sync_all_chuck_model() - _logger.info("同步所有夹头类型完成") - # _logger.info("同步每日整体式刀具类型...") - # self.env['sf.integral.cutting.tool.model'].sync_integral_cutting_tool_model() - # _logger.info("同步每日整体式刀具类型完成") - _logger.info("同步所有整体式刀具类型...") - self.env['sf.integral.cutting.tool.model'].sync_all_integral_cutting_tool_model() - _logger.info("同步所有整体式刀具类型完成") - # _logger.info("同步每日刀片列表...") - # self.env['sf.blade'].sync_blade() - # _logger.info("同步每日刀片完成") - _logger.info("同步所有刀片列表...") - self.env['sf.blade'].sync_all_blade() - _logger.info("同步所有刀片完成") - # _logger.info("同步每日刀杆列表...") - # self.env['sf.cutter.bar'].sync_cutter_bar() - # _logger.info("同步每日刀杆完成") - _logger.info("同步所有刀杆列表...") - self.env['sf.cutter.bar'].sync_all_cutter_bar() - _logger.info("同步所有刀杆完成") - # _logger.info("同步每日刀盘列表...") - # self.env['sf.cutter.pad'].sync_cutter_pad() - # _logger.info("同步每日刀盘完成") - _logger.info("同步所有刀盘列表...") - self.env['sf.cutter.pad'].sync_all_cutter_pad() - _logger.info("同步所有刀盘完成") - # _logger.info("同步每日刀柄列表...") - # self.env['sf.handle'].sync_handle() - # _logger.info("同步每日刀柄完成") - _logger.info("同步所有刀柄列表...") - self.env['sf.handle'].sync_all_handle() - _logger.info("同步所有刀柄完成") - # _logger.info("同步每日夹头列表...") - # self.env['sf.chuck'].sync_chuck() - # _logger.info("同步每日夹头完成") - _logger.info("同步所有夹头列表...") - self.env['sf.chuck'].sync_all_chuck() - _logger.info("同步所有夹头完成") - # _logger.info("同步每日整体式刀具列表...") - # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool() - # _logger.info("同步每日整体式刀具完成") - _logger.info("同步所有整体式刀具列表...") - self.env['sf.integral.cutting.tool'].sync_all_integral_cutting_tool() - _logger.info("同步所有整体式刀具完成") - # _logger.info("同步每日同步功能刀具列表...") - # self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool() - # _logger.info("同步每日功能刀具列表完成") + _logger.info("同步每日刀具类型...") + self.env['sf.cutting.tool.type'].sync_tool_type() + _logger.info("同步每日刀具类型完成") + _logger.info("同步所有刀具类型...") + self.env['sf.cutting.tool.type'].sync_all_tool_type() + _logger.info("同步所有刀具类型完成") + _logger.info("同步每日刀具型号...") + self.env['sf.cutting.tool.model'].sync_tool_model() + _logger.info("同步每日刀具型号完成") + _logger.info("同步所有刀具型号...") + self.env['sf.cutting.tool.model'].sync_all_tool_model() + _logger.info("同步所有刀具型号完成") + _logger.info("同步每日同步功能刀具列表...") + self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool() + _logger.info("同步每日功能刀具列表完成") _logger.info("同步所有功能刀具列表...") self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool() _logger.info("同步所有功能刀具列表完成") @@ -149,7 +86,6 @@ class ResConfigSettings(models.TransientModel): _logger.info("捕获错误信息:%s" % e) raise ValidationError("数据错误导致同步失败,请联系管理员") - @api.model def get_values(self): """ diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index bd236f9c..87f8128c 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -1180,26 +1180,11 @@ class sfSyncFunctional_cutting_tool(models.Model): "name": item['name'], "code": item['code'], # 功能刀具类型 - "functional_model_number": self.env['sf.functional.cutting.tool.model'].search( - [('code', '=', item['functional_model_number'])]).id, - # 整体刀具型号 - "integral_model_number": self.env['sf.integral.cutting.tool'].search( - [('code', '=', item['integral_model_number'])]).id, - # 刀片型号 - "blade_model_number": self.env['sf.blade'].search( - [('code', '=', item['blade_model_number'])]).id, - # 刀杆型号 - "cutterbar_model_number": self.env['sf.cutter.bar'].search( - [('code', '=', item['cutterbar_model_number'])]).id, - # 刀盘型号 - "cutterpad_model_number": self.env['sf.cutter.pad'].search( - [('code', '=', item['cutterpad_model_number'])]).id, - # 刀柄型号 - "handle_model_number": self.env['sf.handle'].search( - [('code', '=', item['handle_model_number'])]).id, - # 夹头型号 - "chuck_model_number": self.env['sf.chuck'].search( - [('code', '=', item['chuck_model_number'])]).id, + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [('code', '=', item['mrs_cutting_tool_type_id'])]).id, + # 刀具型号 + "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search( + [('code', '=', item['mrs_cutting_tool_model_id'])]).id, "diameter": item['diameter'], "tool_grade": item['tool_grade'], "machining_accuracy": item['machining_accuracy'], @@ -1218,26 +1203,11 @@ class sfSyncFunctional_cutting_tool(models.Model): "name": item['name'], "code": item['code'], # 功能刀具类型 - "functional_model_number": self.env['sf.functional.cutting.tool.model'].search( - [('code', '=', item['functional_model_number'])]).id, - # 整体刀具型号 - "integral_model_number": self.env['sf.integral.cutting.tool'].search( - [('code', '=', item['integral_model_number'])]).id, - # 刀片型号 - "blade_model_number": self.env['sf.blade'].search( - [('code', '=', item['blade_model_number'])]).id, - # 刀杆型号 - "cutterbar_model_number": self.env['sf.cutter.bar'].search( - [('code', '=', item['cutterbar_model_number'])]).id, - # 刀盘型号 - "cutterpad_model_number": self.env['sf.cutter.pad'].search( - [('code', '=', item['cutterpad_model_number'])]).id, - # 刀柄型号 - "handle_model_number": self.env['sf.handle'].search( - [('code', '=', item['handle_model_number'])]).id, - # 夹头型号 - "chuck_model_number": self.env['sf.chuck'].search( - [('code', '=', item['chuck_model_number'])]).id, + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [('code', '=', item['mrs_cutting_tool_type_id'])]).id, + # 刀具型号 + "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search( + [('code', '=', item['mrs_cutting_tool_model_id'])]).id, "diameter": item['diameter'], "tool_grade": item['tool_grade'], "machining_accuracy": item['machining_accuracy'], @@ -1281,26 +1251,11 @@ class sfSyncFunctional_cutting_tool(models.Model): "name": item['name'], "code": item['code'], # 功能刀具类型 - "functional_model_number": self.env['sf.functional.cutting.tool.model'].search( - [('code', '=', item['functional_model_number'])]).id, - # 整体刀具型号 - "integral_model_number": self.env['sf.integral.cutting.tool'].search( - [('code', '=', item['integral_model_number'])]).id, - # 刀片型号 - "blade_model_number": self.env['sf.blade'].search( - [('code', '=', item['blade_model_number'])]).id, - # 刀杆型号 - "cutterbar_model_number": self.env['sf.cutter.bar'].search( - [('code', '=', item['cutterbar_model_number'])]).id, - # 刀盘型号 - "cutterpad_model_number": self.env['sf.cutter.pad'].search( - [('code', '=', item['cutterpad_model_number'])]).id, - # 刀柄型号 - "handle_model_number": self.env['sf.handle'].search( - [('code', '=', item['handle_model_number'])]).id, - # 夹头型号 - "chuck_model_number": self.env['sf.chuck'].search( - [('code', '=', item['chuck_model_number'])]).id, + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [('code', '=', item['mrs_cutting_tool_type_id'])]).id, + # 刀具型号 + "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search( + [('code', '=', item['mrs_cutting_tool_model_id'])]).id, "diameter": item['diameter'], "tool_grade": item['tool_grade'], "machining_accuracy": item['machining_accuracy'], @@ -1319,26 +1274,11 @@ class sfSyncFunctional_cutting_tool(models.Model): "name": item['name'], "code": item['code'], # 功能刀具类型 - "functional_model_number": self.env['sf.functional.cutting.tool.model'].search( - [('code', '=', item['functional_model_number'])]).id, - # 整体刀具型号 - "integral_model_number": self.env['sf.integral.cutting.tool'].search( - [('code', '=', item['integral_model_number'])]).id, - # 刀片型号 - "blade_model_number": self.env['sf.blade'].search( - [('code', '=', item['blade_model_number'])]).id, - # 刀杆型号 - "cutterbar_model_number": self.env['sf.cutter.bar'].search( - [('code', '=', item['cutterbar_model_number'])]).id, - # 刀盘型号 - "cutterpad_model_number": self.env['sf.cutter.pad'].search( - [('code', '=', item['cutterpad_model_number'])]).id, - # 刀柄型号 - "handle_model_number": self.env['sf.handle'].search( - [('code', '=', item['handle_model_number'])]).id, - # 夹头型号 - "chuck_model_number": self.env['sf.chuck'].search( - [('code', '=', item['chuck_model_number'])]).id, + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [('code', '=', item['mrs_cutting_tool_type_id'])]).id, + # 刀具型号 + "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search( + [('code', '=', item['mrs_cutting_tool_model_id'])]).id, "diameter": item['diameter'], "tool_grade": item['tool_grade'], "machining_accuracy": item['machining_accuracy'], @@ -1429,1544 +1369,1544 @@ class SyncFunctionalCuttingToolModel(models.Model): raise ValidationError("认证未通过") -# 同步整体式刀具列表 -class SyncIntegralCuttingTool(models.Model): - _inherit = 'sf.integral.cutting.tool' - _description = '同步整体式刀具列表' - url = '/api/mrs_integral_cutting_tool/list' - - # 定时同步每日整体式刀具列表 - def sync_integral_cutting_tool(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_integral_cutting_tool_yesterday_list'): - for item in result['mrs_integral_cutting_tool_yesterday_list']: - chuck_list = [] - if item.get('chuck_model'): - for chuck in item.get('chuck_model'): - chuck_list.append(self.env['sf.chuck'].search( - [("code", '=', chuck)]).id) - if item: - brand = self.env['sf.integral.cutting.tool'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - self.env['sf.integral.cutting.tool'].create({ - # code, name, integral_model_number, brand, total_length, shank_length, blade_length, diameter, blade_number, front_angle, rear_angle, main_included_angle, material_model, nut, chuck_model, scope, image, create_uid, create_date - "name": item['name'], - "code": item['code'], - "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( - [("code", '=', item['integral_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "total_length": item['total_length'], - "shank_length": item['shank_length'], - "blade_length": item['blade_length'], - "diameter": item['diameter'], - "blade_number": item['blade_number'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "chuck_model": chuck_list, - "scope": item['scope'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( - [("code", '=', item['integral_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "total_length": item['total_length'], - "shank_length": item['shank_length'], - "blade_length": item['blade_length'], - "diameter": item['diameter'], - "blade_number": item['blade_number'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "chuck_model": chuck_list, - "scope": item['scope'], - "image": image, - }) - else: - raise ValidationError("认证未通过") - - # 同步所有整体式刀具列表 - def sync_all_integral_cutting_tool(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_integral_cutting_tool_all_list'): - for item in result['mrs_integral_cutting_tool_all_list']: - chuck_list = [] - if item.get('chuck_model'): - for chuck in item.get('chuck_model'): - chuck_list.append(self.env['sf.chuck'].search( - [("code", '=', chuck)]).id) - if item: - brand = self.env['sf.integral.cutting.tool'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - self.env['sf.integral.cutting.tool'].create({ - # code, name, integral_model_number, brand, total_length, shank_length, blade_length, diameter, blade_number, front_angle, rear_angle, main_included_angle, material_model, nut, chuck_model, scope, image, create_uid, create_date - "name": item['name'], - "code": item['code'], - "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( - [("code", '=', item['integral_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "total_length": item['total_length'], - "shank_length": item['shank_length'], - "blade_length": item['blade_length'], - "diameter": item['diameter'], - "blade_number": item['blade_number'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "chuck_model": chuck_list, - "scope": item['scope'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( - [("code", '=', item['integral_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "total_length": item['total_length'], - "shank_length": item['shank_length'], - "blade_length": item['blade_length'], - "diameter": item['diameter'], - "blade_number": item['blade_number'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "chuck_model": chuck_list, - "scope": item['scope'], - "image": image, - }) - else: - raise ValidationError("认证未通过") - - -# 同步整体式刀具类型列表 -class SyncIntegralCuttingToolModel(models.Model): - _inherit = 'sf.integral.cutting.tool.model' - _description = '同步整体式刀具类型列表' - - url = '/api/mrs_integral_cutting_tool_model/list' - - # 定时同步整体式刀具类型列表 - def sync_integral_cutting_tool_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_integral_cutting_tool_model_list'): - for item in result['mrs_integral_cutting_tool_model_list']: - if item: - brand = self.env['sf.integral.cutting.tool.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.integral.cutting.tool.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - raise ValidationError("认证未通过") - - # 同步所有整体式刀具类型列表 - def sync_all_integral_cutting_tool_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_integral_cutting_tool_model_all_list'): - for item in result['mrs_integral_cutting_tool_model_all_list']: - if item: - brand = self.env['sf.integral.cutting.tool.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.integral.cutting.tool.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - raise ValidationError("认证未通过") - - -# 同步刀片列表 -class SyncBlade(models.Model): - _inherit = 'sf.blade' - _description = '同步刀片列表' - url = '/api/mrs_blade/list' - - # 定时同步每日刀片列表 - def sync_blade(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_blade_yesterday_list'): - for item in result['mrs_blade_yesterday_list']: - bar_list = [] - pad_list = [] - if item.get('cutter_bar'): - for i in item.get('cutter_bar'): - bar_list.append(self.env['sf.cutter.bar'].search( - [("code", '=', i)]).id) - if item.get('cutter_pad'): - for j in item.get('cutter_pad'): - pad_list.append(self.env['sf.cutter.pad'].search( - [("code", '=', j)]).id) - if item: - # code, name, blade_model_number, brand, length, width, height, top_angle, front_angle, rear_angle, main_included_angle, r_angle, material_model, hardness, nut, cutter_bar, cutter_pad, radius, image, create_uid, create_date - brand = self.env['sf.blade'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - self.env['sf.blade'].create({ - "name": item['name'], - "code": item['code'], - "blade_model_number": self.env['sf.blade.model'].search( - [("code", '=', item['blade_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "width": item['width'], - "height": item['height'], - "top_angle": item['top_angle'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "r_angle": item['r_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "hardness": item['hardness'], - "nut": item['nut'], - "cutter_bar": bar_list, - "cutter_pad": pad_list, - "radius": item['radius'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "blade_model_number": self.env['sf.blade.model'].search( - [("code", '=', item['blade_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "width": item['width'], - "height": item['height'], - "top_angle": item['top_angle'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "r_angle": item['r_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "hardness": item['hardness'], - "nut": item['nut'], - "cutter_bar": bar_list, - "cutter_pad": pad_list, - "radius": item['radius'], - "image": image, - }) - else: - raise ValidationError("认证未通过") - - # 同步所有刀片列表 - def sync_all_blade(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_blade_all_list'): - for item in result['mrs_blade_all_list']: - bar_list = [] - pad_list = [] - if item.get('cutter_bar'): - for i in item.get('cutter_bar'): - bar_list.append(self.env['sf.cutter.bar'].search( - [("code", '=', i)]).id) - if item.get('cutter_pad'): - for j in item.get('cutter_pad'): - pad_list.append(self.env['sf.cutter.pad'].search( - [("code", '=', j)]).id) - - if item: - brand = self.env['sf.blade'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - self.env['sf.blade'].create({ - "name": item['name'], - "code": item['code'], - "blade_model_number": self.env['sf.blade.model'].search( - [("code", '=', item['blade_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "width": item['width'], - "height": item['height'], - "top_angle": item['top_angle'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "r_angle": item['r_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "hardness": item['hardness'], - "nut": item['nut'], - "cutter_bar": bar_list, - "cutter_pad": pad_list, - "radius": item['radius'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "blade_model_number": self.env['sf.blade.model'].search( - [("code", '=', item['blade_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "width": item['width'], - "height": item['height'], - "top_angle": item['top_angle'], - "front_angle": item['front_angle'], - "rear_angle": item['rear_angle'], - "main_included_angle": item['main_included_angle'], - "r_angle": item['r_angle'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "hardness": item['hardness'], - "nut": item['nut'], - "cutter_bar": bar_list, - "cutter_pad": pad_list, - "radius": item['radius'], - "image": image, - }) - else: - raise ValidationError("认证未通过") - - -# 同步刀片类型列表 -class SyncBladeModel(models.Model): - _inherit = 'sf.blade.model' - _description = '同步刀片类型列表' - - url = '/api/mrs_blade_model/list' - - # 定时同步每日刀片列表 - def sync_blade_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_blade_model_yesterday_list'): - for item in result['mrs_blade_model_yesterday_list']: - if item: - brand = self.env['sf.blade.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.blade.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步每日刀片类型列表成功') - else: - raise ValidationError("认证未通过") - - # 定时同步所有刀片列表 - def sync_all_blade_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_blade_model_all_list'): - for item in result['mrs_blade_model_all_list']: - if item: - brand = self.env['sf.blade.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.blade.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步刀片类型列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步刀杆列表 -class SyncCutterBar(models.Model): - _inherit = 'sf.cutter.bar' - _description = '同步刀杆列表' - - url = '/api/mrs_cutter_bar/list' - - # 定时同步每日刀杆列表 - def sync_cutter_bar(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_bar_yesterday_list'): - for item in result['mrs_cutter_bar_yesterday_list']: - blade_list = [] - if item.get('blade'): - for i in item.get('blade'): - blade_list.append(self.env['sf.blade'].search( - [("code", '=', i)]).id) - if item: - brand = self.env['sf.cutter.bar'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, cutter_bar_model_number, brand, c_diameter, total_length, material_model, blade_number, d_diameter, blade, wrench, screw, radius, accuracy, hardness, scope, image - self.env['sf.cutter.bar'].create({ - "code": item['code'], - "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( - [("code", '=', item['cutter_bar_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - else: - brand.write({ - "code": item['code'], - "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( - [("code", '=', item['cutter_bar_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - print('同步昨日刀杆列表成功') - else: - raise ValidationError("认证未通过") - - # 同步所有刀杆列表 - def sync_all_cutter_bar(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_bar_all_list'): - for item in result['mrs_cutter_bar_all_list']: - blade_list = [] - if item.get('blade'): - for i in item.get('blade'): - blade_list.append(self.env['sf.blade'].search( - [("code", '=', i)]).id) - if item: - brand = self.env['sf.cutter.bar'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, cutter_bar_model_number, brand, c_diameter, total_length, material_model, blade_number, d_diameter, blade, wrench, screw, radius, accuracy, hardness, scope, image - self.env['sf.cutter.bar'].create({ - "code": item['code'], - "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( - [("code", '=', item['cutter_bar_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - else: - brand.write({ - "code": item['code'], - "name": item['name'], - "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( - [("code", '=', item['cutter_bar_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - print('同步所有刀杆列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步刀杆类型列表 -class SyncCutterBarModel(models.Model): - _inherit = 'sf.cutter.bar.model' - _description = '同步刀杆类型列表' - - url = '/api/mrs_cutter_bar_model/list' - - # 定时同步每日刀杆类型列表 - def sync_cutter_bar_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_bar_model_yesterday_list'): - for item in result['mrs_cutter_bar_model_yesterday_list']: - if item: - brand = self.env['sf.cutter.bar.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.cutter.bar.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步每日刀片类型列表成功') - else: - raise ValidationError("认证未通过") - - # 同步所有刀杆类型列表 - def sync_all_cutter_bar_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_bar_model_all_list'): - for item in result['mrs_cutter_bar_model_all_list']: - if item: - brand = self.env['sf.cutter.bar.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.cutter.bar.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步刀杆类型列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步刀盘列表 -class SyncCutterPad(models.Model): - _inherit = 'sf.cutter.pad' - _description = '同步刀盘列表' - - url = '/api/mrs_cutter_pad/list' - - # 定时同步每日刀盘列表 - def sync_cutter_pad(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_pad_yesterday_list'): - for item in result['mrs_cutter_pad_yesterday_list']: - blade_list = [] - if item.get('blade'): - for i in item.get('blade'): - blade_list.append(self.env['sf.blade'].search( - [("code", '=', i)]).id) - if item: - brand = self.env['sf.cutter.pad'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # 'code', 'name', 'cutter_pad_model_number', 'brand', 'c_diameter', 'total_length', 'material_model', 'blade_number', 'd_diameter', 'blade', 'wrench', 'screw', 'radius', 'accuracy', 'hardness', 'scope', 'image' - self.env['sf.cutter.pad'].create({ - "name": item['name'], - "code": item['code'], - "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( - [("code", '=', item['cutter_pad_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - # "blade": [(6, 0, blade_list)], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( - [("code", '=', item['cutter_pad_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - # "blade": [(6, 0, blade_list)], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - print('同步每日刀盘列表成功') - else: - raise ValidationError("认证未通过") - - # 定时同步所有刀盘列表 - def sync_all_cutter_pad(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_pad_all_list'): - for item in result['mrs_cutter_pad_all_list']: - blade_list = [] - if item.get('blade'): - for i in item.get('blade'): - blade_list.append(self.env['sf.blade'].search( - [("code", '=', i)]).id) - if item: - brand = self.env['sf.cutter.pad'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # 'code', 'name', 'cutter_pad_model_number', 'brand', 'c_diameter', 'total_length', 'material_model', 'blade_number', 'd_diameter', 'blade', 'wrench', 'screw', 'radius', 'accuracy', 'hardness', 'scope', 'image' - self.env['sf.cutter.pad'].create({ - "name": item['name'], - "code": item['code'], - "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( - [("code", '=', item['cutter_pad_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - # "blade": [(6, 0, blade_list)], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( - [("code", '=', item['cutter_pad_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "c_diameter": item['c_diameter'], - "total_length": item['total_length'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "blade_number": item['blade_number'], - "d_diameter": item['d_diameter'], - # "blade": [(6, 0, blade_list)], - "blade": blade_list, - "wrench": item['wrench'], - "screw": item['screw'], - "radius": item['radius'], - "accuracy": item['accuracy'], - "hardness": item['hardness'], - "scope": item['scope'], - "image": image, - }) - print('同步所有刀盘列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步刀盘类型列表 -class SyncCutterPadModel(models.Model): - _inherit = 'sf.cutter.pad.model' - _description = '同步刀盘类型列表' - - url = '/api/mrs_cutter_pad_model/list' - - # 定时同步每日刀盘类型列表 - def sync_cutter_pad_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_pad_model_yesterday_list'): - for item in result['mrs_cutter_pad_model_yesterday_list']: - if item: - brand = self.env['sf.cutter.pad.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.cutter.pad.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步每日刀盘类型列表成功') - else: - raise ValidationError("认证未通过") - - # 定时同步所有刀盘类型列表 - def sync_all_cutter_pad_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_cutter_pad_model_all_list'): - for item in result['mrs_cutter_pad_model_all_list']: - if item: - brand = self.env['sf.cutter.pad.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.cutter.pad.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步刀盘类型列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步刀柄列表 -class SyncHandle(models.Model): - _inherit = 'sf.handle' - _description = '同步刀柄列表' - - url = '/api/mrs_handle/list' - - # 定时同步每日刀柄列表 - def sync_handle(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_handle_yesterday_list'): - for item in result['mrs_handle_yesterday_list']: - chuck_list = [] - if item.get('chuck_model'): - for chuck in item.get('chuck_model'): - chuck_list.append(self.env['sf.chuck'].search( - [("code", '=', chuck)]).id) - if item: - brand = self.env['sf.handle'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, handle_model_number, brand, length, length1, diameter1, weight, material_model, body_accuracy, nut, chuck_model, clamping_range, detection_accuracy, detection_hardness, standard_speed, image - self.env['sf.handle'].create({ - "name": item['name'], - "code": item['code'], - "handle_model_number": self.env['sf.handle.model'].search( - [("code", '=', item['handle_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "length1": item['length1'], - "diameter1": item['diameter1'], - "weight": item['weight'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "body_accuracy": item['body_accuracy'], - "nut": item['nut'], - # "chuck_model": [(6, 0, chuck_list)], - "chuck_model": chuck_list, - "clamping_range": item['clamping_range'], - "detection_accuracy": item['detection_accuracy'], - "detection_hardness": item['detection_hardness'], - "standard_speed": item['standard_speed'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "handle_model_number": self.env['sf.handle.model'].search( - [("code", '=', item['handle_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "length1": item['length1'], - "diameter1": item['diameter1'], - "weight": item['weight'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "body_accuracy": item['body_accuracy'], - "nut": item['nut'], - # "chuck_model": [(6, 0, chuck_list)], - "chuck_model": chuck_list, - "clamping_range": item['clamping_range'], - "detection_accuracy": item['detection_accuracy'], - "detection_hardness": item['detection_hardness'], - "standard_speed": item['standard_speed'], - "image": image, - }) - print('同步昨日刀柄列表成功') - else: - raise ValidationError("认证未通过") - - # 同步所有刀柄列表 - def sync_all_handle(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_handle_all_list'): - for item in result['mrs_handle_all_list']: - chuck_list = [] - if item.get('chuck_model'): - for chuck in item.get('chuck_model'): - chuck_list.append(self.env['sf.chuck'].search( - [("code", '=', chuck)]).id) - if item: - brand = self.env['sf.handle'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, handle_model_number, brand, length, length1, diameter1, weight, material_model, body_accuracy, nut, chuck_model, clamping_range, detection_accuracy, detection_hardness, standard_speed, image - self.env['sf.handle'].create({ - "name": item['name'], - "code": item['code'], - "handle_model_number": self.env['sf.handle.model'].search( - [("code", '=', item['handle_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "length1": item['length1'], - "diameter1": item['diameter1'], - "weight": item['weight'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "body_accuracy": item['body_accuracy'], - "nut": item['nut'], - # "chuck_model": [(6, 0, chuck_list)], - "chuck_model": chuck_list, - "clamping_range": item['clamping_range'], - "detection_accuracy": item['detection_accuracy'], - "detection_hardness": item['detection_hardness'], - "standard_speed": item['standard_speed'], - "image": image, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "handle_model_number": self.env['sf.handle.model'].search( - [("code", '=', item['handle_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "length": item['length'], - "length1": item['length1'], - "diameter1": item['diameter1'], - "weight": item['weight'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "body_accuracy": item['body_accuracy'], - "nut": item['nut'], - # "chuck_model": [(6, 0, chuck_list)], - "chuck_model": chuck_list, - "clamping_range": item['clamping_range'], - "detection_accuracy": item['detection_accuracy'], - "detection_hardness": item['detection_hardness'], - "standard_speed": item['standard_speed'], - "image": image, - }) - print('同步所有刀柄列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步刀柄类型列表 -class SyncHandleModel(models.Model): - _inherit = 'sf.handle.model' - _description = '同步刀柄类型列表' - - url = '/api/mrs_handle_model/list' - - # 定时同步每日刀柄类型列表 - def sync_handle_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_handle_model_yesterday_list'): - for item in result['mrs_handle_model_yesterday_list']: - if item: - brand = self.env['sf.handle.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.handle.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步每日刀柄类型列表成功') - else: - raise ValidationError("认证未通过") - - # 定时同步所有刀柄类型列表 - def sync_all_handle_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_handle_model_all_list'): - for item in result['mrs_handle_model_all_list']: - if item: - brand = self.env['sf.handle.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.handle.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步刀柄类型列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步夹头型号列表 -class SyncChuck(models.Model): - _inherit = 'sf.chuck' - _description = '同步夹头型号列表' - - url = '/api/mrs_chuck/list' - - # 定时同步每日夹头型号列表 - def sync_chuck(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_chuck_yesterday_list'): - for item in result['mrs_chuck_yesterday_list']: - handle_model_list = [] - if item.get('handle_model'): - for handle_model in item['handle_model']: - handle_model_list.append(self.env['sf.handle.model'].search( - [("code", '=', handle_model)]).id) - if item: - brand = self.env['sf.chuck'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image - self.env['sf.chuck'].create({ - "code": item['code'], - "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("code", '=', item['chuck_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "accuracy": item['accuracy'], - "diameter": item['diameter'], - "inner_diameter": item['inner_diameter'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, - }) - else: - brand.write({ - "code": item['code'], - "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("code", '=', item['chuck_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "accuracy": item['accuracy'], - "diameter": item['diameter'], - "inner_diameter": item['inner_diameter'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, - }) - print('同步每日夹头型号列表成功') - else: - raise ValidationError("认证未通过") - - # 同步所有夹头型号列表 - def sync_all_chuck(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_chuck_all_list'): - for item in result['mrs_chuck_all_list']: - handle_model_list = [] - if item.get('handle_model'): - for handle_model in item['handle_model']: - handle_model_list.append(self.env['sf.handle.model'].search( - [("code", '=', handle_model)]).id) - if item: - brand = self.env['sf.chuck'].search( - [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image - self.env['sf.chuck'].create({ - "code": item['code'], - "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("code", '=', item['chuck_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "accuracy": item['accuracy'], - "diameter": item['diameter'], - "inner_diameter": item['inner_diameter'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, - }) - else: - brand.write({ - "code": item['code'], - "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("code", '=', item['chuck_model_number'])]).id, - "brand": self.env['sf.machine.brand'].search( - [("code", '=', item['brand'])]).id, - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - "accuracy": item['accuracy'], - "diameter": item['diameter'], - "inner_diameter": item['inner_diameter'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, - }) - print('同步所有夹头型号列表成功') - else: - raise ValidationError("认证未通过") - - -# 同步夹头类型列表 -class SyncChuckModel(models.Model): - _inherit = 'sf.chuck.model' - _description = '同步夹头类型列表' - - url = '/api/mrs_chuck_model/list' - - # 定时同步每日夹头型号列表 - def sync_chuck_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_chuck_model_yesterday_list'): - for item in result['mrs_chuck_model_yesterday_list']: - if item: - brand = self.env['sf.chuck.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.chuck.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步每日夹头类型列表成功') - else: - raise ValidationError("认证未通过") - - # 定时同步所有夹头型号列表 - def sync_all_chuck_model(self): - sf_sync_config = self.env['res.config.settings'].get_values() - token = sf_sync_config['token'] - sf_secret_key = sf_sync_config['sf_secret_key'] - headers = Common.get_headers(self, token, sf_secret_key) - - strUrl = sf_sync_config['sf_url'] + self.url - r = requests.post(strUrl, json={}, data=None, headers=headers) - r = r.json() - result = json.loads(r['result']) - # print('result:%s' % result) - if result['status'] == 1: - if result.get('mrs_chuck_model_all_list'): - for item in result['mrs_chuck_model_all_list']: - if item: - brand = self.env['sf.chuck.model'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.chuck.model'].create({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - else: - brand.write({ - "name": item['name'], - "code": item['code'], - "remark": item['remark'], - "cutting_tool_material": self.env['sf.cutting.tool.material'].search( - [("code", '=', item['cutting_tool_material'])]).id, - }) - print('同步夹头类型列表成功') - else: - raise ValidationError("认证未通过") +# # 同步整体式刀具列表 +# class SyncIntegralCuttingTool(models.Model): +# _inherit = 'sf.integral.cutting.tool' +# _description = '同步整体式刀具列表' +# url = '/api/mrs_integral_cutting_tool/list' +# +# # 定时同步每日整体式刀具列表 +# def sync_integral_cutting_tool(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_integral_cutting_tool_yesterday_list'): +# for item in result['mrs_integral_cutting_tool_yesterday_list']: +# chuck_list = [] +# if item.get('chuck_model'): +# for chuck in item.get('chuck_model'): +# chuck_list.append(self.env['sf.chuck'].search( +# [("code", '=', chuck)]).id) +# if item: +# brand = self.env['sf.integral.cutting.tool'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# self.env['sf.integral.cutting.tool'].create({ +# # code, name, integral_model_number, brand, total_length, shank_length, blade_length, diameter, blade_number, front_angle, rear_angle, main_included_angle, material_model, nut, chuck_model, scope, image, create_uid, create_date +# "name": item['name'], +# "code": item['code'], +# "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( +# [("code", '=', item['integral_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "total_length": item['total_length'], +# "shank_length": item['shank_length'], +# "blade_length": item['blade_length'], +# "diameter": item['diameter'], +# "blade_number": item['blade_number'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "chuck_model": chuck_list, +# "scope": item['scope'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( +# [("code", '=', item['integral_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "total_length": item['total_length'], +# "shank_length": item['shank_length'], +# "blade_length": item['blade_length'], +# "diameter": item['diameter'], +# "blade_number": item['blade_number'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "chuck_model": chuck_list, +# "scope": item['scope'], +# "image": image, +# }) +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有整体式刀具列表 +# def sync_all_integral_cutting_tool(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_integral_cutting_tool_all_list'): +# for item in result['mrs_integral_cutting_tool_all_list']: +# chuck_list = [] +# if item.get('chuck_model'): +# for chuck in item.get('chuck_model'): +# chuck_list.append(self.env['sf.chuck'].search( +# [("code", '=', chuck)]).id) +# if item: +# brand = self.env['sf.integral.cutting.tool'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# self.env['sf.integral.cutting.tool'].create({ +# # code, name, integral_model_number, brand, total_length, shank_length, blade_length, diameter, blade_number, front_angle, rear_angle, main_included_angle, material_model, nut, chuck_model, scope, image, create_uid, create_date +# "name": item['name'], +# "code": item['code'], +# "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( +# [("code", '=', item['integral_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "total_length": item['total_length'], +# "shank_length": item['shank_length'], +# "blade_length": item['blade_length'], +# "diameter": item['diameter'], +# "blade_number": item['blade_number'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "chuck_model": chuck_list, +# "scope": item['scope'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "integral_model_number": self.env['sf.integral.cutting.tool.model'].search( +# [("code", '=', item['integral_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "total_length": item['total_length'], +# "shank_length": item['shank_length'], +# "blade_length": item['blade_length'], +# "diameter": item['diameter'], +# "blade_number": item['blade_number'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "chuck_model": chuck_list, +# "scope": item['scope'], +# "image": image, +# }) +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步整体式刀具类型列表 +# class SyncIntegralCuttingToolModel(models.Model): +# _inherit = 'sf.integral.cutting.tool.model' +# _description = '同步整体式刀具类型列表' +# +# url = '/api/mrs_integral_cutting_tool_model/list' +# +# # 定时同步整体式刀具类型列表 +# def sync_integral_cutting_tool_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_integral_cutting_tool_model_list'): +# for item in result['mrs_integral_cutting_tool_model_list']: +# if item: +# brand = self.env['sf.integral.cutting.tool.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.integral.cutting.tool.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有整体式刀具类型列表 +# def sync_all_integral_cutting_tool_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_integral_cutting_tool_model_all_list'): +# for item in result['mrs_integral_cutting_tool_model_all_list']: +# if item: +# brand = self.env['sf.integral.cutting.tool.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.integral.cutting.tool.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀片列表 +# class SyncBlade(models.Model): +# _inherit = 'sf.blade' +# _description = '同步刀片列表' +# url = '/api/mrs_blade/list' +# +# # 定时同步每日刀片列表 +# def sync_blade(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_blade_yesterday_list'): +# for item in result['mrs_blade_yesterday_list']: +# bar_list = [] +# pad_list = [] +# if item.get('cutter_bar'): +# for i in item.get('cutter_bar'): +# bar_list.append(self.env['sf.cutter.bar'].search( +# [("code", '=', i)]).id) +# if item.get('cutter_pad'): +# for j in item.get('cutter_pad'): +# pad_list.append(self.env['sf.cutter.pad'].search( +# [("code", '=', j)]).id) +# if item: +# # code, name, blade_model_number, brand, length, width, height, top_angle, front_angle, rear_angle, main_included_angle, r_angle, material_model, hardness, nut, cutter_bar, cutter_pad, radius, image, create_uid, create_date +# brand = self.env['sf.blade'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# self.env['sf.blade'].create({ +# "name": item['name'], +# "code": item['code'], +# "blade_model_number": self.env['sf.blade.model'].search( +# [("code", '=', item['blade_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "width": item['width'], +# "height": item['height'], +# "top_angle": item['top_angle'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "r_angle": item['r_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "hardness": item['hardness'], +# "nut": item['nut'], +# "cutter_bar": bar_list, +# "cutter_pad": pad_list, +# "radius": item['radius'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "blade_model_number": self.env['sf.blade.model'].search( +# [("code", '=', item['blade_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "width": item['width'], +# "height": item['height'], +# "top_angle": item['top_angle'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "r_angle": item['r_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "hardness": item['hardness'], +# "nut": item['nut'], +# "cutter_bar": bar_list, +# "cutter_pad": pad_list, +# "radius": item['radius'], +# "image": image, +# }) +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有刀片列表 +# def sync_all_blade(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_blade_all_list'): +# for item in result['mrs_blade_all_list']: +# bar_list = [] +# pad_list = [] +# if item.get('cutter_bar'): +# for i in item.get('cutter_bar'): +# bar_list.append(self.env['sf.cutter.bar'].search( +# [("code", '=', i)]).id) +# if item.get('cutter_pad'): +# for j in item.get('cutter_pad'): +# pad_list.append(self.env['sf.cutter.pad'].search( +# [("code", '=', j)]).id) +# +# if item: +# brand = self.env['sf.blade'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# self.env['sf.blade'].create({ +# "name": item['name'], +# "code": item['code'], +# "blade_model_number": self.env['sf.blade.model'].search( +# [("code", '=', item['blade_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "width": item['width'], +# "height": item['height'], +# "top_angle": item['top_angle'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "r_angle": item['r_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "hardness": item['hardness'], +# "nut": item['nut'], +# "cutter_bar": bar_list, +# "cutter_pad": pad_list, +# "radius": item['radius'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "blade_model_number": self.env['sf.blade.model'].search( +# [("code", '=', item['blade_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "width": item['width'], +# "height": item['height'], +# "top_angle": item['top_angle'], +# "front_angle": item['front_angle'], +# "rear_angle": item['rear_angle'], +# "main_included_angle": item['main_included_angle'], +# "r_angle": item['r_angle'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "hardness": item['hardness'], +# "nut": item['nut'], +# "cutter_bar": bar_list, +# "cutter_pad": pad_list, +# "radius": item['radius'], +# "image": image, +# }) +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀片类型列表 +# class SyncBladeModel(models.Model): +# _inherit = 'sf.blade.model' +# _description = '同步刀片类型列表' +# +# url = '/api/mrs_blade_model/list' +# +# # 定时同步每日刀片列表 +# def sync_blade_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_blade_model_yesterday_list'): +# for item in result['mrs_blade_model_yesterday_list']: +# if item: +# brand = self.env['sf.blade.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.blade.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步每日刀片类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 定时同步所有刀片列表 +# def sync_all_blade_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_blade_model_all_list'): +# for item in result['mrs_blade_model_all_list']: +# if item: +# brand = self.env['sf.blade.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.blade.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步刀片类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀杆列表 +# class SyncCutterBar(models.Model): +# _inherit = 'sf.cutter.bar' +# _description = '同步刀杆列表' +# +# url = '/api/mrs_cutter_bar/list' +# +# # 定时同步每日刀杆列表 +# def sync_cutter_bar(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_bar_yesterday_list'): +# for item in result['mrs_cutter_bar_yesterday_list']: +# blade_list = [] +# if item.get('blade'): +# for i in item.get('blade'): +# blade_list.append(self.env['sf.blade'].search( +# [("code", '=', i)]).id) +# if item: +# brand = self.env['sf.cutter.bar'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, cutter_bar_model_number, brand, c_diameter, total_length, material_model, blade_number, d_diameter, blade, wrench, screw, radius, accuracy, hardness, scope, image +# self.env['sf.cutter.bar'].create({ +# "code": item['code'], +# "name": item['name'], +# "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( +# [("code", '=', item['cutter_bar_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# else: +# brand.write({ +# "code": item['code'], +# "name": item['name'], +# "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( +# [("code", '=', item['cutter_bar_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# print('同步昨日刀杆列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有刀杆列表 +# def sync_all_cutter_bar(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_bar_all_list'): +# for item in result['mrs_cutter_bar_all_list']: +# blade_list = [] +# if item.get('blade'): +# for i in item.get('blade'): +# blade_list.append(self.env['sf.blade'].search( +# [("code", '=', i)]).id) +# if item: +# brand = self.env['sf.cutter.bar'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, cutter_bar_model_number, brand, c_diameter, total_length, material_model, blade_number, d_diameter, blade, wrench, screw, radius, accuracy, hardness, scope, image +# self.env['sf.cutter.bar'].create({ +# "code": item['code'], +# "name": item['name'], +# "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( +# [("code", '=', item['cutter_bar_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# else: +# brand.write({ +# "code": item['code'], +# "name": item['name'], +# "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search( +# [("code", '=', item['cutter_bar_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# print('同步所有刀杆列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀杆类型列表 +# class SyncCutterBarModel(models.Model): +# _inherit = 'sf.cutter.bar.model' +# _description = '同步刀杆类型列表' +# +# url = '/api/mrs_cutter_bar_model/list' +# +# # 定时同步每日刀杆类型列表 +# def sync_cutter_bar_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_bar_model_yesterday_list'): +# for item in result['mrs_cutter_bar_model_yesterday_list']: +# if item: +# brand = self.env['sf.cutter.bar.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.cutter.bar.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步每日刀片类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有刀杆类型列表 +# def sync_all_cutter_bar_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_bar_model_all_list'): +# for item in result['mrs_cutter_bar_model_all_list']: +# if item: +# brand = self.env['sf.cutter.bar.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.cutter.bar.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步刀杆类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀盘列表 +# class SyncCutterPad(models.Model): +# _inherit = 'sf.cutter.pad' +# _description = '同步刀盘列表' +# +# url = '/api/mrs_cutter_pad/list' +# +# # 定时同步每日刀盘列表 +# def sync_cutter_pad(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_pad_yesterday_list'): +# for item in result['mrs_cutter_pad_yesterday_list']: +# blade_list = [] +# if item.get('blade'): +# for i in item.get('blade'): +# blade_list.append(self.env['sf.blade'].search( +# [("code", '=', i)]).id) +# if item: +# brand = self.env['sf.cutter.pad'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # 'code', 'name', 'cutter_pad_model_number', 'brand', 'c_diameter', 'total_length', 'material_model', 'blade_number', 'd_diameter', 'blade', 'wrench', 'screw', 'radius', 'accuracy', 'hardness', 'scope', 'image' +# self.env['sf.cutter.pad'].create({ +# "name": item['name'], +# "code": item['code'], +# "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( +# [("code", '=', item['cutter_pad_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# # "blade": [(6, 0, blade_list)], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( +# [("code", '=', item['cutter_pad_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# # "blade": [(6, 0, blade_list)], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# print('同步每日刀盘列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 定时同步所有刀盘列表 +# def sync_all_cutter_pad(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_pad_all_list'): +# for item in result['mrs_cutter_pad_all_list']: +# blade_list = [] +# if item.get('blade'): +# for i in item.get('blade'): +# blade_list.append(self.env['sf.blade'].search( +# [("code", '=', i)]).id) +# if item: +# brand = self.env['sf.cutter.pad'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # 'code', 'name', 'cutter_pad_model_number', 'brand', 'c_diameter', 'total_length', 'material_model', 'blade_number', 'd_diameter', 'blade', 'wrench', 'screw', 'radius', 'accuracy', 'hardness', 'scope', 'image' +# self.env['sf.cutter.pad'].create({ +# "name": item['name'], +# "code": item['code'], +# "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( +# [("code", '=', item['cutter_pad_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# # "blade": [(6, 0, blade_list)], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "cutter_pad_model_number": self.env['sf.cutter.pad.model'].search( +# [("code", '=', item['cutter_pad_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "c_diameter": item['c_diameter'], +# "total_length": item['total_length'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "blade_number": item['blade_number'], +# "d_diameter": item['d_diameter'], +# # "blade": [(6, 0, blade_list)], +# "blade": blade_list, +# "wrench": item['wrench'], +# "screw": item['screw'], +# "radius": item['radius'], +# "accuracy": item['accuracy'], +# "hardness": item['hardness'], +# "scope": item['scope'], +# "image": image, +# }) +# print('同步所有刀盘列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀盘类型列表 +# class SyncCutterPadModel(models.Model): +# _inherit = 'sf.cutter.pad.model' +# _description = '同步刀盘类型列表' +# +# url = '/api/mrs_cutter_pad_model/list' +# +# # 定时同步每日刀盘类型列表 +# def sync_cutter_pad_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_pad_model_yesterday_list'): +# for item in result['mrs_cutter_pad_model_yesterday_list']: +# if item: +# brand = self.env['sf.cutter.pad.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.cutter.pad.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步每日刀盘类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 定时同步所有刀盘类型列表 +# def sync_all_cutter_pad_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_cutter_pad_model_all_list'): +# for item in result['mrs_cutter_pad_model_all_list']: +# if item: +# brand = self.env['sf.cutter.pad.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.cutter.pad.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步刀盘类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀柄列表 +# class SyncHandle(models.Model): +# _inherit = 'sf.handle' +# _description = '同步刀柄列表' +# +# url = '/api/mrs_handle/list' +# +# # 定时同步每日刀柄列表 +# def sync_handle(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_handle_yesterday_list'): +# for item in result['mrs_handle_yesterday_list']: +# chuck_list = [] +# if item.get('chuck_model'): +# for chuck in item.get('chuck_model'): +# chuck_list.append(self.env['sf.chuck'].search( +# [("code", '=', chuck)]).id) +# if item: +# brand = self.env['sf.handle'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, handle_model_number, brand, length, length1, diameter1, weight, material_model, body_accuracy, nut, chuck_model, clamping_range, detection_accuracy, detection_hardness, standard_speed, image +# self.env['sf.handle'].create({ +# "name": item['name'], +# "code": item['code'], +# "handle_model_number": self.env['sf.handle.model'].search( +# [("code", '=', item['handle_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "length1": item['length1'], +# "diameter1": item['diameter1'], +# "weight": item['weight'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "body_accuracy": item['body_accuracy'], +# "nut": item['nut'], +# # "chuck_model": [(6, 0, chuck_list)], +# "chuck_model": chuck_list, +# "clamping_range": item['clamping_range'], +# "detection_accuracy": item['detection_accuracy'], +# "detection_hardness": item['detection_hardness'], +# "standard_speed": item['standard_speed'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "handle_model_number": self.env['sf.handle.model'].search( +# [("code", '=', item['handle_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "length1": item['length1'], +# "diameter1": item['diameter1'], +# "weight": item['weight'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "body_accuracy": item['body_accuracy'], +# "nut": item['nut'], +# # "chuck_model": [(6, 0, chuck_list)], +# "chuck_model": chuck_list, +# "clamping_range": item['clamping_range'], +# "detection_accuracy": item['detection_accuracy'], +# "detection_hardness": item['detection_hardness'], +# "standard_speed": item['standard_speed'], +# "image": image, +# }) +# print('同步昨日刀柄列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有刀柄列表 +# def sync_all_handle(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_handle_all_list'): +# for item in result['mrs_handle_all_list']: +# chuck_list = [] +# if item.get('chuck_model'): +# for chuck in item.get('chuck_model'): +# chuck_list.append(self.env['sf.chuck'].search( +# [("code", '=', chuck)]).id) +# if item: +# brand = self.env['sf.handle'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, handle_model_number, brand, length, length1, diameter1, weight, material_model, body_accuracy, nut, chuck_model, clamping_range, detection_accuracy, detection_hardness, standard_speed, image +# self.env['sf.handle'].create({ +# "name": item['name'], +# "code": item['code'], +# "handle_model_number": self.env['sf.handle.model'].search( +# [("code", '=', item['handle_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "length1": item['length1'], +# "diameter1": item['diameter1'], +# "weight": item['weight'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "body_accuracy": item['body_accuracy'], +# "nut": item['nut'], +# # "chuck_model": [(6, 0, chuck_list)], +# "chuck_model": chuck_list, +# "clamping_range": item['clamping_range'], +# "detection_accuracy": item['detection_accuracy'], +# "detection_hardness": item['detection_hardness'], +# "standard_speed": item['standard_speed'], +# "image": image, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "handle_model_number": self.env['sf.handle.model'].search( +# [("code", '=', item['handle_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "length": item['length'], +# "length1": item['length1'], +# "diameter1": item['diameter1'], +# "weight": item['weight'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "body_accuracy": item['body_accuracy'], +# "nut": item['nut'], +# # "chuck_model": [(6, 0, chuck_list)], +# "chuck_model": chuck_list, +# "clamping_range": item['clamping_range'], +# "detection_accuracy": item['detection_accuracy'], +# "detection_hardness": item['detection_hardness'], +# "standard_speed": item['standard_speed'], +# "image": image, +# }) +# print('同步所有刀柄列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步刀柄类型列表 +# class SyncHandleModel(models.Model): +# _inherit = 'sf.handle.model' +# _description = '同步刀柄类型列表' +# +# url = '/api/mrs_handle_model/list' +# +# # 定时同步每日刀柄类型列表 +# def sync_handle_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_handle_model_yesterday_list'): +# for item in result['mrs_handle_model_yesterday_list']: +# if item: +# brand = self.env['sf.handle.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.handle.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步每日刀柄类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 定时同步所有刀柄类型列表 +# def sync_all_handle_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_handle_model_all_list'): +# for item in result['mrs_handle_model_all_list']: +# if item: +# brand = self.env['sf.handle.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.handle.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步刀柄类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步夹头型号列表 +# class SyncChuck(models.Model): +# _inherit = 'sf.chuck' +# _description = '同步夹头型号列表' +# +# url = '/api/mrs_chuck/list' +# +# # 定时同步每日夹头型号列表 +# def sync_chuck(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_chuck_yesterday_list'): +# for item in result['mrs_chuck_yesterday_list']: +# handle_model_list = [] +# if item.get('handle_model'): +# for handle_model in item['handle_model']: +# handle_model_list.append(self.env['sf.handle.model'].search( +# [("code", '=', handle_model)]).id) +# if item: +# brand = self.env['sf.chuck'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image +# self.env['sf.chuck'].create({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("code", '=', item['chuck_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "accuracy": item['accuracy'], +# "diameter": item['diameter'], +# "inner_diameter": item['inner_diameter'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# else: +# brand.write({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("code", '=', item['chuck_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "accuracy": item['accuracy'], +# "diameter": item['diameter'], +# "inner_diameter": item['inner_diameter'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# print('同步每日夹头型号列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有夹头型号列表 +# def sync_all_chuck(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_chuck_all_list'): +# for item in result['mrs_chuck_all_list']: +# handle_model_list = [] +# if item.get('handle_model'): +# for handle_model in item['handle_model']: +# handle_model_list.append(self.env['sf.handle.model'].search( +# [("code", '=', handle_model)]).id) +# if item: +# brand = self.env['sf.chuck'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image +# self.env['sf.chuck'].create({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("code", '=', item['chuck_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "accuracy": item['accuracy'], +# "diameter": item['diameter'], +# "inner_diameter": item['inner_diameter'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# else: +# brand.write({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("code", '=', item['chuck_model_number'])]).id, +# "brand": self.env['sf.machine.brand'].search( +# [("code", '=', item['brand'])]).id, +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# "accuracy": item['accuracy'], +# "diameter": item['diameter'], +# "inner_diameter": item['inner_diameter'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# print('同步所有夹头型号列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步夹头类型列表 +# class SyncChuckModel(models.Model): +# _inherit = 'sf.chuck.model' +# _description = '同步夹头类型列表' +# +# url = '/api/mrs_chuck_model/list' +# +# # 定时同步每日夹头型号列表 +# def sync_chuck_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_chuck_model_yesterday_list'): +# for item in result['mrs_chuck_model_yesterday_list']: +# if item: +# brand = self.env['sf.chuck.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.chuck.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步每日夹头类型列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 定时同步所有夹头型号列表 +# def sync_all_chuck_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# r = requests.post(strUrl, json={}, data=None, headers=headers) +# r = r.json() +# result = json.loads(r['result']) +# # print('result:%s' % result) +# if result['status'] == 1: +# if result.get('mrs_chuck_model_all_list'): +# for item in result['mrs_chuck_model_all_list']: +# if item: +# brand = self.env['sf.chuck.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.chuck.model'].create({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# else: +# brand.write({ +# "name": item['name'], +# "code": item['code'], +# "remark": item['remark'], +# "cutting_tool_material": self.env['sf.cutting.tool.material'].search( +# [("code", '=', item['cutting_tool_material'])]).id, +# }) +# print('同步夹头类型列表成功') +# else: +# raise ValidationError("认证未通过") '''=========================================夹紧元件类型===============================================''' @@ -2988,6 +2928,7 @@ class sfClampingElementType(models.Model): r = requests.post(strUrl, json={}, data=None, headers=headers) r = r.json() result = json.loads(r['result']) + print('result:%s' % result) if result['status'] == 1: for item in result['mrs_clamping_element_type_yesterday_list']: if item: @@ -3299,3 +3240,643 @@ class sfGuideElementGuideMode(models.Model): }) else: raise ValidationError("认证未通过") + + +# 同步刀具类型 +class SfToolType(models.Model): + _inherit = 'sf.cutting.tool.type' + _description = '同步刀具类型' + + url = '/api/mrs_cutting_tool_type/list' + + # 定时同步每日刀具类型 + def sync_tool_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_cutting_tool_type_yesterday_list']: + if item: + brand = self.env['sf.cutting.tool.type'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.cutting.tool.type'].create({ + "name": item['name'], + "code": item['code'], + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "integral_tool_type_code": item['integral_tool_type_code'], + "blade_type_code": item['blade_type_code'], + "bar_type_code": item['bar_type_code'], + "pad_type_code": item['pad_type_code'], + "handle_type_code": item['handle_type_code'], + "chuck_type_code": item['chuck_type_code'], + "remark": item['remark'], + }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "integral_tool_type_code": item['integral_tool_type_code'], + "blade_type_code": item['blade_type_code'], + "bar_type_code": item['bar_type_code'], + "pad_type_code": item['pad_type_code'], + "handle_type_code": item['handle_type_code'], + "chuck_type_code": item['chuck_type_code'], + "remark": item['remark'], + }) + print('同步每日刀柄类型列表成功') + else: + raise ValidationError("认证未通过") + + # 同步所有刀具类型列表 + def sync_all_tool_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_cutting_tool_type_all_list']: + if item: + brand = self.env['sf.cutting.tool.type'].search( + [("code", '=', item['code'])]) + if not brand: + self.env['sf.cutting.tool.type'].create({ + "name": item['name'], + "code": item['code'], + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "integral_tool_type_code": item['integral_tool_type_code'], + "blade_type_code": item['blade_type_code'], + "bar_type_code": item['bar_type_code'], + "pad_type_code": item['pad_type_code'], + "handle_type_code": item['handle_type_code'], + "chuck_type_code": item['chuck_type_code'], + "remark": item['remark'], + }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "integral_tool_type_code": item['integral_tool_type_code'], + "blade_type_code": item['blade_type_code'], + "bar_type_code": item['bar_type_code'], + "pad_type_code": item['pad_type_code'], + "handle_type_code": item['handle_type_code'], + "chuck_type_code": item['chuck_type_code'], + "remark": item['remark'], + }) + print('同步所有刀柄类型列表成功') + else: + raise ValidationError("认证未通过") + + +# 同步刀具型号 +class SfToolModel(models.Model): + _inherit = 'sf.cutting.tool.model' + _description = '同步刀具型号' + + url = '/api/mrs_cutting_tool_model/list' + + # 定时同步每日刀具型号 + def sync_tool_model(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_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: + _logger.info('result:%s' % result) + for item in result['mrs_cutting_tool_model_yesterday_list']: + mrs_cutting_tool_model_blade_cutter_bar_ids_list = [] + if item.get('mrs_cutting_tool_model_blade_cutter_bar_ids'): + for mrs_cutting_tool_model_blade_cutter_bar_id in item[ + 'mrs_cutting_tool_model_blade_cutter_bar_ids']: + mrs_cutting_tool_model_blade_cutter_bar_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_blade_cutter_bar_id)]).id) + mrs_cutting_tool_model_blade_cutter_pad_ids_list = [] + if item.get('mrs_cutting_tool_model_blade_cutter_pad_ids'): + for mrs_cutting_tool_model_blade_cutter_pad_id in item[ + 'mrs_cutting_tool_model_blade_cutter_pad_ids']: + mrs_cutting_tool_model_blade_cutter_pad_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_blade_cutter_pad_id)]).id) + mrs_cutting_tool_model_bar_blade_ids_list = [] + if item.get('mrs_cutting_tool_model_bar_blade_ids'): + for mrs_cutting_tool_model_bar_blade_id in item['mrs_cutting_tool_model_bar_blade_ids']: + mrs_cutting_tool_model_bar_blade_ids_list.append(self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_bar_blade_id)]).id) + mrs_cutting_tool_model_pad_blade_ids_list = [] + if item.get('mrs_cutting_tool_model_pad_blade_ids'): + for mrs_cutting_tool_model_pad_blade_id in item['mrs_cutting_tool_model_pad_blade_ids']: + mrs_cutting_tool_model_pad_blade_ids_list.append(self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_pad_blade_id)]).id) + mrs_cutting_tool_model_handle_chuck_model_ids_list = [] + if item.get('mrs_cutting_tool_model_handle_chuck_model_ids'): + for mrs_cutting_tool_model_handle_chuck_model_id in item[ + 'mrs_cutting_tool_model_handle_chuck_model_ids']: + mrs_cutting_tool_model_handle_chuck_model_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_handle_chuck_model_id)]).id) + mrs_cutting_tool_model_chuck_handle_model_ids_list = [] + if item.get('mrs_cutting_tool_model_chuck_handle_model_ids'): + for mrs_cutting_tool_model_chuck_handle_model_id in item['mrs_cutting_tool_model_chuck_handle_model_ids']: + mrs_cutting_tool_model_chuck_handle_model_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_chuck_handle_model_id)]).id) + if item: + brand = self.env['sf.cutting.tool.model'].search( + [("code", '=', item['code'])]) + if item.get('image'): + image = base64.b64decode(item['image']) + else: + image = '' + if not brand: + new_record = self.env['sf.cutting.tool.model'].create({ + "name": item['name'], + "code": item['code'], + "mrs_machine_brand_id": self.env['sf.machine.brand'].search( + [("code", '=', item['mrs_machine_brand_id'])]).id, + "mrs_materials_model_id": self.env['sf.materials.model'].search( + [("materials_no", '=', item['mrs_materials_model_id'])]).id, + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'], + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [("code", '=', item['mrs_cutting_tool_type_id'])]).id, + "integral_code": item['integral_code'], + "integral_total_length": item['integral_total_length'], + "integral_shank_length": item['integral_shank_length'], + "integral_blade_length": item['integral_blade_length'], + "integral_diameter": item['integral_diameter'], + "integral_blade_number": item['integral_blade_number'], + "integral_front_angle": item['integral_front_angle'], + "integral_rear_angle": item['integral_rear_angle'], + "integral_main_included_angle": item['integral_main_included_angle'], + "integral_nut": item['integral_nut'], + "integral_scope": item['integral_scope'], + "blade_code": item['blade_code'], + "blade_length": item['blade_length'], + "blade_width": item['blade_width'], + "blade_height": item['blade_height'], + "blade_top_angle": item['blade_top_angle'], + "blade_front_angle": item['blade_front_angle'], + "blade_rear_angle": item['blade_rear_angle'], + "blade_main_included_angle": item['blade_main_included_angle'], + "blade_r_angle": item['blade_r_angle'], + "blade_hardness": item['blade_hardness'], + "blade_radius": item['blade_radius'], + "blade_nut": item['blade_nut'], + "mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list, + "mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list, + "bar_code": item['bar_code'], + "bar_c_diameter": item['bar_c_diameter'], + "bar_total_length": item['bar_total_length'], + "bar_blade_number": item['bar_blade_number'], + "bar_d_diameter": item['bar_d_diameter'], + "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list, + "bar_wrench": item['bar_wrench'], + "bar_screw": item['bar_screw'], + "bar_radius": item['bar_radius'], + "bar_accuracy": item['bar_accuracy'], + "bar_hardness": item['bar_hardness'], + "bar_scope": item['bar_scope'], + "pad_code": item['pad_code'], + "pad_c_diameter": item['pad_c_diameter'], + "pad_total_length": item['pad_total_length'], + "pad_blade_number": item['pad_blade_number'], + "pad_d_diameter": item['pad_d_diameter'], + "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list, + "pad_wrench": item['pad_wrench'], + "pad_screw": item['pad_screw'], + "pad_radius": item['pad_radius'], + "pad_accuracy": item['pad_accuracy'], + "pad_hardness": item['pad_hardness'], + "pad_scope": item['pad_scope'], + "handle_code": item['handle_code'], + "handle_length": item['handle_length'], + "handle_length1": item['handle_length1'], + "handle_diameter1": item['handle_diameter1'], + "handle_weight": item['handle_weight'], + "handle_body_accuracy": item['handle_body_accuracy'], + "handle_nut": item['handle_nut'], + "mrs_cutting_tool_model_handle_chuck_model_ids": [(6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)], + "handle_clamping_range": item['handle_clamping_range'], + "handle_detection_accuracy": item['handle_detection_accuracy'], + "handle_detection_hardness": item['handle_detection_hardness'], + "handle_standard_speed": item['handle_standard_speed'], + "chuck_code": item['chuck_code'], + "chuck_accuracy": item['chuck_accuracy'], + "chuck_diameter": item['chuck_diameter'], + "chuck_inner_diameter": item['chuck_inner_diameter'], + "chuck_height": item['chuck_height'], + "chuck_nut": item['chuck_nut'], + "mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list, + "chuck_clamping_range": item['chuck_clamping_range'], + "chuck_feature": item['chuck_feature'], + "image": image, + "hide_integral": item['hide_integral'], + "hide_blade": item['hide_blade'], + "hide_cutter_bar": item['hide_cutter_bar'], + "hide_cutter_pad": item['hide_cutter_pad'], + "hide_handler": item['hide_handler'], + "hide_chuck": item['hide_chuck'], + "hide_model": item['hide_model'], + }) + new_record.write({ + 'mrs_cutting_tool_model_handle_chuck_model_ids': [ + (6, 0, [new_record.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))], + }) + # many2many_commands = [(0, 0, {'model_id_1': new_record.id, 'model_id_2': related_record_id}) for + # related_record_id in mrs_cutting_tool_model_handle_chuck_model_ids_list] + # new_record.write({ + # 'mrs_cutting_tool_model_handle_chuck_model_ids': many2many_commands, + # }) + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "mrs_machine_brand_id": self.env['sf.machine.brand'].search( + [("code", '=', item['mrs_machine_brand_id'])]).id, + "mrs_materials_model_id": self.env['sf.materials.model'].search( + [("materials_no", '=', item['mrs_materials_model_id'])]).id, + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'], + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [("code", '=', item['mrs_cutting_tool_type_id'])]).id, + "integral_code": item['integral_code'], + "integral_total_length": item['integral_total_length'], + "integral_shank_length": item['integral_shank_length'], + "integral_blade_length": item['integral_blade_length'], + "integral_diameter": item['integral_diameter'], + "integral_blade_number": item['integral_blade_number'], + "integral_front_angle": item['integral_front_angle'], + "integral_rear_angle": item['integral_rear_angle'], + "integral_main_included_angle": item['integral_main_included_angle'], + "integral_nut": item['integral_nut'], + "integral_scope": item['integral_scope'], + "blade_code": item['blade_code'], + "blade_length": item['blade_length'], + "blade_width": item['blade_width'], + "blade_height": item['blade_height'], + "blade_top_angle": item['blade_top_angle'], + "blade_front_angle": item['blade_front_angle'], + "blade_rear_angle": item['blade_rear_angle'], + "blade_main_included_angle": item['blade_main_included_angle'], + "blade_r_angle": item['blade_r_angle'], + "blade_hardness": item['blade_hardness'], + "blade_radius": item['blade_radius'], + "blade_nut": item['blade_nut'], + "mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list, + "mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list, + "bar_code": item['bar_code'], + "bar_c_diameter": item['bar_c_diameter'], + "bar_total_length": item['bar_total_length'], + "bar_blade_number": item['bar_blade_number'], + "bar_d_diameter": item['bar_d_diameter'], + "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list, + "bar_wrench": item['bar_wrench'], + "bar_screw": item['bar_screw'], + "bar_radius": item['bar_radius'], + "bar_accuracy": item['bar_accuracy'], + "bar_hardness": item['bar_hardness'], + "bar_scope": item['bar_scope'], + "pad_code": item['pad_code'], + "pad_c_diameter": item['pad_c_diameter'], + "pad_total_length": item['pad_total_length'], + "pad_blade_number": item['pad_blade_number'], + "pad_d_diameter": item['pad_d_diameter'], + "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list, + "pad_wrench": item['pad_wrench'], + "pad_screw": item['pad_screw'], + "pad_radius": item['pad_radius'], + "pad_accuracy": item['pad_accuracy'], + "pad_hardness": item['pad_hardness'], + "pad_scope": item['pad_scope'], + "handle_code": item['handle_code'], + "handle_length": item['handle_length'], + "handle_length1": item['handle_length1'], + "handle_diameter1": item['handle_diameter1'], + "handle_weight": item['handle_weight'], + "handle_body_accuracy": item['handle_body_accuracy'], + "handle_nut": item['handle_nut'], + "mrs_cutting_tool_model_handle_chuck_model_ids": [(6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)], + "handle_clamping_range": item['handle_clamping_range'], + "handle_detection_accuracy": item['handle_detection_accuracy'], + "handle_detection_hardness": item['handle_detection_hardness'], + "handle_standard_speed": item['handle_standard_speed'], + "chuck_code": item['chuck_code'], + "chuck_accuracy": item['chuck_accuracy'], + "chuck_diameter": item['chuck_diameter'], + "chuck_inner_diameter": item['chuck_inner_diameter'], + "chuck_height": item['chuck_height'], + "chuck_nut": item['chuck_nut'], + "mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list, + "chuck_clamping_range": item['chuck_clamping_range'], + "chuck_feature": item['chuck_feature'], + "image": image, + "hide_integral": item['hide_integral'], + "hide_blade": item['hide_blade'], + "hide_cutter_bar": item['hide_cutter_bar'], + "hide_cutter_pad": item['hide_cutter_pad'], + "hide_handler": item['hide_handler'], + "hide_chuck": item['hide_chuck'], + "hide_model": item['hide_model'], + }) + brand.write({ + 'mrs_cutting_tool_model_handle_chuck_model_ids': [ + (6, 0, [brand.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))], + }) + # many2many_commands = [(0, 0, {'model_id_1': brand.id, 'model_id_2': related_record_id}) for + # related_record_id in mrs_cutting_tool_model_handle_chuck_model_ids_list] + # brand.write({ + # 'mrs_cutting_tool_model_handle_chuck_model_ids': many2many_commands, + # }) + print('同步所有刀柄类型列表成功') + else: + raise ValidationError("认证未通过") + + # 同步所有刀具型号列表 + def sync_all_tool_model(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + + strUrl = sf_sync_config['sf_url'] + self.url + r = requests.post(strUrl, json={}, data=None, headers=headers) + r = r.json() + result = json.loads(r['result']) + print('result', result) + if result['status'] == 1: + _logger.info('result:%s' % result) + for item in result['mrs_cutting_tool_model_all_list']: + mrs_cutting_tool_model_blade_cutter_bar_ids_list = [] + if item.get('mrs_cutting_tool_model_blade_cutter_bar_ids'): + for mrs_cutting_tool_model_blade_cutter_bar_id in item[ + 'mrs_cutting_tool_model_blade_cutter_bar_ids']: + mrs_cutting_tool_model_blade_cutter_bar_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_blade_cutter_bar_id)]).id) + mrs_cutting_tool_model_blade_cutter_pad_ids_list = [] + if item.get('mrs_cutting_tool_model_blade_cutter_pad_ids'): + for mrs_cutting_tool_model_blade_cutter_pad_id in item[ + 'mrs_cutting_tool_model_blade_cutter_pad_ids']: + mrs_cutting_tool_model_blade_cutter_pad_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_blade_cutter_pad_id)]).id) + mrs_cutting_tool_model_bar_blade_ids_list = [] + if item.get('mrs_cutting_tool_model_bar_blade_ids'): + for mrs_cutting_tool_model_bar_blade_id in item['mrs_cutting_tool_model_bar_blade_ids']: + mrs_cutting_tool_model_bar_blade_ids_list.append(self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_bar_blade_id)]).id) + mrs_cutting_tool_model_pad_blade_ids_list = [] + if item.get('mrs_cutting_tool_model_pad_blade_ids'): + for mrs_cutting_tool_model_pad_blade_id in item['mrs_cutting_tool_model_pad_blade_ids']: + mrs_cutting_tool_model_pad_blade_ids_list.append(self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_pad_blade_id)]).id) + mrs_cutting_tool_model_handle_chuck_model_ids_list = [] + if item.get('mrs_cutting_tool_model_handle_chuck_model_ids'): + for mrs_cutting_tool_model_handle_chuck_model_id in item[ + 'mrs_cutting_tool_model_handle_chuck_model_ids']: + mrs_cutting_tool_model_handle_chuck_model_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_handle_chuck_model_id)]).id) + mrs_cutting_tool_model_chuck_handle_model_ids_list = [] + if item.get('mrs_cutting_tool_model_chuck_handle_model_ids'): + for mrs_cutting_tool_model_chuck_handle_model_id in item[ + 'mrs_cutting_tool_model_chuck_handle_model_ids']: + mrs_cutting_tool_model_chuck_handle_model_ids_list.append( + self.env['sf.cutting.tool.model'].search( + [("code", '=', mrs_cutting_tool_model_chuck_handle_model_id)]).id) + if item: + brand = self.env['sf.cutting.tool.model'].search( + [("code", '=', item['code'])]) + if item.get('image'): + image = base64.b64decode(item['image']) + else: + image = '' + if not brand: + new_record = self.env['sf.cutting.tool.model'].create({ + "name": item['name'], + "code": item['code'], + "mrs_machine_brand_id": self.env['sf.machine.brand'].search( + [("code", '=', item['mrs_machine_brand_id'])]).id, + "mrs_materials_model_id": self.env['sf.materials.model'].search( + [("materials_no", '=', item['mrs_materials_model_id'])]).id, + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'], + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [("code", '=', item['mrs_cutting_tool_type_id'])]).id, + "integral_code": item['integral_code'], + "integral_total_length": item['integral_total_length'], + "integral_shank_length": item['integral_shank_length'], + "integral_blade_length": item['integral_blade_length'], + "integral_diameter": item['integral_diameter'], + "integral_blade_number": item['integral_blade_number'], + "integral_front_angle": item['integral_front_angle'], + "integral_rear_angle": item['integral_rear_angle'], + "integral_main_included_angle": item['integral_main_included_angle'], + "integral_nut": item['integral_nut'], + "integral_scope": item['integral_scope'], + "blade_code": item['blade_code'], + "blade_length": item['blade_length'], + "blade_width": item['blade_width'], + "blade_height": item['blade_height'], + "blade_top_angle": item['blade_top_angle'], + "blade_front_angle": item['blade_front_angle'], + "blade_rear_angle": item['blade_rear_angle'], + "blade_main_included_angle": item['blade_main_included_angle'], + "blade_r_angle": item['blade_r_angle'], + "blade_hardness": item['blade_hardness'], + "blade_radius": item['blade_radius'], + "blade_nut": item['blade_nut'], + "mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list, + "mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list, + "bar_code": item['bar_code'], + "bar_c_diameter": item['bar_c_diameter'], + "bar_total_length": item['bar_total_length'], + "bar_blade_number": item['bar_blade_number'], + "bar_d_diameter": item['bar_d_diameter'], + "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list, + "bar_wrench": item['bar_wrench'], + "bar_screw": item['bar_screw'], + "bar_radius": item['bar_radius'], + "bar_accuracy": item['bar_accuracy'], + "bar_hardness": item['bar_hardness'], + "bar_scope": item['bar_scope'], + "pad_code": item['pad_code'], + "pad_c_diameter": item['pad_c_diameter'], + "pad_total_length": item['pad_total_length'], + "pad_blade_number": item['pad_blade_number'], + "pad_d_diameter": item['pad_d_diameter'], + "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list, + "pad_wrench": item['pad_wrench'], + "pad_screw": item['pad_screw'], + "pad_radius": item['pad_radius'], + "pad_accuracy": item['pad_accuracy'], + "pad_hardness": item['pad_hardness'], + "pad_scope": item['pad_scope'], + "handle_code": item['handle_code'], + "handle_length": item['handle_length'], + "handle_length1": item['handle_length1'], + "handle_diameter1": item['handle_diameter1'], + "handle_weight": item['handle_weight'], + "handle_body_accuracy": item['handle_body_accuracy'], + "handle_nut": item['handle_nut'], + # "mrs_cutting_tool_model_handle_chuck_model_ids": [(6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)], + "handle_clamping_range": item['handle_clamping_range'], + "handle_detection_accuracy": item['handle_detection_accuracy'], + "handle_detection_hardness": item['handle_detection_hardness'], + "handle_standard_speed": item['handle_standard_speed'], + "chuck_code": item['chuck_code'], + "chuck_accuracy": item['chuck_accuracy'], + "chuck_diameter": item['chuck_diameter'], + "chuck_inner_diameter": item['chuck_inner_diameter'], + "chuck_height": item['chuck_height'], + "chuck_nut": item['chuck_nut'], + "mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list, + "chuck_clamping_range": item['chuck_clamping_range'], + "chuck_feature": item['chuck_feature'], + "image": image, + "hide_integral": item['hide_integral'], + "hide_blade": item['hide_blade'], + "hide_cutter_bar": item['hide_cutter_bar'], + "hide_cutter_pad": item['hide_cutter_pad'], + "hide_handler": item['hide_handler'], + "hide_chuck": item['hide_chuck'], + "hide_model": item['hide_model'], + }) + new_record.write({ + 'mrs_cutting_tool_model_handle_chuck_model_ids': [ + (6, 0, [new_record.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))], + }) + + else: + brand.write({ + "name": item['name'], + "code": item['code'], + "mrs_machine_brand_id": self.env['sf.machine.brand'].search( + [("code", '=', item['mrs_machine_brand_id'])]).id, + "mrs_materials_model_id": self.env['sf.materials.model'].search( + [("materials_no", '=', item['mrs_materials_model_id'])]).id, + "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search( + [("code", '=', item['mrs_cutting_tool_material_id'])]).id, + "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'], + "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( + [("code", '=', item['mrs_cutting_tool_type_id'])]).id, + "integral_code": item['integral_code'], + "integral_total_length": item['integral_total_length'], + "integral_shank_length": item['integral_shank_length'], + "integral_blade_length": item['integral_blade_length'], + "integral_diameter": item['integral_diameter'], + "integral_blade_number": item['integral_blade_number'], + "integral_front_angle": item['integral_front_angle'], + "integral_rear_angle": item['integral_rear_angle'], + "integral_main_included_angle": item['integral_main_included_angle'], + "integral_nut": item['integral_nut'], + "integral_scope": item['integral_scope'], + "blade_code": item['blade_code'], + "blade_length": item['blade_length'], + "blade_width": item['blade_width'], + "blade_height": item['blade_height'], + "blade_top_angle": item['blade_top_angle'], + "blade_front_angle": item['blade_front_angle'], + "blade_rear_angle": item['blade_rear_angle'], + "blade_main_included_angle": item['blade_main_included_angle'], + "blade_r_angle": item['blade_r_angle'], + "blade_hardness": item['blade_hardness'], + "blade_radius": item['blade_radius'], + "blade_nut": item['blade_nut'], + "mrs_cutting_tool_model_blade_cutter_bar_ids": mrs_cutting_tool_model_blade_cutter_bar_ids_list, + "mrs_cutting_tool_model_blade_cutter_pad_ids": mrs_cutting_tool_model_blade_cutter_pad_ids_list, + "bar_code": item['bar_code'], + "bar_c_diameter": item['bar_c_diameter'], + "bar_total_length": item['bar_total_length'], + "bar_blade_number": item['bar_blade_number'], + "bar_d_diameter": item['bar_d_diameter'], + "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list, + "bar_wrench": item['bar_wrench'], + "bar_screw": item['bar_screw'], + "bar_radius": item['bar_radius'], + "bar_accuracy": item['bar_accuracy'], + "bar_hardness": item['bar_hardness'], + "bar_scope": item['bar_scope'], + "pad_code": item['pad_code'], + "pad_c_diameter": item['pad_c_diameter'], + "pad_total_length": item['pad_total_length'], + "pad_blade_number": item['pad_blade_number'], + "pad_d_diameter": item['pad_d_diameter'], + "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list, + "pad_wrench": item['pad_wrench'], + "pad_screw": item['pad_screw'], + "pad_radius": item['pad_radius'], + "pad_accuracy": item['pad_accuracy'], + "pad_hardness": item['pad_hardness'], + "pad_scope": item['pad_scope'], + "handle_code": item['handle_code'], + "handle_length": item['handle_length'], + "handle_length1": item['handle_length1'], + "handle_diameter1": item['handle_diameter1'], + "handle_weight": item['handle_weight'], + "handle_body_accuracy": item['handle_body_accuracy'], + "handle_nut": item['handle_nut'], + "mrs_cutting_tool_model_handle_chuck_model_ids": [(6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)], + "handle_clamping_range": item['handle_clamping_range'], + "handle_detection_accuracy": item['handle_detection_accuracy'], + "handle_detection_hardness": item['handle_detection_hardness'], + "handle_standard_speed": item['handle_standard_speed'], + "chuck_code": item['chuck_code'], + "chuck_accuracy": item['chuck_accuracy'], + "chuck_diameter": item['chuck_diameter'], + "chuck_inner_diameter": item['chuck_inner_diameter'], + "chuck_height": item['chuck_height'], + "chuck_nut": item['chuck_nut'], + "mrs_cutting_tool_model_chuck_handle_model_ids": mrs_cutting_tool_model_chuck_handle_model_ids_list, + "chuck_clamping_range": item['chuck_clamping_range'], + "chuck_feature": item['chuck_feature'], + "image": image, + "hide_integral": item['hide_integral'], + "hide_blade": item['hide_blade'], + "hide_cutter_bar": item['hide_cutter_bar'], + "hide_cutter_pad": item['hide_cutter_pad'], + "hide_handler": item['hide_handler'], + "hide_chuck": item['hide_chuck'], + "hide_model": item['hide_model'], + }) + brand.write({ + 'mrs_cutting_tool_model_handle_chuck_model_ids': [ + (6, 0, [brand.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))], + }) + # many2many_commands = [(0, 0, {'model_id_1': brand.id, 'model_id_2': related_record_id}) for + # related_record_id in mrs_cutting_tool_model_handle_chuck_model_ids_list] + # brand.write({ + # 'mrs_cutting_tool_model_handle_chuck_model_ids': many2many_commands, + # }) + print('同步所有刀具型号列表成功') + else: + raise ValidationError("认证未通过")