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

1、删除夹具xml中的无用代码；2、优化夹具物料同步功能

Browse Source
This commit is contained in:
yuxianghui
2024-01-11 14:10:49 +08:00
parent 077ce6d37f
commit bc6303d1af
2 changed files with 24 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sf_base/views/fixture_view.xml
View File

@@ -32,30 +32,6 @@
</field> </field>
</record> </record>
<!-- <record id="sf_fixture_material_view_form" model="ir.ui.view">-->
<!-- <field name="name">夹具物料</field>-->
<!-- <field name="model">sf.fixture.material</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="夹具物料">-->
<!-- <sheet>-->
<!-- <group string="基本信息">-->
<!-- <group>-->
<!-- <field name="code"/>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="name"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- <group>-->
<!-- &lt;!&ndash; <group>&ndash;&gt;-->
<!-- <field name="remark"/>-->
<!-- &lt;!&ndash; </group>&ndash;&gt;-->
<!-- </group>-->
<!-- </sheet>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<record id="sf_fixture_material_view_act" model="ir.actions.act_window"> <record id="sf_fixture_material_view_act" model="ir.actions.act_window">
<field name="name">夹具物料</field> <field name="name">夹具物料</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@@ -96,28 +72,6 @@
</field> </field>
</record> </record>
<!-- <record id="sf_multi_mounting_type_view_form" model="ir.ui.view">-->
<!-- <field name="name">联装类型</field>-->
<!-- <field name="model">sf.multi_mounting.type</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="联装类型">-->
<!-- <sheet>-->
<!-- <group string="基本信息">-->
<!-- <group>-->
<!-- <field name="code"/>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="name"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="remark"/>-->
<!-- </group>-->
<!-- </sheet>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<record id="sf_multi_mounting_type_view_act" model="ir.actions.act_window"> <record id="sf_multi_mounting_type_view_act" model="ir.actions.act_window">
<field name="name">联装类型</field> <field name="name">联装类型</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>

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'): if result.get('fixture_model_yesterday_list'):
for item in result['fixture_model_yesterday_list']: for item in result['fixture_model_yesterday_list']:
if item: if item:
fixture_model = self.search([("code", '=', item['code'])]) fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
zero_chuck_list = [] zero_chuck_list = []
for zero_chuck_id in item['zero_chuck_ids']: for zero_chuck_id in item['zero_chuck_ids']:
zero_chuck_list.append( zero_chuck_list.append(
@@ -1520,6 +1520,17 @@ class SyncFixtureModel(models.Model):
"active": item['active'], "active": item['active'],
}) })
else: 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({ fixture_model.write({
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
@@ -1555,7 +1566,7 @@ class SyncFixtureModel(models.Model):
if result.get('fixture_model_all_list'): if result.get('fixture_model_all_list'):
for item in result['fixture_model_all_list']: for item in result['fixture_model_all_list']:
if item: if item:
fixture_model = self.search([('code', '=', item['code'])]) fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
zero_chuck_list = [] zero_chuck_list = []
for zero_chuck_id in item['zero_chuck_ids']: for zero_chuck_id in item['zero_chuck_ids']:
zero_chuck_list.append( zero_chuck_list.append(
@@ -1610,6 +1621,17 @@ class SyncFixtureModel(models.Model):
"active": item['active'], "active": item['active'],
}) })
else: 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({ fixture_model.write({
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],