From 618d4718c92916cc9ab4620c2f43516af53c4857 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 15 Sep 2023 14:36:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B3=A8=E9=87=8Aocc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 03f22bea..baf86eb6 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -1,8 +1,8 @@ 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 import logging import base64 import hashlib @@ -738,7 +738,7 @@ class ResProductMo(models.Model): def transition_glb_file(self, report_path, code): shapes = read_step_file(report_path) output_file = os.path.join('/tmp', str(code) + '.stl') - # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) # 转化为glb output_glb_file = os.path.join('/tmp', str(code) + '.glb') util_path = get_resource_path('sf_dlm', 'static/util') From 38331f150126ba22c9873ac2ff4314e1907e2114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Fri, 15 Sep 2023 14:42:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index f557fe38..f0b583bf 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -161,7 +161,7 @@ td.o_required_modifier { .o_list_view .o_list_table thead { position: sticky; top: 0; - z-index: 100000; + //z-index: 100000; } //.o_list_view .o_list_table { // height: 1799px !important; From 0ae5d724d662814a1f759c5cf1a15bb61d3f909c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Fri, 15 Sep 2023 17:15:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index f0b583bf..60a4968d 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -172,7 +172,7 @@ td.o_required_modifier { .o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar { position: sticky !important; top: 0; - z-index: 100000; + //z-index: 100000; } //----------------------------------------------------------- From 586dc5dbe2746ed232a3aaa58a9df341daed4b93 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 18 Sep 2023 10:07:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96sf=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odoo.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/odoo.conf b/odoo.conf index 0ccb3899..54012aa4 100644 --- a/odoo.conf +++ b/odoo.conf @@ -53,10 +53,10 @@ syslog = False test_enable = False test_file = test_tags = None -transient_age_limit = 1.0 -translate_modules = ['all'] +;transient_age_limit = 1.0 +;translate_modules = ['all'] unaccent = False upgrade_path = without_demo = False -workers = 0 +workers = 8 From dc796abd4ab716fc0204ec5f54b8fefc78dbedab Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 18 Sep 2023 10:40:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96sf=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odoo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo.conf b/odoo.conf index 54012aa4..51d61064 100644 --- a/odoo.conf +++ b/odoo.conf @@ -58,5 +58,5 @@ test_tags = None unaccent = False upgrade_path = without_demo = False -workers = 8 +workers = 0