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-23 10:09:47 +08:00
parent 3c281230cc
commit cd33fb9fb9
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_base/models/base.py
View File

@@ -308,6 +308,13 @@ class MachineToolType(models.Model):
active = fields.Boolean('有效', default=True) active = fields.Boolean('有效', default=True)
code = fields.Char('编码') code = fields.Char('编码')
def _get_ids(self, machine_tool_type_code):
machine_tool_type_ids = []
for item in machine_tool_type_code:
machine_tool_type = self.search([('code', '=', item)])
machine_tool_type_ids.append(machine_tool_type.id)
return [(6, 0, machine_tool_type_ids)]
class MachineToolCategory(models.Model): class MachineToolCategory(models.Model):
_name = 'sf.machine_tool.category' _name = 'sf.machine_tool.category'

5
sf_base/models/fixture.py
View File

@@ -53,5 +53,10 @@ class FixtureModel(models.Model):
screw_size = fields.Integer(string="螺牙大小[mm]", size=6) screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
active = fields.Boolean('有效', default=True) active = fields.Boolean('有效', default=True)
# @api.model
# def create(self, vals):
# obj = super(FixtureModel, self).create(vals)
# return obj

19
sf_mrs_connect/models/sync_common.py
View File

@@ -1519,10 +1519,11 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search( "materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id, [('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'], "driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
[('code', '=', item['apply_machine_tool_type_code'])]).id, item['apply_machine_tool_type_code']).id,
"through_hole_size": item['through_hole_size'], "through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'], "screw_size": item['screw_size'],
"active": item['active'],
}) })
else: else:
fixture_model.write({ fixture_model.write({
@@ -1548,10 +1549,11 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search( "materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id, [('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'], "driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
[('code', '=', item['apply_machine_tool_type_code'])]).id, item['apply_machine_tool_type_code']).id,
"through_hole_size": item['through_hole_size'], "through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'], "screw_size": item['screw_size'],
"active": item['active'],
}) })
else: else:
raise ValidationError("认证未通过") raise ValidationError("认证未通过")
@@ -1599,10 +1601,11 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search( "materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id, [('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'], "driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
[('code', '=', item['apply_machine_tool_type_code'])]).id, item['apply_machine_tool_type_code']).id,
"through_hole_size": item['through_hole_size'], "through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'], "screw_size": item['screw_size'],
"active": item['active'],
}) })
else: else:
fixture_model.write({ fixture_model.write({
@@ -1628,8 +1631,8 @@ class SyncFixtureModel(models.Model):
"materials_model_id": self.env['sf.materials.model'].search( "materials_model_id": self.env['sf.materials.model'].search(
[('materials_no', '=', item['materials_model_code'])]).id, [('materials_no', '=', item['materials_model_code'])]).id,
"driving_way": item['driving_way'], "driving_way": item['driving_way'],
"apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search( "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
[('code', '=', item['apply_machine_tool_type_code'])]).id, item['apply_machine_tool_type_code']).id,
"through_hole_size": item['through_hole_size'], "through_hole_size": item['through_hole_size'],
"screw_size": item['screw_size'], "screw_size": item['screw_size'],
"active": item['active'], "active": item['active'],