jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #674: (feature/修改机床参数bug -> develop)

Browse Source 
Merge Request: import requests

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/674
This commit is contained in:
龚启豪
2023-11-20 16:50:06 +08:00
committed by Coding
parent b093b11ec2 580f95f338
commit 63d6ce6da8
7 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/commons/common.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from odoo import models
import time import time
import hashlib import hashlib
from odoo import models
class Common(models.Model): class Common(models.Model):

2
sf_base/models/base.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging import logging
import requests
import json import json
import requests
from odoo import fields, models, api from odoo import fields, models, api
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common

4
sf_base/models/common.py
View File

@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging import logging
from odoo import fields, models
import requests
from odoo.addons.sf_base.commons.common import Common
from urllib.parse import urlencode from urllib.parse import urlencode
from odoo import fields, models
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)

8
sf_maintenance/models/sf_maintenance.py
View File

@@ -1,13 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json
import base64 import base64
from odoo import api, fields, models, SUPERUSER_ID, _
from odoo.exceptions import UserError
import logging
from datetime import date, datetime, timedelta from datetime import date, datetime, timedelta
import requests import requests
import json
from odoo.addons.sf_base.commons.common import Common 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): class SfMaintenanceEquipmentCategory(models.Model):

3
sf_manufacturing/models/mrp_maintenance.py
View File

@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details. # Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import api, fields, models, _
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from odoo import api, fields, models, _
class MaintenanceEquipment(models.Model): class MaintenanceEquipment(models.Model):

2
sf_manufacturing/models/stock.py
View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import base64 import base64
import logging import logging
import json
from re import findall as regex_findall from re import findall as regex_findall
from datetime import datetime, timedelta from datetime import datetime, timedelta
from re import split as regex_split from re import split as regex_split
@@ -11,7 +10,6 @@ from odoo.tools import float_compare
from collections import defaultdict, namedtuple from collections import defaultdict, namedtuple
from odoo.addons.stock.models.stock_rule import ProcurementException from odoo.addons.stock.models.stock_rule import ProcurementException
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
from odoo.exceptions import ValidationError, UserError
from odoo.exceptions import UserError from odoo.exceptions import UserError

4
sf_mrs_connect/models/sync_common.py
View File

@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import requests import logging
import json import json
import base64 import base64
import requests
from odoo import models from odoo import models
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
import logging
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)