diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 345e5f38..3f16b734 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -133,6 +133,10 @@
+
+
+ 规格:
+
[]
@@ -140,10 +144,7 @@
- Price:
-
-
- 规格:
+ 价格:
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 4631fdee..09ea3f0f 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -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