diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py index 80410e3b..16b31433 100644 --- a/sf_base/models/tool_other_features.py +++ b/sf_base/models/tool_other_features.py @@ -125,6 +125,7 @@ class ToolMaterialsBasicParameters(models.Model): def _json_integral_tool_basic_param(self, obj): integral_tool_basic_param_str = (0, '', { + 'standard_library_id': 1, 'code': obj['code'], 'cutting_tool_type': obj['cutting_tool_type'], 'total_length': obj['total_length'], diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py index 69643b1a..6105b941 100644 --- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py +++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py @@ -43,6 +43,33 @@ class Cutting_toolSpecificationWizard(models.TransientModel): feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz', domain=[('machining_method', '!=', False)]) + def choose_basic_param(self): + self.product_id.brand_id = self.brand_id.id + self.product_id.cutting_tool_type_id = self.cutting_tool_type_id.id + record = self.integral_tool_basic_parameters_ids.browse(id) + + # selected_record = self.integral_tool_basic_parameters_ids.browse(self._context.get('active_id')) + if self.cutting_tool_type == '整体式刀具': + for record in self.integral_tool_basic_parameters_ids: + selected_record1 = self.env['sf.tool.materials.basic.parameters'].browse(self._context.get('active_id')) + # 获取选中记录的字段值 + self.product_id.cutting_tool_total_length = selected_record1.total_length + + + # self.product_id.blade_diameter = self.integral_tool_basic_parameters_ids[0].blade_diameter + # self.product_id.blade_length = self.integral_tool_basic_parameters_ids[0].blade_length + # self.product_id.blade = self.integral_tool_basic_parameters_ids[0].shank_diameter + # self.product_id.shank_length = self.integral_tool_basic_parameters_ids[0].shank_length + + + # elif self.cutting_tool_type == '刀片': + # + # elif self.cutting_tool_type == '刀杆': + # + # elif self.cutting_tool_type == '刀盘': + # + # elif self.cutting_tool_type == '刀柄': + @api.depends('cutting_tool_library_id', 'cutting_tool_type') def set_specification(self): self.integral_tool_basic_parameters_ids = False @@ -96,17 +123,3 @@ class Cutting_toolSpecificationWizard(models.TransientModel): item.chuck_basic_parameters_ids = chuck_basic_parameters - def choose_basic_param(self): - self.product_id.brand_id = self.brand_id.id - # self.product_id.brand_id = self.brand_id.id - # if self.cutting_tool_type == '整体式刀具': - # self.product_id.brand_id = self.brand_id.id - # - # elif self.cutting_tool_type == '刀片': - # - # elif self.cutting_tool_type == '刀杆': - # - # elif self.cutting_tool_type == '刀盘': - # - # elif self.cutting_tool_type == '刀柄': - diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml index 7668a0df..5433bddb 100644 --- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml +++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml @@ -16,7 +16,7 @@ - + diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 09ea3f0f..2d34a76e 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