diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml
index 4d57bc43..a671dfe0 100644
--- a/sf_base/security/group_security.xml
+++ b/sf_base/security/group_security.xml
@@ -65,5 +65,15 @@
+
+
+ 采购岗
+
+
+
+
+ 采购总监
+
+
\ No newline at end of file
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 124e0058..3233e674 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
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
class ResProductMo(models.Model):
@@ -88,19 +88,19 @@ class ResProductMo(models.Model):
cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
fit_blade_shape_id = fields.Many2one('maintenance.equipment.image',
- '适配刀片形状', domain=[('type', '=', '刀片形状')])
+ '适配刀片形状', domain=[('type', '=', '刀片形状')])
suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
'rel_machining_product_template', '适合加工方式',
domain=[('type', '=', '加工能力')])
blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征',
- domain=[('type', '=', '刀尖特征')])
- handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型',domain=[('type', '=', '柄部类型')])
+ domain=[('type', '=', '刀尖特征')])
+ handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')])
cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template',
'走刀方向', domain=[('type', '=', '走刀方向')])
suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
'适合冷却液', domain=[('type', '=', '冷却液')])
compaction_way_id = fields.Many2one('maintenance.equipment.image',
- '压紧方式', domain=[('type', '=', '压紧方式')])
+ '压紧方式', domain=[('type', '=', '压紧方式')])
@api.onchange('cutting_tool_material_id')
def _onchange_cutting_tool_material_id(self):
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 09ea3f0f..d1bdb65a 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
import logging
from odoo.modules import get_resource_path
from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+# from quatotion import readSql, feature_recognize, auto_quatotion
__author__ = 'jinling.yang'
_logger = logging.getLogger(__name__)
@@ -24,14 +24,14 @@ class AutoQuatotion(models.Model):
def get_process_time_db_path(self):
return get_resource_path('sf_sale', 'models', 'process_time.db')
- def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code):
- '''
- 通过打包好的.so库,
- 以调用autoQuatotion库中Quatotion类,
- 初始化后调用类的analyseShape方法对模型文件进行价格预测
- '''
- # 初始化自动报价类(输入特征数据库和加工时间数据库)
- reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path)
- # 获取价格、加工时间、尺寸、XYZ、翻面次数
- feature_info = reader.analyseShape(stp_url, InfoJson={})
- return feature_info
+ # def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code):
+ # '''
+ # 通过打包好的.so库,
+ # 以调用autoQuatotion库中Quatotion类,
+ # 初始化后调用类的analyseShape方法对模型文件进行价格预测
+ # '''
+ # # 初始化自动报价类(输入特征数据库和加工时间数据库)
+ # reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path)
+ # # 获取价格、加工时间、尺寸、XYZ、翻面次数
+ # feature_info = reader.analyseShape(stp_url, InfoJson={})
+ # return feature_info
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 1e5f274c..7419cc9a 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
import json
from datetime import datetime
import requests
-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
from odoo import models, fields, api
from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError