diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index 7ca0ad06..8a3eb95f 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -3,9 +3,7 @@ import os import time import json import base64 -import shutil import logging -import hashlib from io import BytesIO from zipfile import ZipFile from datetime import datetime, timedelta @@ -13,8 +11,6 @@ import requests from odoo.http import request from odoo import fields, models, api, _ from odoo.exceptions import UserError -from odoo.exceptions import MissingError -from odoo.exceptions import ValidationError from odoo.addons.sf_machine_connect.models import py2opcua, ftp_operate _logger = logging.getLogger(__name__) diff --git a/sf_machine_connect/models/ftp_operate.py b/sf_machine_connect/models/ftp_operate.py index 457ef6ed..29ee69a1 100644 --- a/sf_machine_connect/models/ftp_operate.py +++ b/sf_machine_connect/models/ftp_operate.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import os import logging from ftplib import FTP @@ -20,7 +19,6 @@ class FTP_P(FTP): cmd = 'LIST' templist = [] tempdic = {} - func = None if args[-1:] and type(args[-1]) != type(''): args, func = args[:-1], args[-1] for arg in args: diff --git a/sf_maintenance/models/sf_equipment_maintenance_standards.py b/sf_maintenance/models/sf_equipment_maintenance_standards.py index 2892cac4..92a94c0e 100644 --- a/sf_maintenance/models/sf_equipment_maintenance_standards.py +++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py @@ -1,6 +1,6 @@ # -*-coding:utf-8-*- -from odoo import api, fields, models, SUPERUSER_ID, _ -from odoo.exceptions import UserError +from odoo import api, fields, models + class SfEquipmentSaintenanceStandards(models.Model): diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index 0bd64991..d7eb3d55 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import json import base64 -from datetime import date, datetime, timedelta +from datetime import timedelta import requests from odoo.addons.sf_base.commons.common import Common -from odoo import api, fields, models, SUPERUSER_ID, _ +from odoo import api, fields, models, _ from odoo.exceptions import UserError diff --git a/sf_maintenance/models/sf_maintenance_requests.py b/sf_maintenance/models/sf_maintenance_requests.py index 4c9e8fde..8686926b 100644 --- a/sf_maintenance/models/sf_maintenance_requests.py +++ b/sf_maintenance/models/sf_maintenance_requests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import base64 -from odoo import api, fields, models, SUPERUSER_ID, _ +from odoo import api, fields, models, _ from odoo.exceptions import UserError diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py index 69004216..d963ab3e 100644 --- a/sf_manufacturing/__manifest__.py +++ b/sf_manufacturing/__manifest__.py @@ -41,14 +41,6 @@ ], 'qweb': [ ], - 'assets': { - 'web.assets_backend': [ - 'sf_manufacturing/static/src/js/kanban_change.js', - 'sf_manufacturing/static/src/scss/kanban_change.scss', - 'sf_manufacturing/static/src/xml/kanban_change.xml', - ], - - }, 'license': 'LGPL-3', 'installable': True, 'application': False, diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 133c1ec0..8d3bf6c2 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -616,7 +616,7 @@ class CNCprocessing(models.Model): logging.info('folder_name:%s' % folder_name) serverdir = os.path.join('/tmp', folder_name, 'return', processing_panel) logging.info('serverdir:%s' % serverdir) - for root, dirs, files in os.walk(serverdir): + for root, files in os.walk(serverdir): for f in files: logging.info('f:%s' % f) if os.path.splitext(f)[1] == ".pdf": diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index d1bdb65a..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_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index d59c6b34..20bf2b2a 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -12,7 +12,7 @@ 'website': 'https://www.sf.jikimo.com', 'depends': ['sf_base', 'sf_manufacturing'], 'data': [ - # 'security/group_security.xml', + 'security/group_security.xml', 'security/ir.model.access.csv', # 'views/tool_base_views.xml', # # 'views/menu_view.xml', diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index cfa097ce..3e6f52d0 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import logging -from odoo import SUPERUSER_ID, _, api, fields, models +from odoo import api, fields, models from odoo.osv import expression diff --git a/yizuo_login_background_and_styles/controllers/main.py b/yizuo_login_background_and_styles/controllers/main.py index 6412ba67..d1271133 100644 --- a/yizuo_login_background_and_styles/controllers/main.py +++ b/yizuo_login_background_and_styles/controllers/main.py @@ -23,7 +23,6 @@ try: import httpagentparser except ImportError: pass -from time import gmtime, strftime from odoo.addons.web.controllers import home from odoo.http import request from odoo.exceptions import Warning diff --git a/yizuo_login_background_and_styles/models/login_image.py b/yizuo_login_background_and_styles/models/login_image.py index 5b3b19fe..c8a36e0d 100644 --- a/yizuo_login_background_and_styles/models/login_image.py +++ b/yizuo_login_background_and_styles/models/login_image.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from odoo import models, fields, api, _ +from odoo import models, fields class LoginImage(models.Model): diff --git a/yizuo_login_background_and_styles/models/res_config_settings.py b/yizuo_login_background_and_styles/models/res_config_settings.py index 66394f9e..cefc659f 100644 --- a/yizuo_login_background_and_styles/models/res_config_settings.py +++ b/yizuo_login_background_and_styles/models/res_config_settings.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from odoo import api, fields, models, modules +from odoo import api, fields, models class ResConfigSettings(models.TransientModel): diff --git a/zpl_print/controllers/report.py b/zpl_print/controllers/report.py index ade1c26f..7d9041de 100644 --- a/zpl_print/controllers/report.py +++ b/zpl_print/controllers/report.py @@ -8,11 +8,9 @@ import werkzeug.exceptions import werkzeug.utils import werkzeug.wrappers import werkzeug.wsgi -from werkzeug.urls import url_parse from odoo import http -from odoo.http import content_disposition, request -from odoo.tools.safe_eval import safe_eval, time +from odoo.http import request from odoo.addons.web.controllers.report import ReportController from ..models.common import Common diff --git a/zpl_print/models/common.py b/zpl_print/models/common.py index c10d5a74..d45f74e0 100644 --- a/zpl_print/models/common.py +++ b/zpl_print/models/common.py @@ -18,4 +18,4 @@ class Common(models.Model): tsclibrary.printlabelW("0", "1"); tsclibrary.closeport(); except Exception as e: - raise UserWarning("错误警告") + raise UserWarning("错误警告:%s" % e)