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

同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工

Browse Source
This commit is contained in:
jinling.yang
2023-08-21 11:49:24 +08:00
parent 78ddf4e52f
commit f6841e5e9f
3 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sf_mrs_connect/models/sync_common.py
View File

@@ -99,25 +99,33 @@ class sfMaterialModel(models.Model):
if result['status'] == 1:
for item in result['materials_model_yesterday_list']:
if item:
brand = self.env['sf.materials.model'].search(
materials_model = self.env['sf.materials.model'].search(
[("materials_no", '=', item['materials_no'])])
if brand:
brand.id = item['id'],
brand.name = item['name'],
brand.materials_no = item['materials_no'],
brand.remark = item['remark'],
brand.active = item['active'],
brand.mf_materia_post = item['mf_materia_post'],
brand.materials_id = self.env['sf.production.materials'].search(
if materials_model:
materials_model.id = item['id'],
materials_model.name = item['name'],
materials_model.materials_no = item['materials_no'],
materials_model.remark = item['remark'],
materials_model.tensile_strength = item['tensile_strength'],
materials_model.hardness = item['hardness'],
materials_model.materials_no = item['materials_no'],
materials_model.rough_machining = item['rough_machining'],
materials_model.finish_machining = item['finish_machining'],
materials_model.mf_materia_post = item['mf_materia_post'],
materials_model.materials_id = self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id,
brand.need_h = item['need_h'],
brand.density = item['density']
materials_model.need_h = item['need_h'],
materials_model.density = item['density']
else:
self.env['sf.materials.model'].create({
"id": item['id'],
"name": item['name'],
"materials_no": item['materials_no'],
"remark": item['remark'],
"tensile_strength": item['tensile_strength'],
"hardness": item['hardness'],
"rough_machining": item['rough_machining'],
"finish_machining": item['finish_machining'],
"active": item['active'],
"materials_id": self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id,
@@ -143,14 +151,18 @@ class sfMaterialModel(models.Model):
if result['status'] == 1:
for item in result['materials_model_all_list']:
if item:
brand = self.env['sf.materials.model'].search(
materials_model = self.env['sf.materials.model'].search(
[("materials_no", '=', item['materials_no'])])
if not brand:
if not materials_model:
self.env['sf.materials.model'].create({
"name": item['name'],
"materials_no": item['materials_no'],
"remark": item['remark'],
"active": item['active'],
"tensile_strength": item['tensile_strength'],
"hardness": item['hardness'],
"rough_machining": item['rough_machining'],
"finish_machining": item['finish_machining'],
"materials_id": self.env['sf.production.materials'].search(
[("materials_no", '=', item['materials_id.materials_no'])]).id,
"need_h": item['need_h'],
@@ -576,7 +588,6 @@ class MachineBrand(models.Model):
raise ValidationError("认证未通过")
class MachineToolType(models.Model):
_inherit = 'sf.machine_tool.type'
_description = '机床型号'
@@ -2034,8 +2045,7 @@ class SfToolModel(models.Model):
else:
raise ValidationError("认证未通过")
# 同步所有刀具型号列表
# 同步所有刀具型号列表
def sync_all_tool_model(self):
sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token']