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

Merge remote-tracking branch 'origin/feature/功能刀具新增字段' into feature/夹具型号同步优化

Browse Source
This commit is contained in:
yuxianghui
2024-01-11 14:11:57 +08:00
parent 0cf3e6e7d6 bc6303d1af
commit d042de9e84
9 changed files with 112 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sf_mrs_connect/models/sync_common.py
View File

@@ -1465,7 +1465,7 @@ class SyncFixtureModel(models.Model):
if result.get('fixture_model_yesterday_list'):
for item in result['fixture_model_yesterday_list']:
if item:
fixture_model = self.search([("code", '=', item['code'])])
fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
zero_chuck_list = []
for zero_chuck_id in item['zero_chuck_ids']:
zero_chuck_list.append(
@@ -1520,6 +1520,17 @@ class SyncFixtureModel(models.Model):
"active": item['active'],
})
else:
fixture_model.write({
"zero_chuck_ids": [(5, 0, 0)],
"zero_tray_ids": [(5, 0, 0)],
"pneumatic_fixture_ids": [(5, 0, 0)],
"jaw_vice_fixture_ids": [(5, 0, 0)],
"magnet_fixture_ids": [(5, 0, 0)],
"adapter_board_fixture_ids": [(5, 0, 0)],
"scroll_chuck_ids": [(5, 0, 0)],
})
self.env['sf.fixture.materials.basic.parameters'].sudo().search(
[('fixture_model_id', '=', False)]).unlink()
fixture_model.write({
"name": item['name'],
"code": item['code'],
@@ -1555,7 +1566,7 @@ class SyncFixtureModel(models.Model):
if result.get('fixture_model_all_list'):
for item in result['fixture_model_all_list']:
if item:
fixture_model = self.search([("code", '=', item['code'])])
fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
zero_chuck_list = []
for zero_chuck_id in item['zero_chuck_ids']:
zero_chuck_list.append(
@@ -1610,6 +1621,17 @@ class SyncFixtureModel(models.Model):
"active": item['active'],
})
else:
fixture_model.write({
"zero_chuck_ids": [(5, 0, 0)],
"zero_tray_ids": [(5, 0, 0)],
"pneumatic_fixture_ids": [(5, 0, 0)],
"jaw_vice_fixture_ids": [(5, 0, 0)],
"magnet_fixture_ids": [(5, 0, 0)],
"adapter_board_fixture_ids": [(5, 0, 0)],
"scroll_chuck_ids": [(5, 0, 0)],
})
self.env['sf.fixture.materials.basic.parameters'].sudo().search(
[('fixture_model_id', '=', False)]).unlink()
fixture_model.write({
"name": item['name'],
"code": item['code'],