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

修复工作中心计划报错的问题，修改制造模块目录结构

Browse Source
This commit is contained in:
mgw
2023-07-17 15:37:23 +08:00
parent 6389186851
commit c0d14daf44
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/mrp_workcenter.py
View File

@@ -61,7 +61,7 @@ class ResWorkcenter(models.Model):
AND equipment_id IS NOT NULL AND equipment_id IS NOT NULL
AND maintenance_equipment.workcenter_id IS NOT NULL AND maintenance_equipment.workcenter_id IS NOT NULL
AND maintenance_equipment.workcenter_id IN %s AND maintenance_equipment.workcenter_id IN %s
AND (schedule_date, schedule_date + INT ERVAL '1h' * duration) OVERLAPS (%s, %s) AND (schedule_date, schedule_date + INTERVAL '1 hour') OVERLAPS (%s, %s)
GROUP BY maintenance_equipment.workcenter_id; GROUP BY maintenance_equipment.workcenter_id;
""" """
self.env.cr.execute(sql, [tuple(self.ids), fields.Datetime.to_string(start_datetime.astimezone()), self.env.cr.execute(sql, [tuple(self.ids), fields.Datetime.to_string(start_datetime.astimezone()),

12
sf_plan_management/views/operations_rename_menu.xml
View File

@@ -4,5 +4,17 @@
<record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu"> <record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
<field name="name">计划管理</field> <field name="name">计划管理</field>
</record> </record>
<record id="mrp_workorder.mrp_workorder_menu_planning" model="ir.ui.menu">
<field name="name">工单计划</field>
<field name="sequence" eval="300"/>
<field name="parent_id" ref="mrp.menu_mrp_manufacturing"/>
</record>
<record id="mrp.mrp_planning_menu_root" model="ir.ui.menu">
<field name="active" eval="False"/>
</record>
</data> </data>
</odoo> </odoo>