From 6caae0325a5cc96b208caae9ed1a0832ee70b0cf Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Tue, 20 Jun 2023 16:51:06 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=88=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E5=92=8CCAM=E5=B7=A5=E5=8D=95=E7=A8=8B=E5=BA=8F=E7=94=A8?=
=?UTF-8?q?=E5=88=80=E8=AE=A1=E5=88=92=EF=BC=89=E8=A7=86=E5=9B=BE=E5=B7=B2?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 101 +++++++++++++++++-
.../security/ir.model.access.csv | 2 +
sf_tool_management/views/menu_view.xml | 23 ++++
sf_tool_management/views/tool_base_views.xml | 85 ++++++++++++++-
4 files changed, 208 insertions(+), 3 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index ae13cb56..8932b3a3 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -26,7 +26,7 @@ class FunctionalCuttingToolEntity(models.Model):
remark = fields.Char('备注')
# 功能刀具出入库记录 特有字段
- thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '细')], string='粗/中/细')
+ thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精')
max_life_span = fields.Char(string='最大寿命值')
# alarm_value = fields.Char(string='报警值')
# used_value = fields.Char(string='已使用值')
@@ -56,7 +56,8 @@ class FunctionalCuttingToolEntity(models.Model):
return_processing_num = fields.Text(string='归还需磨削数量')
return_total = fields.Text(string='合计')
total = fields.Text(string='总计')
- # remark = fields.Text(string='备注/说明')
+
+ # remark = fields.Char(string='备注/说明')
# @api.onchange('functional_cutting_tool_id')
# def get_functional_cutting_tool_info(self):
@@ -97,3 +98,99 @@ class FunctionalCuttingToolEntity(models.Model):
else:
new_code = '001'
return new_code
+
+
+class MachineTableToolChangingApply(models.Model):
+ _name = 'sf.machine.table.tool.changing.apply'
+ _description = '机床换刀申请'
+
+ CNC_machine_table = fields.Char(string='CNC机床')
+ # todo 机床类型和刀位号 为 Many2one
+ machine_table_type = fields.Char(string='机床类型')
+ cutter_spacing_code = fields.Char(string='刀位号')
+ functional_tool_code = fields.Char(string='功能刀具编码')
+ functional_tool_name = fields.Char(string='功能刀具名称')
+ # todo 功能刀具类型为 Many2one
+ functional_tool_type = fields.Char(string='功能刀具类型')
+ diameter = fields.Char(string='直径')
+ coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
+ hilt_name = fields.Char(string='刀柄名称')
+ hilt_code = fields.Char(string='刀柄编号')
+ max_lifetime_value = fields.Char(string='最大寿命值')
+ alarm_value = fields.Char(string='报警值')
+ used_value = fields.Char(string='已使用值')
+ functional_tool_status = fields.Selection([("0", "正常"), ('1', '异常')], string='功能刀具状态')
+
+ replacement_tool_code = fields.Char(string='待换刀具编码')
+ replacement_tool_name = fields.Char(string='待换刀具名称')
+ replacement_tool_type = fields.Char(string='待换刀具类型')
+ replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
+ string='粗/中/精')
+ new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
+ applicant = fields.Char(string='申请人')
+ used_tool_time = fields.Datetime(string='用刀时间')
+ reason_for_applying = fields.Char(string='申请原因')
+ remark = fields.Char(string='备注说明')
+
+ def sync_tool_entity_from_tool_changing_apply_table(self):
+ """
+ ‘功能刀具预警’数据同步到‘机床换刀申请’
+ """
+ # 获取源表中的所有记录
+ source_records = self.env['sf.functional.cutting.tool.entity'].search([])
+
+ # 循环遍历每个记录
+ for source_record in source_records:
+ # 检查目标表中是否存在相同的记录
+ destination_record = self.search([('CNC_machine_table', '=', source_record.machine_tool_code)])
+ if destination_record:
+ # 如果目标表中已经存在相同的记录，则更新该记录
+ # todo
+ destination_record.name = source_record.name
+ else:
+ # 如果目标表中不存在相同的记录，则创建一个新记录
+ destination_record = self.create({
+ # todo
+ # 'name': source_record.name,
+ })
+
+ # todo
+ def tool_changing_apply(self):
+ """
+ 换刀申请（按键）
+ """
+
+ # todo
+ def transfer(self):
+ """
+ 转移（按键）
+ """
+
+
+class CAMWorkOrderProgramKnifePlan(models.Model):
+ _name = 'sf.cam.work.order.program.knife.plan'
+ _description = 'CAM工单程序用刀计划'
+
+ CAM_cutter_spacing_code = fields.Char(string='CAM刀位号')
+ functional_tool_code = fields.Char(string='功能刀具编码')
+ functional_tool_name = fields.Char(string='功能刀具名称')
+ functional_tool_type = fields.Char(string='功能刀具类型')
+ machine_table_name = fields.Char(string='机台名称')
+ diameter = fields.Char(string='直径（程式）')
+ tool_loading_length = fields.Char(string='装刀长')
+ clearance_length = fields.Char(string='避空长')
+ tool_included_angle = fields.Char(string='刀尖角（R角）')
+ L_D = fields.Char(string='L/D')
+ coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
+ required_cutting_time = fields.Char(string='需要切割时间')
+ whether_standard_tool = fields.Boolean(string='是否标准刀')
+ need_knife_time = fields.Datetime(string='需要用刀时间')
+ applicant = fields.Char(string='申请人')
+ reason_for_applying = fields.Char(string='申请原因')
+ remark = fields.Char(string='备注说明')
+
+ # todo
+ def tool_loading_apply(self):
+ """
+ 装刀申请（按键）
+ """
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 3156f716..7b514b89 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -1,5 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,1
+access_sf_cam_work_order_program_knife_plan,sf.cam.work.order.program.knife.plan,model_sf_cam_work_order_program_knife_plan,base.group_user,1,1,1,1
+access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,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 2abf6a11..b0fc131c 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -49,5 +49,28 @@
parent="menu_sf_tool_manage"
/>
+
+
+
+
+
+
\ 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 962759f4..baeb0882 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -36,7 +36,7 @@
-
+
功能刀具出入库记录
sf.functional.cutting.tool.entity
@@ -142,5 +142,88 @@
+
+
+
+ CAM工单程序用刀计划
+ sf.cam.work.order.program.knife.plan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CAM工单程序用刀计划
+ ir.actions.act_window
+ sf.cam.work.order.program.knife.plan
+ tree,form
+
+
+
+
+
+ 机床换刀申请
+ sf.machine.table.tool.changing.apply
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 机床换刀申请
+ ir.actions.act_window
+ sf.machine.table.tool.changing.apply
+ tree,form
+
+
+
+
From f135f0a5e7e14dbcb52b87c517cf9a54fe9ba8ca Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Wed, 21 Jun 2023 17:21:58 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E5=BC=B9?=
=?UTF-8?q?=E7=AA=97=E6=8D=A2=E5=88=80=E9=9C=80=E6=B1=82=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E7=9A=84=E8=A7=86=E5=9B=BE=E5=92=8C=E9=BB=98=E8=AE=A4=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/__init__.py | 1 +
sf_tool_management/__manifest__.py | 2 +-
sf_tool_management/models/base.py | 19 ++++---
.../security/ir.model.access.csv | 3 +
sf_tool_management/views/tool_base_views.xml | 23 +++++++-
sf_tool_management/wizard/__init__.py | 1 +
sf_tool_management/wizard/wizard.py | 35 ++++++++++++
sf_tool_management/wizard/wizard_view.xml | 57 +++++++++++++++++++
8 files changed, 129 insertions(+), 12 deletions(-)
create mode 100644 sf_tool_management/wizard/__init__.py
create mode 100644 sf_tool_management/wizard/wizard.py
create mode 100644 sf_tool_management/wizard/wizard_view.xml
diff --git a/sf_tool_management/__init__.py b/sf_tool_management/__init__.py
index c081ee06..c9ba0265 100644
--- a/sf_tool_management/__init__.py
+++ b/sf_tool_management/__init__.py
@@ -1,2 +1,3 @@
# -*-coding:utf-8-*-
from . import models
+from . import wizard
diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index 8368f528..6fbf1152 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -14,9 +14,9 @@
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',
+ 'wizard/wizard_view.xml',
'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 8932b3a3..a33c7df1 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -104,9 +104,12 @@ class MachineTableToolChangingApply(models.Model):
_name = 'sf.machine.table.tool.changing.apply'
_description = '机床换刀申请'
+ apply_to_tool_change_ids = fields.One2many('sf.tool.change.requirement.information', 'tool_change_to_apply_id', string='换刀需求信息')
+
CNC_machine_table = fields.Char(string='CNC机床')
# todo 机床类型和刀位号 为 Many2one
machine_table_type = fields.Char(string='机床类型')
+ machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}")
cutter_spacing_code = fields.Char(string='刀位号')
functional_tool_code = fields.Char(string='功能刀具编码')
functional_tool_name = fields.Char(string='功能刀具名称')
@@ -119,7 +122,7 @@ class MachineTableToolChangingApply(models.Model):
max_lifetime_value = fields.Char(string='最大寿命值')
alarm_value = fields.Char(string='报警值')
used_value = fields.Char(string='已使用值')
- functional_tool_status = fields.Selection([("0", "正常"), ('1', '异常')], string='功能刀具状态')
+ functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态')
replacement_tool_code = fields.Char(string='待换刀具编码')
replacement_tool_name = fields.Char(string='待换刀具名称')
@@ -154,12 +157,6 @@ class MachineTableToolChangingApply(models.Model):
# 'name': source_record.name,
})
- # todo
- def tool_changing_apply(self):
- """
- 换刀申请（按键）
- """
-
# todo
def transfer(self):
"""
@@ -171,11 +168,14 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
_name = 'sf.cam.work.order.program.knife.plan'
_description = 'CAM工单程序用刀计划'
- CAM_cutter_spacing_code = fields.Char(string='CAM刀位号')
+ ticket_task_code = fields.Char(string='工单任务编号')
+ cam_procedure_code = fields.Char(string='CAM程序编号')
+ cam_cutter_spacing_code = fields.Char(string='CAM刀位号')
functional_tool_code = fields.Char(string='功能刀具编码')
functional_tool_name = fields.Char(string='功能刀具名称')
functional_tool_type = fields.Char(string='功能刀具类型')
- machine_table_name = fields.Char(string='机台名称')
+ machine_table_name = fields.Char(string='机床名称')
+ machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号')
diameter = fields.Char(string='直径（程式）')
tool_loading_length = fields.Char(string='装刀长')
clearance_length = fields.Char(string='避空长')
@@ -185,6 +185,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
required_cutting_time = fields.Char(string='需要切割时间')
whether_standard_tool = fields.Boolean(string='是否标准刀')
need_knife_time = fields.Datetime(string='需要用刀时间')
+ plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态')
applicant = fields.Char(string='申请人')
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 7b514b89..ebc4d2db 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -4,6 +4,9 @@ access_sf_cam_work_order_program_knife_plan,sf.cam.work.order.program.knife.plan
access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,base.group_user,1,1,1,1
+access_sf_tool_change_requirement_information,sf.tool.change.requirement.information,model_sf_tool_change_requirement_information,base.group_user,1,1,1,1
+
+
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index baeb0882..6637d0e9 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -149,11 +149,14 @@
sf.cam.work.order.program.knife.plan
-
+
+
+
+
@@ -163,6 +166,7 @@
+
@@ -186,6 +190,7 @@
+
@@ -200,7 +205,17 @@
-
+
@@ -216,6 +231,10 @@
+
+
+
+
机床换刀申请
ir.actions.act_window
diff --git a/sf_tool_management/wizard/__init__.py b/sf_tool_management/wizard/__init__.py
new file mode 100644
index 00000000..20a7f5c4
--- /dev/null
+++ b/sf_tool_management/wizard/__init__.py
@@ -0,0 +1 @@
+from . import wizard
\ No newline at end of file
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
new file mode 100644
index 00000000..3f4a0734
--- /dev/null
+++ b/sf_tool_management/wizard/wizard.py
@@ -0,0 +1,35 @@
+from odoo import fields, models, api
+
+
+class ToolChangeRequirementInformation(models.TransientModel):
+ _name = 'sf.tool.change.requirement.information'
+ _description = '换刀需求信息'
+
+ tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请')
+
+ CNC_machine_table = fields.Char(string='CNC机床', readonly=True)
+ machine_tool_code = fields.Char(string='机台号', readonly=True)
+ cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
+
+ replacement_tool_code = fields.Char(string='待换刀具编码')
+ replacement_tool_name = fields.Char(string='待换刀具名称')
+ replacement_tool_type = fields.Char(string='待换刀具类型')
+ replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
+ string='粗/中/精')
+ new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
+ applicant = fields.Char(string='申请人')
+ used_tool_time = fields.Datetime(string='用刀时间')
+ reason_for_applying = fields.Char(string='申请原因')
+ remark = fields.Char(string='备注说明')
+
+ # todo 未完成
+ def tool_changing_apply(self):
+ """
+ 确认换刀申请（按键）
+ """
+ # 将数据更新到换刀申请
+ self.tool_change_to_apply_id.write({'replacement_tool_name': self.replacement_tool_name})
+ self.env.cr.commit()
+
+ # 关闭弹出窗口
+ return {'type': 'ir.actions.act_window_close'}
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
new file mode 100644
index 00000000..8cdb7998
--- /dev/null
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -0,0 +1,57 @@
+
+
+
+ 换刀需求信息
+ sf.tool.change.requirement.information
+
+
+
+
+
+
+ 换刀需求信息
+ ir.actions.act_window
+ sf.tool.change.requirement.information
+ form
+
+ new
+
+
+
\ No newline at end of file
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 3/9] =?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("认证未通过")
From c37166397e1fa5a7dbd354ae80cac87cf0fc9c10 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Sun, 25 Jun 2023 17:36:33 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=9C=BA?=
=?UTF-8?q?=E5=8F=B0=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E7=9A=84=E6=8D=A2?=
=?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E6=8C=89=E9=94=AE=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=9B=9E=E6=9C=BA=E5=8F=B0?=
=?UTF-8?q?=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E7=95=8C=E9=9D=A2=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8A=E8=BD=AC=E7=A7=BB=E6=8C=89=E9=94=AE=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E3=80=81CAM=E5=B7=A5=E5=8D=95=E7=A8=8B=E5=BA=8F=E7=94=A8?=
=?UTF-8?q?=E5=88=80=E8=AE=A1=E5=88=92=E7=9A=84=E7=94=B3=E8=AF=B7=E8=A3=85?=
=?UTF-8?q?=E5=88=80=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 89 ++++++----
.../security/ir.model.access.csv | 2 +
sf_tool_management/views/tool_base_views.xml | 152 +++++++++++-------
sf_tool_management/wizard/wizard.py | 96 ++++++++++-
sf_tool_management/wizard/wizard_view.xml | 123 ++++++++++++++
5 files changed, 369 insertions(+), 93 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index a33c7df1..d4d1a7ba 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -104,7 +104,11 @@ class MachineTableToolChangingApply(models.Model):
_name = 'sf.machine.table.tool.changing.apply'
_description = '机床换刀申请'
- apply_to_tool_change_ids = fields.One2many('sf.tool.change.requirement.information', 'tool_change_to_apply_id', string='换刀需求信息')
+ apply_to_tool_change_ids = fields.One2many(
+ 'sf.tool.change.requirement.information',
+ 'tool_change_to_apply_id',
+ string='换刀需求信息',
+ attrs="{'invisible': 1}")
CNC_machine_table = fields.Char(string='CNC机床')
# todo 机床类型和刀位号 为 Many2one
@@ -135,32 +139,61 @@ class MachineTableToolChangingApply(models.Model):
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
- def sync_tool_entity_from_tool_changing_apply_table(self):
- """
- ‘功能刀具预警’数据同步到‘机床换刀申请’
- """
- # 获取源表中的所有记录
- source_records = self.env['sf.functional.cutting.tool.entity'].search([])
+ # def sync_tool_entity_from_tool_changing_apply_table(self):
+ # """
+ # ‘功能刀具预警’数据同步到‘机床换刀申请’
+ # """
+ # # 获取源表中的所有记录
+ # source_records = self.env['sf.functional.cutting.tool.entity'].search([])
+ #
+ # # 循环遍历每个记录
+ # for source_record in source_records:
+ # # 检查目标表中是否存在相同的记录
+ # destination_record = self.search([('CNC_machine_table', '=', source_record.machine_tool_code)])
+ # if destination_record:
+ # # todo 如果目标表中已经存在相同的记录，则更新该记录
+ # destination_record.name = source_record.name
+ # else:
+ # # todo 如果目标表中不存在相同的记录，则创建一个新记录
+ # destination_record = self.create({
+ # # 'name': source_record.name,
+ # })
- # 循环遍历每个记录
- for source_record in source_records:
- # 检查目标表中是否存在相同的记录
- destination_record = self.search([('CNC_machine_table', '=', source_record.machine_tool_code)])
- if destination_record:
- # 如果目标表中已经存在相同的记录，则更新该记录
- # todo
- destination_record.name = source_record.name
- else:
- # 如果目标表中不存在相同的记录，则创建一个新记录
- destination_record = self.create({
- # todo
- # 'name': source_record.name,
- })
-
- # todo
- def transfer(self):
+ def amendant_record(self, vals):
"""
- 转移（按键）
+ 确认换刀申请（按键）
+ 将弹窗数据更新到记录
+ :param vals:
+ :return:
+ """
+ self.env['sf.machine.table.tool.changing.apply'].search(
+ [('CNC_machine_table', '=', vals.get('CNC_machine_table'))]).write(vals)
+
+ def revocation_1(self):
+ """
+ 换刀申请撤回按键
+ :return:
+ """
+ # 撤回数据更新
+ self.env['sf.machine.table.tool.changing.apply'].search(
+ [('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ 'replacement_tool_code': False,
+ 'replacement_tool_name': False,
+ 'replacement_tool_type': False,
+ 'replacement_tool_coarse_middle_thin': False,
+ 'new_former': False,
+ 'applicant': False,
+ 'used_tool_time': False,
+ 'reason_for_applying': False,
+ 'remark': False
+ })
+
+ # todo 撤回功能刀具组装创建新任务
+
+ def revocation_1(self):
+ """
+ 转移撤回按键
+ :return:
"""
@@ -189,9 +222,3 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
applicant = fields.Char(string='申请人')
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
-
- # todo
- def tool_loading_apply(self):
- """
- 装刀申请（按键）
- """
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index ebc4d2db..e97c88f8 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -5,6 +5,8 @@ access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply
access_sf_tool_change_requirement_information,sf.tool.change.requirement.information,model_sf_tool_change_requirement_information,base.group_user,1,1,1,1
+access_sf_tool_transfer_request_information,sf.tool.transfer.request.information,model_sf_tool_transfer_request_information,base.group_user,1,1,1,1
+access_sf_apply_for_tooling,sf.apply.for.tooling,model_sf_apply_for_tooling,base.group_user,1,1,1,1
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 6637d0e9..22c780cd 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -143,6 +143,79 @@
+
+
+ 机床换刀申请
+ sf.machine.table.tool.changing.apply
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 机床换刀申请
+ ir.actions.act_window
+ sf.machine.table.tool.changing.apply
+ tree,form
+
+
+
CAM工单程序用刀计划
@@ -170,7 +243,27 @@
-
+
@@ -183,64 +276,7 @@
-
-
- 机床换刀申请
- sf.machine.table.tool.changing.apply
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 机床换刀申请
- ir.actions.act_window
- sf.machine.table.tool.changing.apply
- tree,form
-
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 3f4a0734..60fcfd86 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -22,14 +22,102 @@ class ToolChangeRequirementInformation(models.TransientModel):
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
- # todo 未完成
def tool_changing_apply(self):
"""
- 确认换刀申请（按键）
+ 确认换刀申请（按键）
+ :return:
"""
+ # 封装数据
+ desc = {
+ 'CNC_machine_table': self.CNC_machine_table,
+ 'machine_tool_code': self.machine_tool_code,
+ 'cutter_spacing_code': self.cutter_spacing_code,
+ 'replacement_tool_code': self.replacement_tool_code,
+ 'replacement_tool_name': self.replacement_tool_name,
+ 'replacement_tool_type': self.replacement_tool_type,
+ 'replacement_tool_coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
+ 'new_former': self.new_former,
+ 'applicant': self.applicant,
+ 'used_tool_time': self.used_tool_time,
+ 'reason_for_applying': self.reason_for_applying,
+ 'remark': self.new_former
+ }
# 将数据更新到换刀申请
- self.tool_change_to_apply_id.write({'replacement_tool_name': self.replacement_tool_name})
- self.env.cr.commit()
+ self.env['sf.machine.table.tool.changing.apply'].amendant_record(desc)
+
+ # todo 功能刀具组装创建新任务
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}
+
+
+class ToolTransferRequestInformation(models.TransientModel):
+ _name = 'sf.tool.transfer.request.information'
+ _description = '刀具转移申请信息'
+
+ CNC_machine_table = fields.Char(string='CNC机床', readonly=True)
+ machine_tool_code = fields.Char(string='机台号', readonly=True)
+ cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
+ functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
+ functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
+ # todo 功能刀具类型为 Many2one
+ functional_tool_type = fields.Char(string='功能刀具类型', readonly=True)
+ transfer_target = fields.Selection([('机台', '机台'),
+ ('线边刀库', '线边刀库'),
+ ('刀具房', '刀具房')], string='转移到:', default='线边刀库')
+
+ new_cnc_machine_table = fields.Char(string='机床名称')
+ new_machine_tool_code = fields.Char(string='机床号')
+ new_cutter_spacing_code = fields.Char(string='刀位号')
+
+ magazine_tool_warehouse_district = fields.Char(string='库区')
+ magazine_tool_warehouse_position = fields.Char(string='库位')
+
+ tool_room_warehouse_district = fields.Char(string='库区')
+ tool_room_warehouse_position = fields.Char(string='库位')
+
+ def tool_transfer_apply(self):
+ """
+ 刀具转移申请信息确定按钮
+ :return:
+ """
+
+
+class ApplyForTooling(models.TransientModel):
+ _name = 'sf.apply.for.tooling'
+ _description = '申请装刀'
+
+ ticket_task_code = fields.Char(string='工单任务编号', readonly=True)
+ cam_procedure_code = fields.Char(string='CAM程序编号', readonly=True)
+ machine_table_name = fields.Char(string='机床名称', readonly=True)
+ cam_cutter_spacing_code = fields.Char(string='CAM刀位号', readonly=True)
+ functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
+ functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
+ functional_tool_type = fields.Char(string='功能刀具类型', readonly=True)
+
+ diameter = fields.Char(string='直径（程式）', readonly=True)
+ tool_loading_length = fields.Char(string='装刀长', readonly=True)
+ clearance_length = fields.Char(string='避空长', readonly=True)
+ tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True)
+ L_D = fields.Char(string='L/D', readonly=True)
+ coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
+
+ whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
+ need_knife_time = fields.Datetime(string='需要用刀时间', readonly=True)
+ required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
+ reason_for_applying = fields.Char(string='申请原因', readonly=True)
+
+ def apply_for_tooling(self):
+ """
+
+ :return:
+ """
+
+
+
+
+
+
+
+
+
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index 8cdb7998..4706f86e 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -1,5 +1,6 @@
+
换刀需求信息
sf.tool.change.requirement.information
@@ -54,4 +55,126 @@
new
+
+
+
+ 刀具转移申请信息
+ sf.tool.transfer.request.information
+
+
+
+
+
+
+ 刀具转移申请信息
+ ir.actions.act_window
+ sf.tool.transfer.request.information
+ form
+
+ new
+
+
+
+
+
+ 申请装刀
+ sf.apply.for.tooling
+
+
+
+
+
+
+ 申请装刀
+ ir.actions.act_window
+ sf.apply.for.tooling
+ form
+
+ new
+
\ No newline at end of file
From 1348712c837243c17d6cff959e9483882360095b Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Mon, 26 Jun 2023 18:10:37 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=86=E5=8A=9F=E8=83=BD=E5=88=80?=
=?UTF-8?q?=E5=85=B7=E8=AE=A1=E5=88=92=E7=9A=84=E6=8C=89=E9=94=AE=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=8C=89=E9=94=AE=E7=9A=84?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 128 +++++++++++++-----
.../security/ir.model.access.csv | 2 +
sf_tool_management/views/menu_view.xml | 9 ++
sf_tool_management/views/tool_base_views.xml | 77 ++++++++++-
sf_tool_management/wizard/wizard.py | 49 ++++++-
5 files changed, 219 insertions(+), 46 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index d4d1a7ba..333d1723 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -139,35 +139,23 @@ class MachineTableToolChangingApply(models.Model):
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
- # def sync_tool_entity_from_tool_changing_apply_table(self):
- # """
- # ‘功能刀具预警’数据同步到‘机床换刀申请’
- # """
- # # 获取源表中的所有记录
- # source_records = self.env['sf.functional.cutting.tool.entity'].search([])
- #
- # # 循环遍历每个记录
- # for source_record in source_records:
- # # 检查目标表中是否存在相同的记录
- # destination_record = self.search([('CNC_machine_table', '=', source_record.machine_tool_code)])
- # if destination_record:
- # # todo 如果目标表中已经存在相同的记录，则更新该记录
- # destination_record.name = source_record.name
- # else:
- # # todo 如果目标表中不存在相同的记录，则创建一个新记录
- # destination_record = self.create({
- # # 'name': source_record.name,
- # })
+ status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
- def amendant_record(self, vals):
+ def new_assembly_task(self,vals):
"""
- 确认换刀申请（按键）
- 将弹窗数据更新到记录
+ 新建组装任务
:param vals:
:return:
"""
- self.env['sf.machine.table.tool.changing.apply'].search(
- [('CNC_machine_table', '=', vals.get('CNC_machine_table'))]).write(vals)
+ # todo 设置直径的值
+ # tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
+ # [('CNC_machine_table', '=', vals.get('CNC_machine_table'))])
+ # for i in tool_changing_apply:
+ # print(i)
+ # vals['functional_tool_diameter'] = tool_changing_apply.diameter
+
+ self.env['sf.functional.tool.assembly'].create(vals)
+
def revocation_1(self):
"""
@@ -175,26 +163,33 @@ class MachineTableToolChangingApply(models.Model):
:return:
"""
# 撤回数据更新
- self.env['sf.machine.table.tool.changing.apply'].search(
- [('CNC_machine_table', '=', self.CNC_machine_table)]).write({
- 'replacement_tool_code': False,
- 'replacement_tool_name': False,
- 'replacement_tool_type': False,
- 'replacement_tool_coarse_middle_thin': False,
- 'new_former': False,
- 'applicant': False,
- 'used_tool_time': False,
- 'reason_for_applying': False,
- 'remark': False
+ self.env['sf.machine.table.tool.changing.apply'].search([('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ 'replacement_tool_code': None,
+ 'replacement_tool_name': None,
+ 'replacement_tool_type': None,
+ 'replacement_tool_coarse_middle_thin': None,
+ 'new_former': None,
+ 'applicant': None,
+ 'used_tool_time': None,
+ 'reason_for_applying': None,
+ 'remark': None,
+ 'status': '0'
})
- # todo 撤回功能刀具组装创建新任务
+ # 撤回功能刀具组装创建新任务
+ self.env['sf.functional.tool.assembly'].search(
+ [('functional_tool_code', '=', self.functional_tool_code)]).unlink()
- def revocation_1(self):
+
+ def revocation_2(self):
"""
转移撤回按键
:return:
"""
+ self.env['sf.machine.table.tool.changing.apply'].search(
+ [('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ 'status': '0'
+ })
class CAMWorkOrderProgramKnifePlan(models.Model):
@@ -222,3 +217,62 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
applicant = fields.Char(string='申请人')
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
+
+ def revocation(self):
+ """
+ 撤回装刀申请
+ :return:
+ """
+ self.env['sf.functional.tool.assembly'].search(
+ [('functional_tool_code', '=', self.functional_tool_code)]).unlink()
+
+ # 将计划执行状态改为待执行
+ self.env['sf.cam.work.order.program.knife.plan'].search(
+ [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '0'})
+
+
+
+
+
+class FunctionalToolAssembly(models.Model):
+ _name = 'sf.functional.tool.assembly'
+ _description = '功能刀具组装'
+
+ functional_tool_code = fields.Char(string='功能刀具编码')
+ functional_tool_name = fields.Char(string='功能刀具名称')
+ functional_tool_type = fields.Char(string='功能刀具类型')
+ functional_tool_diameter = fields.Char(string='功能刀具直径')
+ functional_tool_length = fields.Char(string='功能刀具伸出长')
+ functional_tool_cutting_type = fields.Char(string='功能刀具切削类型')
+
+ tool_name = fields.Char(string='刀具名称')
+ tool_brand = fields.Char(string='品牌')
+ tool_type = fields.Char(string='型号')
+ knife_handle_name = fields.Char(string='刀柄名称')
+ knife_handle_brand = fields.Char(string='品牌')
+ knife_handle_type = fields.Char(string='型号')
+
+ coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
+ tool_loading_length = fields.Char(string='装刀长')
+ new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
+ reference_length = fields.Char(string='参考伸出长')
+ cut_time = fields.Char(string='已切削时间')
+ cut_length = fields.Char(string='已切削长度')
+ cut_number = fields.Char(string='已切削次数')
+
+ loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源')
+ applicant = fields.Char(string='申请人')
+ reason_for_applying = fields.Char(string='申请原因')
+ apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now())
+
+ assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0')
+ use_tool_time = fields.Datetime(string='用刀时间')
+ production_line_name = fields.Char(string='产线名称')
+ machine_tool_name = fields.Char(string='机床名称')
+ machine_tool_code = fields.Char(string='机台号')
+ cutter_spacing_code = fields.Char(string='刀位号')
+ tool_loading_person = fields.Char(string='装刀人')
+ tool_loading_time = fields.Datetime(string='装刀时间')
+ receive_person = fields.Char(string='领用人')
+ receive_time = fields.Datetime(string='领用出库时间')
+ remark = fields.Char(string='备注说明')
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index e97c88f8..e481edaa 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -8,6 +8,8 @@ access_sf_tool_change_requirement_information,sf.tool.change.requirement.informa
access_sf_tool_transfer_request_information,sf.tool.transfer.request.information,model_sf_tool_transfer_request_information,base.group_user,1,1,1,1
access_sf_apply_for_tooling,sf.apply.for.tooling,model_sf_apply_for_tooling,base.group_user,1,1,1,1
+access_sf_functional_tool_assembly,sf.functional.tool.assembly,model_sf_functional_tool_assembly,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 b0fc131c..fbb58dda 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -72,5 +72,14 @@
parent="menu_sf_function_tool_plan"
/>
+
+
+
\ 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 22c780cd..54372dfc 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -164,6 +164,7 @@
+
-
+
-
-
-
+
+
+
+
@@ -261,9 +266,15 @@
'default_coarse_middle_thin': coarse_middle_thin,
'default_whether_standard_tool': whether_standard_tool,
'default_need_knife_time': need_knife_time,
+ 'default_applicant': applicant,
'default_required_cutting_time': required_cutting_time,
'default_reason_for_applying': reason_for_applying}"
+ class="btn-primary"
+ attrs="{'invisible': [('plan_execute_status', '!=', '0')]}"
/>
+
+
+
@@ -276,7 +287,63 @@
+
+
+ CAM工单程序用刀计划
+ sf.functional.tool.assembly
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CAM工单程序用刀计划
+ ir.actions.act_window
+ sf.functional.tool.assembly
+ tree,form
+
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 60fcfd86..fe986fff 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -40,12 +40,26 @@ class ToolChangeRequirementInformation(models.TransientModel):
'applicant': self.applicant,
'used_tool_time': self.used_tool_time,
'reason_for_applying': self.reason_for_applying,
- 'remark': self.new_former
+ 'remark': self.new_former,
+ 'status': '1'
}
# 将数据更新到换刀申请
- self.env['sf.machine.table.tool.changing.apply'].amendant_record(desc)
+ self.env['sf.machine.table.tool.changing.apply'].search(
+ [('CNC_machine_table', '=', desc.get('CNC_machine_table'))]).write(desc)
- # todo 功能刀具组装创建新任务
+ # 功能刀具组装创建新任务
+ self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({
+ 'functional_tool_code': self.replacement_tool_code,
+ 'functional_tool_name': self.replacement_tool_name,
+ 'functional_tool_type': self.replacement_tool_type,
+ 'loading_task_source': '1',
+ 'applicant': self.applicant,
+ 'reason_for_applying': self.reason_for_applying,
+ 'use_tool_time': self.used_tool_time,
+ 'machine_tool_name': self.CNC_machine_table,
+ 'machine_tool_code': self.machine_tool_code,
+ 'cutter_spacing_code': self.cutter_spacing_code
+ })
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}
@@ -81,6 +95,8 @@ class ToolTransferRequestInformation(models.TransientModel):
刀具转移申请信息确定按钮
:return:
"""
+ self.env['sf.machine.table.tool.changing.apply'].search(
+ [('CNC_machine_table', '=', self.CNC_machine_table)]).write({'status': '2'})
class ApplyForTooling(models.TransientModel):
@@ -107,11 +123,36 @@ class ApplyForTooling(models.TransientModel):
required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
reason_for_applying = fields.Char(string='申请原因', readonly=True)
+ applicant = fields.Char(string='申请人', invisible='1')
+
def apply_for_tooling(self):
"""
-
+ 申请装刀
:return:
"""
+ self.env['sf.functional.tool.assembly'].create({
+ 'functional_tool_code': self.functional_tool_code,
+ 'functional_tool_name': self.functional_tool_name,
+ 'functional_tool_type': self.functional_tool_type,
+ 'functional_tool_diameter': self.diameter,
+ 'functional_tool_length': self.tool_loading_length,
+ 'loading_task_source': '0',
+ 'coarse_middle_thin': None,
+ 'tool_loading_length': None,
+ 'applicant': self.applicant,
+ 'reason_for_applying': self.reason_for_applying,
+ 'use_tool_time': self.need_knife_time,
+ 'machine_tool_name': self.machine_table_name,
+ 'machine_tool_code': self.cam_procedure_code,
+ 'cutter_spacing_code': self.cam_cutter_spacing_code
+ })
+
+ # 将计划执行状态改为执行中
+ self.env['sf.cam.work.order.program.knife.plan'].search(
+ [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1'})
+
+ # 关闭弹出窗口
+ return {'type': 'ir.actions.act_window_close'}
From e880b020c6560d4287ff86c0f8e505def6929207 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Tue, 27 Jun 2023 10:20:31 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=9C=BA?=
=?UTF-8?q?=E5=8F=B0=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E5=92=8CCAM?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=94=A8=E5=88=80=E8=AE=A1=E5=88=92=E7=9A=84?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=A7=86=E5=9B=BE=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E4=BA=86=E6=9C=BA=E5=8F=B0=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E7=9A=84=E8=87=AA=E5=8A=A8=E6=8D=A2=E5=88=80=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86CAM=E7=A8=8B=E5=BA=8F?=
=?UTF-8?q?=E7=94=A8=E5=88=80=E8=AE=A1=E5=88=92=E7=9A=84=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=EF=BC=88?=
=?UTF-8?q?=E5=BE=85=E5=AE=8C=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 52 +++++++-
sf_tool_management/views/tool_base_views.xml | 119 +++++++++++++++++--
sf_tool_management/wizard/wizard.py | 2 +-
3 files changed, 161 insertions(+), 12 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 333d1723..85cb2c9a 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -126,7 +126,7 @@ class MachineTableToolChangingApply(models.Model):
max_lifetime_value = fields.Char(string='最大寿命值')
alarm_value = fields.Char(string='报警值')
used_value = fields.Char(string='已使用值')
- functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态')
+ functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常')
replacement_tool_code = fields.Char(string='待换刀具编码')
replacement_tool_name = fields.Char(string='待换刀具名称')
@@ -141,18 +141,58 @@ class MachineTableToolChangingApply(models.Model):
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
+ @api.onchange('functional_tool_status')
+ def automation_apply_for_tool_change(self):
+ """
+ 自动申请换刀
+ :return:
+ """
+ # 更新数据到机台换刀申请界面
+ # todo 换刀申请条件需补充完善
+ if(self.functional_tool_status == '异常'):
+ self.env['sf.machine.table.tool.changing.apply'].search([
+ ('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ 'replacement_tool_code': self.functional_tool_code,
+ 'replacement_tool_name': self.functional_tool_name,
+ 'replacement_tool_type': self.functional_tool_type,
+ 'replacement_tool_coarse_middle_thin': self.coarse_middle_thin,
+ 'new_former': '0',
+ 'applicant': '自动申请',
+ 'used_tool_time': fields.Datetime.now(),
+ 'reason_for_applying': '功能刀具状态异常',
+ 'remark': None,
+ 'status': '1'
+ })
+
+ # 新建组装任务
+ self.env['sf.functional.tool.assembly'].create({
+ 'functional_tool_code': self.functional_tool_code,
+ 'functional_tool_name': self.functional_tool_name,
+ 'functional_tool_type': self.functional_tool_type,
+ 'functional_tool_diameter': self.diameter,
+ 'loading_task_source': '1',
+ 'applicant': self.applicant,
+ 'reason_for_applying': self.reason_for_applying,
+ 'use_tool_time': self.used_tool_time,
+ 'machine_tool_name': self.CNC_machine_table,
+ 'machine_tool_code': self.machine_tool_code,
+ 'cutter_spacing_code': self.cutter_spacing_code
+ })
+
+
+
def new_assembly_task(self,vals):
"""
新建组装任务
:param vals:
:return:
"""
- # todo 设置直径的值
+ # todo 增加设置直径的值
# tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
# [('CNC_machine_table', '=', vals.get('CNC_machine_table'))])
# for i in tool_changing_apply:
# print(i)
- # vals['functional_tool_diameter'] = tool_changing_apply.diameter
+ # vals['functional_tool_diameter'] = self.diameter
self.env['sf.functional.tool.assembly'].create(vals)
@@ -218,6 +258,12 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明')
+ def automation_apply_for_tooling(self):
+ """
+ todo 自动申请装刀
+ :return:
+ """
+
def revocation(self):
"""
撤回装刀申请
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 54372dfc..fbc25af9 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -176,10 +176,10 @@
'default_replacement_tool_name': functional_tool_name,
'default_replacement_tool_type': functional_tool_type,
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
- attrs="{'invisible': ['|',('functional_tool_status', '=', '正常'), ('status', '!=', '0')]}"
+ attrs="{'invisible': [('status', '!=', '0')]}"
class="btn-primary"
/>
-
+