From e9be2e9c437877eb8883e34433c64938e61d60e1 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 23 Nov 2023 17:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/commons/common.py | 4 +--- sf_base/models/__init__.py | 6 ------ sf_base/models/common.py | 24 +----------------------- sf_base/models/functional_fixture.py | 2 +- sf_bf_connect/controllers/__init__.py | 4 +--- sf_dlm/__init__.py | 1 - sf_dlm_management/__manifest__.py | 2 +- sf_dlm_management/models/__init__.py | 9 ++------- sf_manufacturing/models/mrp_workorder.py | 10 +++++----- 9 files changed, 12 insertions(+), 50 deletions(-) diff --git a/sf_base/commons/common.py b/sf_base/commons/common.py index a1aed3c2..05a2143f 100644 --- a/sf_base/commons/common.py +++ b/sf_base/commons/common.py @@ -8,7 +8,7 @@ class Common(models.Model): _name = 'sf.sync.common' _description = u'公用类' - def get_headers(self,token, secret_key): + def get_headers(self, token, secret_key): ''' 获取requests中的heardes参数 ''' @@ -19,5 +19,3 @@ class Common(models.Model): 'TIMESTAMP': str(timestamp), 'checkstr': check_sf_str} return headers - - diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index 93961162..31dfcf95 100644 --- a/sf_base/models/__init__.py +++ b/sf_base/models/__init__.py @@ -4,9 +4,3 @@ from . import tool_base_new from . import fixture from . import functional_fixture from . import tool_other_features - - - - - - diff --git a/sf_base/models/common.py b/sf_base/models/common.py index 7ec20654..f6e6771a 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -17,29 +17,7 @@ class MrsProductionMaterials(models.Model): remark = fields.Text("备注") active = fields.Boolean('有效', default=True) - # def open_url_action(self): - # base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') - # # url = 'http://192.168.50.202:8080/api' - # url = 'https://bfw.jikimo.com/' - # # data = { - # # 'key' : 'value' - # # } - # - # response = requests.get(url) - # response.raise_for_status() - # return { - # 'type': 'ir.actions.act_url', - # 'url': response.url, - # 'target': 'new' - # } - - - def open_url_action(self): - # sf_sync_config = self.env['res.config.settings'].get_values() - # token = sf_sync_config['token'] - # sf_secret_key = sf_sync_config['sf_secret_key'] - # headers = Common.get_headers(self, token, sf_secret_key) url = 'http://192.168.50.127:8081' params = { 'user_id': self._uid @@ -82,7 +60,6 @@ class MrsMaterialModel(models.Model): active = fields.Boolean('有效', default=True) - class MrsProductionProcessCategory(models.Model): _name = 'sf.production.process.category' _description = '表面工艺类别' @@ -131,6 +108,7 @@ class MrsProcessingOrder(models.Model): index=True, string='加工工艺') production_process_id = fields.Many2one('sf.production.process', string="表面工艺") + class SupplierSort(models.Model): _name = 'sf.supplier.sort' _description = '供应商排序' diff --git a/sf_base/models/functional_fixture.py b/sf_base/models/functional_fixture.py index b0659da9..a3677947 100644 --- a/sf_base/models/functional_fixture.py +++ b/sf_base/models/functional_fixture.py @@ -1,5 +1,5 @@ -import requests import json +import requests from odoo import models, fields, api from odoo.addons.sf_base.commons.common import Common from odoo.exceptions import ValidationError diff --git a/sf_bf_connect/controllers/__init__.py b/sf_bf_connect/controllers/__init__.py index b2809a39..e046e49f 100644 --- a/sf_bf_connect/controllers/__init__.py +++ b/sf_bf_connect/controllers/__init__.py @@ -1,3 +1 @@ -from .import controllers - - +from . import controllers diff --git a/sf_dlm/__init__.py b/sf_dlm/__init__.py index 899bcc97..0650744f 100644 --- a/sf_dlm/__init__.py +++ b/sf_dlm/__init__.py @@ -1,2 +1 @@ from . import models - diff --git a/sf_dlm_management/__manifest__.py b/sf_dlm_management/__manifest__.py index b10fa76d..a32ecf81 100644 --- a/sf_dlm_management/__manifest__.py +++ b/sf_dlm_management/__manifest__.py @@ -9,7 +9,7 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['sf_sale', 'sf_dlm','sf_manufacturing'], + 'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'], 'data': [ 'views/product_template_management_view.xml', ], diff --git a/sf_dlm_management/models/__init__.py b/sf_dlm_management/models/__init__.py index a4da1521..8c38257e 100644 --- a/sf_dlm_management/models/__init__.py +++ b/sf_dlm_management/models/__init__.py @@ -1,7 +1,2 @@ -#from . import product_template -#from . import product_supplierinfo - - - - -# \ No newline at end of file +# from . import product_template +# from . import product_supplierinfo diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 06c2b293..7a7f10ce 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1,13 +1,12 @@ +import logging +from datetime import datetime +from dateutil.relativedelta import relativedelta import os import base64 import math import requests -import logging # import subprocess -from datetime import datetime -from dateutil.relativedelta import relativedelta from odoo import api, fields, models, SUPERUSER_ID, _ -from odoo.exceptions import ValidationError from odoo.addons.sf_base.commons.common import Common from odoo.exceptions import UserError from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController @@ -388,7 +387,8 @@ class ResMrpWorkOrder(models.Model): productions._create_workorder() productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \ ( - p.move_dest_ids.procure_method != 'make_to_order' and not p.move_raw_ids and not p.workorder_ids)).action_confirm() + p.move_dest_ids.procure_method != 'make_to_order' and + not p.move_raw_ids and not p.workorder_ids)).action_confirm() for production in productions: origin_production = production.move_dest_ids and production.move_dest_ids[