Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf

# Conflicts:
#	sf_manufacturing/models/__init__.py
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml
This commit is contained in:
jinling.yang
2023-01-09 20:33:53 +08:00
7 changed files with 210 additions and 20 deletions

View File

@@ -9,6 +9,13 @@ class ResWorkcenter(models.Model):
users_ids = fields.Many2many("res.users", 'users_workcenter')
# @api.onchange('machine_tool_id')
# def get_machine_tool_is_binding(self):
# print('1111111')
# for item in self:
# item.machine_tool_id.is_binding = False
equipment_ids = fields.One2many(
'maintenance.equipment', 'workcenter_id', string="Maintenance Equipment",
check_company=True)