1.产品模板优化:增加产品类别的搜索面板
2.夹具型号注册到cloud:夹具型号的Tree和form视图去掉不可增删改操作,页面新增时编码根据夹具物料回显不同的编码;新增注册按钮及对应的注册接口 3.功能夹具注册到cloud:.功能夹具的Tree和form视图去掉不可增删改操作,页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
from odoo import models, fields, api
|
||||
from odoo.addons.sf_base.commons.common import Common
|
||||
from odoo.exceptions import ValidationError
|
||||
import requests
|
||||
import json
|
||||
|
||||
|
||||
class FunctionalFixtureType(models.Model):
|
||||
@@ -16,7 +20,6 @@ class FunctionalFixture(models.Model):
|
||||
_description = "功能夹具"
|
||||
|
||||
code = fields.Char(string='编码', readonly=True)
|
||||
name = fields.Char(string="名称", size=15, required=True)
|
||||
type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", required=True)
|
||||
type = fields.Char(related='type_id.name', string="功能夹具类别", store=True)
|
||||
zero_chuck_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_zero_chuck', string="零点卡盘型号",
|
||||
@@ -34,10 +37,121 @@ class FunctionalFixture(models.Model):
|
||||
vice_tray_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_vice_tray', string="虎钳托盘型号",
|
||||
domain=[('fixture_material_type', '=', '虎钳托盘')])
|
||||
|
||||
def _get_fixture_model_ids(self, fixture_model_code):
|
||||
fixture_model_ids = []
|
||||
for item in fixture_model_code:
|
||||
fixture_model = self.env['sf.fixture.model'].search([('code', '=', item)])
|
||||
if fixture_model:
|
||||
fixture_model_ids.append(fixture_model.id)
|
||||
return [(6, 0, fixture_model_ids)]
|
||||
@api.onchange('type_id')
|
||||
def _onchange_type_id(self):
|
||||
if self.type_id:
|
||||
functional_fixture_type = self.search(
|
||||
[('type', '=', self.type)], limit=1, order='id desc')
|
||||
if not functional_fixture_type:
|
||||
num = "%04d" % 1
|
||||
else:
|
||||
m = int(functional_fixture_type.code[-3:]) + 1
|
||||
num = "%04d" % m
|
||||
self.code = "%s%s-%s" % ('JKM-C-GNJJ-', self.type_id.code, num)
|
||||
|
||||
_sql_constraints = [
|
||||
('code_uniq', 'unique (code)',
|
||||
'编码不能重复')
|
||||
|
||||
]
|
||||
|
||||
@api.depends('transfer_tray_model_ids', 'pneumatic_tray_model_ids', 'magnetic_tray_model_ids',
|
||||
'vice_tray_model_ids', 'type')
|
||||
def _get_name(self):
|
||||
for record in self:
|
||||
if record.type:
|
||||
if not record.transfer_tray_model_ids and not record.pneumatic_tray_model_ids and not record.magnetic_tray_model_ids and not record.vice_tray_model_ids:
|
||||
record.name = ''
|
||||
if record.transfer_tray_model_ids:
|
||||
for i in record.transfer_tray_model_ids:
|
||||
record.name = '%s%s%s' % (
|
||||
i.display_name.split('-')[0], record.type, '功能夹具')
|
||||
if record.pneumatic_tray_model_ids:
|
||||
for i in record.pneumatic_tray_model_ids:
|
||||
record.name = '%s%s%s' % (
|
||||
i.display_name.split('-')[0], record.type, '功能夹具')
|
||||
if record.magnetic_tray_model_ids:
|
||||
for i in record.magnetic_tray_model_ids:
|
||||
record.name = '%s%s%s' % (
|
||||
i.display_name.split('-')[0], record.type, '功能夹具')
|
||||
if record.vice_tray_model_ids:
|
||||
for i in record.vice_tray_model_ids:
|
||||
record.name = '%s%s%s' % (
|
||||
i.display_name.split('-')[0], record.type, '功能夹具')
|
||||
else:
|
||||
record.name = ''
|
||||
|
||||
name = fields.Char(string="名称", compute=_get_name, readonly=True)
|
||||
|
||||
def _json_zero_chuck_model_item_code(self, item):
|
||||
code_arr = []
|
||||
for i in item.zero_chuck_model_ids:
|
||||
code_arr.append(i.code)
|
||||
return code_arr
|
||||
|
||||
def _json_transfer_tray_model_item_code(self, item):
|
||||
code_arr = []
|
||||
for i in item.transfer_tray_model_ids:
|
||||
code_arr.append(i.code)
|
||||
return code_arr
|
||||
|
||||
def _json_vice_tray_item_code(self, item):
|
||||
code_arr = []
|
||||
for i in item.vice_tray_model_ids:
|
||||
code_arr.append(i.code)
|
||||
return code_arr
|
||||
|
||||
def _json_magnetic_tray_model_item_code(self, item):
|
||||
code_arr = []
|
||||
for i in item.magnetic_tray_model_ids:
|
||||
code_arr.append(i.code)
|
||||
return code_arr
|
||||
|
||||
def _json_pneumatic_tray_model_item_code(self, item):
|
||||
code_arr = []
|
||||
for i in item.pneumatic_tray_model_ids:
|
||||
code_arr.append(i.code)
|
||||
return code_arr
|
||||
|
||||
# 注册到cloud的夹具型号中
|
||||
|
||||
def register_functional_fixture(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)
|
||||
strurl = sf_sync_config['sf_url'] + self.crea_url
|
||||
objs_all = self.search([('code', '=', self.code)])
|
||||
functional_fixture_list = []
|
||||
if objs_all:
|
||||
for item in objs_all:
|
||||
val = {
|
||||
'code': item.code,
|
||||
'factory_token': token,
|
||||
'name': item.name,
|
||||
'code': item.code,
|
||||
'type_code': self.env['sf.functional.fixture.type'].search(
|
||||
[('id', '=', item.type_id.id)]).code,
|
||||
'zero_chuck_model_codes': self.env['sf.functional.fixture']._json_zero_chuck_model_item_code(
|
||||
item),
|
||||
'transfer_tray_model_codes': self.env['sf.functional.fixture']._json_transfer_tray_model_item_code(
|
||||
item),
|
||||
'pneumatic_tray_model_codes': self.env[
|
||||
'sf.functional.fixture']._json_pneumatic_tray_model_item_code(
|
||||
item),
|
||||
'magnetic_tray_model_codes': self.env['sf.functional.fixture']._json_magnetic_tray_model_item_code(
|
||||
item),
|
||||
'vice_tray_model_codes': self.env['sf.functional.fixture']._json_vice_tray_item_code(
|
||||
item),
|
||||
}
|
||||
functional_fixture_list.append(val)
|
||||
# kw = machine_tool_list
|
||||
kw = json.dumps(functional_fixture_list, ensure_ascii=False)
|
||||
r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
|
||||
ret = r.json()
|
||||
self.code = ret['message']
|
||||
self.state_zc = "已注册"
|
||||
if r == 200:
|
||||
return "功能夹具注册成功"
|
||||
else:
|
||||
raise ValidationError("没有功能夹具注册信息")
|
||||
|
||||
Reference in New Issue
Block a user