From 7cbaf7373a28c586258d355ef25af01e010723bf Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 12 Sep 2023 11:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=97=E4=BD=99=E8=8F=9C=E5=8D=95=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml    | 10 +++++-----
 sf_plan/__manifest__.py                          |  2 +-
 sf_plan/views/view.xml                           | 14 +++++++-------
 sf_plan_management/__manifest__.py               |  2 +-
 sf_plan_management/i18n/zh_CN.po                 |  2 +-
 sf_plan_management/views/menu_view.xml           |  2 +-
 .../views/operations_rename_menu.xml             | 16 +++++++++++++---
 7 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 66afcc56..8066fa41 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -451,11 +451,11 @@
         <field name="domain">[('schedule_state', '=', '已排')]</field>
     </record>
 
-    <menuitem id="menu_mrp_workorder_schedule_todo"
-              name="工单"
-              action="mrp_workorder_action_schedule"
-              parent="mrp.menu_mrp_manufacturing"
-              sequence="15"/>
+<!--     <menuitem id="menu_mrp_workorder_schedule_todo" -->
+<!--               name="工单" -->
+<!--               action="mrp_workorder_action_schedule" -->
+<!--               parent="mrp.menu_mrp_manufacturing" -->
+<!--               sequence="15"/> -->
 
     <record id="mrp.menu_mrp_workorder_todo" model="ir.ui.menu">
         <field name="active" eval="False"/>
diff --git a/sf_plan/__manifest__.py b/sf_plan/__manifest__.py
index ba43169d..54f3b064 100644
--- a/sf_plan/__manifest__.py
+++ b/sf_plan/__manifest__.py
@@ -13,7 +13,7 @@
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
     # 此处依赖sf_manufacturing是因为我要重写其中的一个字段operation_id的string，故需要sf_manufacturing先安装
-    'depends': ['mrp', 'mrp_workorder', 'sf_manufacturing'],
+    'depends': ['sf_manufacturing'],
     'data': [
         'security/ir.model.access.csv',
         'views/view.xml'
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index bce1cae5..1f35b088 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -305,13 +305,13 @@
                 action="sf_production_plan_action1"
                 parent="sf_production_plan_menu"
         />
-        <menuitem
-                id="machine_work_schedule"
-                name="机台作业计划"
-                sequence="200"
-                action="action_machine_work_schedule"
-                parent="sf_production_plan_menu"
-        />
+<!--         <menuitem -->
+<!--                 id="machine_work_schedule" -->
+<!--                 name="机台作业计划" -->
+<!--                 sequence="200" -->
+<!--                 action="action_machine_work_schedule" -->
+<!--                 parent="sf_production_plan_menu" -->
+<!--         /> -->
 
 
 <!--          --><!-- 在现有菜单结构后面加入自定义的动作 -->
diff --git a/sf_plan_management/__manifest__.py b/sf_plan_management/__manifest__.py
index 40043146..66f1b72d 100644
--- a/sf_plan_management/__manifest__.py
+++ b/sf_plan_management/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_manufacturing'],
+    'depends': ['sf_plan'],
     'data': [
         'security/ir.model.access.csv',
         # 'security/ir.model.access.csv',
diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index 6e87cb88..d92d2937 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -21623,7 +21623,7 @@ msgstr "无包裹作业"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Operations1"
-msgstr "计划管理"
+msgstr "制造订单"
 
 #. module: mrp_workorder
 #: model_terms:ir.ui.view,arch_db:mrp_workorder.mrp_workorder_view_form_inherit_workorder
diff --git a/sf_plan_management/views/menu_view.xml b/sf_plan_management/views/menu_view.xml
index 6817e30c..491bb533 100644
--- a/sf_plan_management/views/menu_view.xml
+++ b/sf_plan_management/views/menu_view.xml
@@ -3,7 +3,7 @@
 
     <menuitem id="menu_sf_basic_setting"
               name="基础设置"
-              parent="mrp.menu_mrp_manufacturing"
+              parent="sf_plan.sf_production_plan_menu"
               sequence="599"
     />
 
diff --git a/sf_plan_management/views/operations_rename_menu.xml b/sf_plan_management/views/operations_rename_menu.xml
index 2bafbdc9..b7d41013 100644
--- a/sf_plan_management/views/operations_rename_menu.xml
+++ b/sf_plan_management/views/operations_rename_menu.xml
@@ -8,16 +8,26 @@
             <field name="name">Process</field>
         </record>
 
+        <record id="mrp_workorder.menu_mrp_workorder_workcenter" model="ir.ui.menu">
+<!--                       <field name="name">工单计划</field> -->
+           <field name="sequence" eval="300"/>
+           <field name="parent_id" ref="sf_plan.sf_production_plan_menu"/>
+        </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"/>
+<!--            <field name="name">工单计划</field> -->
+<!--            <field name="sequence" eval="300"/> -->
+<!--            <field name="parent_id" ref="mrp.menu_mrp_manufacturing"/> -->
+           <field name="active" eval="False"/>
         </record>
 
         <record id="mrp.mrp_planning_menu_root" model="ir.ui.menu">
            <field name="active" eval="False"/>
         </record>
+        <record id="mrp_workorder.menu_mrp_workorder_production" model="ir.ui.menu">
+           <field name="active" eval="False"/>
+        </record>
 
 
     </data>