From b942696c6996d7b29baeefbce724394180f4eda6 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Mon, 24 Apr 2023 17:09:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=94=80=E5=94=AE=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E9=94=80=E5=94=AE=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=8C=E5=B1=95=E7=A4=BA=E6=A8=A1=E5=9E=8B=202.=E8=A1=A8?= =?UTF-8?q?=E9=9D=A2=E5=B7=A5=E8=89=BA=E5=8F=8A=E7=B1=BB=E5=88=AB=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/views/menu_view.xml | 6 +++--- sf_dlm/models/product_template.py | 4 +++- sf_sale/models/sale_order.py | 8 ++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index 620712ac..cb02aca2 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -59,7 +59,7 @@ id="menu_sf_production_process" name="表面工艺" parent="menu_sf_production_process_1" - sequence="1" + sequence="2" action="sf_production_process" /> @@ -67,7 +67,7 @@ id="menu_sf_production_process_category" name="表面工艺类别" parent="menu_sf_production_process_1" - sequence="2" + sequence="1" action="sf_production_process_category" /> @@ -95,7 +95,7 @@ id="menu_sf_processing_technology" name="加工工艺" parent="menu_sf_production_process_1" - sequence="1" + sequence="3" action="sf_processing_technology"/> diff --git a/sf_dlm/models/product_template.py b/sf_dlm/models/product_template.py index a673c912..55bfc854 100644 --- a/sf_dlm/models/product_template.py +++ b/sf_dlm/models/product_template.py @@ -203,12 +203,14 @@ class ResProductTemplate(models.Model): if vals.get('upload_model_file'): if vals.get('is_bfm') is False and vals.get('categ_type') == '成品': for item in vals['upload_model_file']: + logging.info('create-attachment:%s' % int(item[2][0])) attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item[2][0]))]) base64_data = base64.b64encode(attachment.datas) base64_datas = base64_data.decode('utf-8') model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() report_path = attachment._full_path(attachment.store_fname) vals['model_file'] = self.transition_glb_file(report_path, model_code) + logging.info('create-model_file:%s' % len(vals['model_file'])) self._sanitize_vals(vals) templates = super(ResProductTemplate, self).create(vals_list) if "create_product_product" not in self._context: @@ -222,7 +224,7 @@ class ResProductTemplate(models.Model): related_vals[field_name] = vals[field_name] if related_vals: template.write(related_vals) - + logging.info('create-model_file:%s' % templates.model_file) return templates @api.onchange('upload_model_file') diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 817feda8..0c33fd4d 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -48,5 +48,13 @@ class ReSaleOrder(models.Model): product.materials_id.name), 'price_unit': product.list_price, 'product_uom_qty': item['number'], + # 'model_glb_file': product.model_file, } return self.env['sale.order.line'].create(vals) + + +class ResaleOrderLine(models.Model): + _inherit = 'sale.order.line' + + model_glb_file = fields.Binary('模型的glb文件', related='product_id.model_file') +