From 1da7a0195d8420a6cb5d3af1f5c974bd44c4d9ba Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 20 Nov 2023 14:59:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AEodoo=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9py=E6=96=87=E4=BB=B6=E4=B8=AD=E5=BE=97import?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/commons/common.py | 2 +- sf_base/models/base.py | 2 +- sf_base/models/common.py | 4 +--- sf_maintenance/models/sf_maintenance.py | 8 +++----- sf_manufacturing/models/mrp_maintenance.py | 3 ++- sf_manufacturing/models/product_template.py | 4 ++-- sf_manufacturing/models/stock.py | 9 +++------ sf_mrs_connect/models/sync_common.py | 4 ++-- sf_sale/models/auto_quatotion_common.py | 2 +- sf_sale/models/quick_easy_order.py | 4 ++-- 10 files changed, 18 insertions(+), 24 deletions(-) diff --git a/sf_base/commons/common.py b/sf_base/commons/common.py index 0c4021ea..a1aed3c2 100644 --- a/sf_base/commons/common.py +++ b/sf_base/commons/common.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from odoo import models import time import hashlib +from odoo import models class Common(models.Model): diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 966ccdc5..066e84e1 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import logging -import requests import json +import requests from odoo import fields, models, api from odoo.exceptions import ValidationError from odoo.addons.sf_base.commons.common import Common diff --git a/sf_base/models/common.py b/sf_base/models/common.py index f116b50f..7ec20654 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- import logging -from odoo import fields, models -import requests -from odoo.addons.sf_base.commons.common import Common from urllib.parse import urlencode +from odoo import fields, models _logger = logging.getLogger(__name__) diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index c44f283c..bf58c8f2 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- +import json import base64 - -from odoo import api, fields, models, SUPERUSER_ID, _ -from odoo.exceptions import UserError -import logging from datetime import date, datetime, timedelta import requests -import json from odoo.addons.sf_base.commons.common import Common +from odoo import api, fields, models, SUPERUSER_ID, _ +from odoo.exceptions import UserError class SfMaintenanceEquipmentCategory(models.Model): diff --git a/sf_manufacturing/models/mrp_maintenance.py b/sf_manufacturing/models/mrp_maintenance.py index f0b09e8d..f55f9014 100644 --- a/sf_manufacturing/models/mrp_maintenance.py +++ b/sf_manufacturing/models/mrp_maintenance.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models, _ from dateutil.relativedelta import relativedelta +from odoo import api, fields, models, _ + class MaintenanceEquipment(models.Model): diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index b6961fda..acc4242a 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -3,8 +3,8 @@ from odoo import models, fields, api, _ from odoo.exceptions import ValidationError from odoo.modules import get_resource_path from odoo.addons.sf_base.commons.common import Common -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 diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 8dd0062d..ac6ee4c4 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -1,18 +1,15 @@ # -*- coding: utf-8 -*- +import logging import base64 from collections import defaultdict, namedtuple -from odoo.addons.stock.models.stock_rule import ProcurementException -from odoo.addons.sf_base.commons.common import Common -from odoo.exceptions import ValidationError, UserError import requests -import json from re import findall as regex_findall from datetime import datetime, timedelta from re import split as regex_split from odoo import SUPERUSER_ID, _, api, fields, models from odoo.tools import float_compare -import logging - +from odoo.addons.stock.models.stock_rule import ProcurementException +from odoo.addons.sf_base.commons.common import Common from odoo.exceptions import UserError diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 6d5a819c..7439c87b 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -import requests +import logging import json import base64 +import requests from odoo import models from odoo.exceptions import ValidationError -import logging from odoo.addons.sf_base.commons.common import Common _logger = logging.getLogger(__name__) diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 4631fdee..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__) diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index e9f152a8..310bbc7a 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -1,7 +1,7 @@ from odoo import models, fields, api 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 from odoo.exceptions import ValidationError, UserError from odoo.addons.sf_base.commons.common import Common from datetime import datetime From 499261f62e7505c1a3865bb4717d57178e18e367 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 20 Nov 2023 15:39:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=BE=E5=BC=80=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 4 ++-- sf_sale/models/auto_quatotion_common.py | 24 ++++++++++----------- sf_sale/models/quick_easy_order.py | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index acc4242a..b6961fda 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -3,8 +3,8 @@ from odoo import models, fields, api, _ from odoo.exceptions import ValidationError from odoo.modules import get_resource_path from odoo.addons.sf_base.commons.common import Common -#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 diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 2d34a76e..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 310bbc7a..e9f152a8 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -1,7 +1,7 @@ from odoo import models, fields, api 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 from odoo.exceptions import ValidationError, UserError from odoo.addons.sf_base.commons.common import Common from datetime import datetime From 580f95f33851143daffd668c2ed68daa94117955 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 20 Nov 2023 15:48:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?importrequests=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index ca3e1c10..a2f5b129 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import base64 -import requests import logging from re import findall as regex_findall from datetime import datetime, timedelta from re import split as regex_split +import requests from odoo import SUPERUSER_ID, _, api, fields, models from odoo.tools import float_compare from collections import defaultdict, namedtuple