diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index d28699c3..bed75e6d 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):
diff --git a/sf_quality/__manifest__.py b/sf_quality/__manifest__.py
index 40408f46..c41e1a24 100644
--- a/sf_quality/__manifest__.py
+++ b/sf_quality/__manifest__.py
@@ -13,7 +13,7 @@
'author': 'jikimo',
'website': 'https://sf.cs.jikimo.com',
# 此处依赖sf_manufacturing是因为我要重写其中的一个字段operation_id的string,故需要sf_manufacturing先安装
- 'depends': ['quality_control', 'sf_manufacturing'],
+ 'depends': ['quality_control'],
'data': [
'security/ir.model.access.csv',
'views/view.xml'
diff --git a/sf_quality/models/custom_quality.py b/sf_quality/models/custom_quality.py
index c378b3be..b6fed11a 100644
--- a/sf_quality/models/custom_quality.py
+++ b/sf_quality/models/custom_quality.py
@@ -21,3 +21,16 @@ class SfQualityPoint(models.Model):
self.check_state = 'enable'
# picking_type_ids = fields.Many2many(
# 'stock.picking.type', string='执行节点', required=True, check_company=True)
+
+
+class ResQualityAlertTeam(models.Model):
+ _inherit = 'quality.alert.team'
+
+ check_state = fields.Selection([
+ ('enable', '启用'),
+ ('close', '关闭')
+ ], string='审核状态', default='close')
+
+ # 审核
+ def action_check(self):
+ self.check_state = 'enable'
diff --git a/sf_quality/views/view.xml b/sf_quality/views/view.xml
index a18e61c6..ab4208ed 100644
--- a/sf_quality/views/view.xml
+++ b/sf_quality/views/view.xml
@@ -35,15 +35,29 @@
quality.point.form.inherit.sf
quality.point
-
+
-
-
+
+
+
+
+
+
+
+
+ quality.alert.team.form.inherit.sf
+ quality.alert.team
+
+
+
+
+
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index d1bdb65a..09ea3f0f 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 7419cc9a..1e5f274c 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