diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 0a7d1e8e..692c3b7f 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -32,30 +32,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
夹具物料
ir.actions.act_window
@@ -96,28 +72,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
联装类型
ir.actions.act_window
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 31c49d36..df9437ba 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -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'],