Compare commits
1 Commits
develop
...
feature/72
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9af458b11e |
@@ -42,6 +42,7 @@ class MrsMaterialModel(models.Model):
|
||||
materials_num = fields.Char("编码号")
|
||||
name = fields.Char('型号名')
|
||||
need_h = fields.Boolean("热处理", default="false")
|
||||
need_m = fields.Boolean("是否磁吸", default="false")
|
||||
mf_materia_post = fields.Char("热处理后密度")
|
||||
density = fields.Float("密度(kg/m³)")
|
||||
materials_id = fields.Many2one('sf.production.materials', "材料名")
|
||||
|
||||
@@ -263,6 +263,7 @@
|
||||
<field name="materials_no" readonly="1" force_save="1"/>
|
||||
<field name="gain_way" required="0"/>
|
||||
<field name="density" readonly="1" required="1" class="custom_required"/>
|
||||
<field name="need_m" default="false" readonly="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="rough_machining" required="1"/>
|
||||
@@ -306,6 +307,7 @@
|
||||
<field name="tensile_strength"/>
|
||||
<field name="hardness" optional="show"/>
|
||||
<field name="need_h"/>
|
||||
<field name="need_m"/>
|
||||
<field name="apply" widget="many2many_tags" optional="show"/>
|
||||
<field name="density" optional="show"/>
|
||||
<field name="rough_machining" optional="hide"/>
|
||||
@@ -352,6 +354,7 @@
|
||||
<field name="materials_no"/>
|
||||
<field name="name"/>
|
||||
<field name="need_h"/>
|
||||
<field name="need_m"/>
|
||||
<field name="mf_materia_post"/>
|
||||
<field name="density"/>
|
||||
<field name='materials_id' default="default" invisible="1"/>
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
from . import controllers
|
||||
from . import sync_controller
|
||||
from . import refresh_controller
|
||||
@@ -1,10 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from odoo import http
|
||||
from odoo.http import request
|
||||
|
||||
class FixtureRedisRefreshController(http.Controller):
|
||||
|
||||
@http.route('/api/refresh_redis/fixture_param', type='json', auth='none', csrf=False, methods=['POST'])
|
||||
def refresh_fixture_param_redis(self, **kw):
|
||||
request.env['mrs.basic_parameters.mixin'].sudo().refresh_all_param_redis()
|
||||
return {'status': 'success', 'msg': 'Redis 缓存已刷新'}
|
||||
@@ -1,22 +0,0 @@
|
||||
# study/jikimo_sf/sf_mrs_connect/controllers/sync_controller.py
|
||||
from odoo import http
|
||||
from odoo.http import request
|
||||
|
||||
class FixtureSyncController(http.Controller):
|
||||
|
||||
@http.route('/api/fixture_model/sync_from_mrs', type='json', auth='none', csrf=False)
|
||||
def sync_model(self, **kw):
|
||||
code = kw.get('code')
|
||||
if not code:
|
||||
return {'status':'fail','msg':'code missing'}
|
||||
request.env['sf.fixture.model'].sudo().sync_from_mrs(code)
|
||||
return {'status':'success'}
|
||||
|
||||
@http.route('/api/fixture_param/sync_from_mrs', type='json', auth='none', csrf=False)
|
||||
def sync_param(self, **kw):
|
||||
code = kw.get('code')
|
||||
if not code:
|
||||
return {'status':'fail','msg':'code missing'}
|
||||
request.env['sf.fixture.materials.basic.parameters']\
|
||||
.sudo().sync_from_mrs(code)
|
||||
return {'status':'success'}
|
||||
@@ -1,6 +1,4 @@
|
||||
from . import ftp_operate
|
||||
from . import res_config_setting
|
||||
from . import sync_common
|
||||
from . import order_price
|
||||
from . import redis_utils
|
||||
from . import common
|
||||
from . import order_price
|
||||
@@ -1,14 +0,0 @@
|
||||
# study/jikimo_sf/sf_mrs_connect/models/common.py
|
||||
import time, hashlib
|
||||
|
||||
class Common:
|
||||
@staticmethod
|
||||
def get_headers(token, secret_key):
|
||||
ts = str(int(time.time()))
|
||||
sign = hashlib.sha256(f"{token}{secret_key}{ts}".encode()).hexdigest()
|
||||
return {
|
||||
"token": token,
|
||||
"sign": sign,
|
||||
"timestamp": ts,
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
# study/jikimo_sf/sf_mrs_connect/models/redis_utils.py
|
||||
import redis, json, logging
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
class RedisClient:
|
||||
def __init__(self, host='localhost', port=6379, db=0):
|
||||
try:
|
||||
self.client = redis.Redis(host=host, port=port, db=db, decode_responses=True)
|
||||
except Exception as e:
|
||||
_logger.error(f"Redis init error: {e}")
|
||||
self.client = None
|
||||
|
||||
def get_json(self, key):
|
||||
if not self.client:
|
||||
return None
|
||||
try:
|
||||
data = self.client.get(key)
|
||||
return json.loads(data) if data else None
|
||||
except Exception as e:
|
||||
_logger.error(f"Redis GET error [{key}]: {e}")
|
||||
return None
|
||||
|
||||
def set_json(self, key, value, ex=3600):
|
||||
if not self.client:
|
||||
return
|
||||
try:
|
||||
self.client.set(key, json.dumps(value, ensure_ascii=False), ex=ex)
|
||||
except Exception as e:
|
||||
_logger.error(f"Redis SET error [{key}]: {e}")
|
||||
@@ -45759,6 +45759,11 @@ msgstr ""
|
||||
msgid "热处理"
|
||||
msgstr ""
|
||||
|
||||
#. module: sf_base
|
||||
#: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__need_m
|
||||
msgid "是否磁吸"
|
||||
msgstr ""
|
||||
|
||||
#. module: sf_base
|
||||
#: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__mf_materia_post
|
||||
msgid "热处理后密度"
|
||||
|
||||
Reference in New Issue
Block a user