From c0d14daf449497872f51ebd18a2e189499d3ffc4 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 17 Jul 2023 15:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=AE=A1=E5=88=92=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=B6=E9=80=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workcenter.py           |  2 +-
 sf_plan_management/views/operations_rename_menu.xml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py
index 3539327a..7483d188 100644
--- a/sf_manufacturing/models/mrp_workcenter.py
+++ b/sf_manufacturing/models/mrp_workcenter.py
@@ -61,7 +61,7 @@ class ResWorkcenter(models.Model):
                AND equipment_id IS NOT NULL
                AND maintenance_equipment.workcenter_id IS NOT NULL
                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;
            """
         self.env.cr.execute(sql, [tuple(self.ids), fields.Datetime.to_string(start_datetime.astimezone()),
diff --git a/sf_plan_management/views/operations_rename_menu.xml b/sf_plan_management/views/operations_rename_menu.xml
index 2070e869..990d7bb1 100644
--- a/sf_plan_management/views/operations_rename_menu.xml
+++ b/sf_plan_management/views/operations_rename_menu.xml
@@ -4,5 +4,17 @@
         <record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
             <field name="name">计划管理</field>
         </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>
 </odoo>
\ No newline at end of file