From a812c603ea17f00e36189dbd9922ecd8b4700828 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 9 Feb 2023 15:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=95=B4?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=BA=A7=E5=93=81=E9=A1=B5=E9=9D=A2=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E8=83=9A=E6=96=99=E7=9A=84=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=81=9A=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/commons/common.py | 7 +------ sf_base/models/base.py | 3 --- sf_base/models/common.py | 2 +- sf_bf_connect/controllers/controllers.py | 2 +- sf_dlm/models/product_workorder.py | 3 +-- sf_dlm/views/product_template_view.xml | 4 ++-- sf_manufacturing/models/mrp_workorder.py | 1 + sf_manufacturing/models/res_user.py | 3 ++- sf_manufacturing/models/stock.py | 5 ++--- sf_manufacturing/models/tray.py | 2 +- sf_mrs_connect/models/ftp_operate.py | 2 -- sf_mrs_connect/models/res_config_setting.py | 3 +-- sf_mrs_connect/models/sync_common.py | 5 +---- 13 files changed, 14 insertions(+), 28 deletions(-) diff --git a/sf_base/commons/common.py b/sf_base/commons/common.py index f99d6563..0c4021ea 100644 --- a/sf_base/commons/common.py +++ b/sf_base/commons/common.py @@ -1,18 +1,13 @@ # -*- coding: utf-8 -*- -from odoo import fields, models, api +from odoo import models import time import hashlib - - - class Common(models.Model): _name = 'sf.sync.common' _description = u'公用类' - - def get_headers(self,token, secret_key): ''' 获取requests中的heardes参数 diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 7e17d853..bf46344f 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- import logging -from datetime import datetime - import requests import json from odoo import fields, models, api from odoo.exceptions import ValidationError -from odoo.http import request from odoo.addons.sf_base.commons.common import Common _logger = logging.getLogger(__name__) diff --git a/sf_base/models/common.py b/sf_base/models/common.py index d576129d..9c025a57 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import logging -from odoo import fields, models, api +from odoo import fields, models _logger = logging.getLogger(__name__) diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py index 41ef3bf3..62a19f64 100644 --- a/sf_bf_connect/controllers/controllers.py +++ b/sf_bf_connect/controllers/controllers.py @@ -11,7 +11,7 @@ class Sf_Bf_Connect(http.Controller): cors="*") def get_bfm_process_order_list(self, **kw): """ - 获取业务平台传送来的订单 + 接收业务平台加工订单分配工厂时传送来的订单数据并生成销售订单和产品及胚料 :param kw: :return: """ diff --git a/sf_dlm/models/product_workorder.py b/sf_dlm/models/product_workorder.py index eafa3175..2f825d4e 100644 --- a/sf_dlm/models/product_workorder.py +++ b/sf_dlm/models/product_workorder.py @@ -1,5 +1,4 @@ -from odoo import api, fields, models - +from odoo import fields, models class ResMrpWorkOrder(models.Model): diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index 7dadde8b..0025030f 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -13,9 +13,9 @@ + attrs="{'invisible': ['|', ('categ_type', '!=', '成品'),('categ_type', '=', False)]}"/> + attrs="{'invisible': ['|',('categ_type', '!=', '胚料'),('categ_type', '=', False)]}"/> diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index c2c9b9ad..0a451c85 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -469,6 +469,7 @@ class CNCprocessing(models.Model): cnc_workorder.time_ids.date_end = datetime.now() cnc_workorder.button_finish() + # 根据程序名和加工面匹配到ftp里对应的Nc程序名 def get_cnc_processing_file(self, folder_name, cnc_processing, processing_panel): logging.info('folder_name:%s' % folder_name) serverdir = os.path.join('/tmp', folder_name, 'return', processing_panel) diff --git a/sf_manufacturing/models/res_user.py b/sf_manufacturing/models/res_user.py index d79313db..b71eaa9f 100644 --- a/sf_manufacturing/models/res_user.py +++ b/sf_manufacturing/models/res_user.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from odoo import SUPERUSER_ID, _, api, fields, models, registry +from odoo import fields, models + class Users(models.Model): _inherit = 'res.users' diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index bb04b9c5..03095ad4 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -import logging from collections import defaultdict, namedtuple from odoo.addons.stock.models.stock_rule import ProcurementException from re import findall as regex_findall from re import split as regex_split -from odoo import SUPERUSER_ID, _, api, fields, models, registry -from odoo.tools import float_compare, float_is_zero, html_escape +from odoo import SUPERUSER_ID, _, api, models +from odoo.tools import float_compare class StockRule(models.Model): diff --git a/sf_manufacturing/models/tray.py b/sf_manufacturing/models/tray.py index 4af97865..9142a310 100644 --- a/sf_manufacturing/models/tray.py +++ b/sf_manufacturing/models/tray.py @@ -2,7 +2,7 @@ # Part of SmartGo. See LICENSE file for full copyright and licensing details. import base64 from io import BytesIO -from odoo import api, fields, models, SUPERUSER_ID, _ +from odoo import api, fields, models from pystrich.code128 import Code128Encoder diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py index c1047040..4bd1200c 100644 --- a/sf_mrs_connect/models/ftp_operate.py +++ b/sf_mrs_connect/models/ftp_operate.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- import os -import posixpath -from odoo.modules import get_resource_path from ftplib import FTP import logging diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py index dadb7de5..7473c5c9 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- # Part of SmartGo. See LICENSE file for full copyright and licensing details. import logging - from odoo import api, fields, models -from odoo.exceptions import UserError + _logger = logging.getLogger(__name__) diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 6e9c6510..08ee61f3 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -1,14 +1,11 @@ # -*- coding: utf-8 -*- import requests import json +import base64 from odoo import models from odoo.exceptions import ValidationError import logging from odoo.addons.sf_base.commons.common import Common - -from odoo.http import request -from .res_config_setting import ResConfigSettings - _logger = logging.getLogger(__name__)