From 7743c9658cc206d7b29977a12afe3d3f51788d15 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 10 Jul 2023 17:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=8F=9C=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mrp_workorder/views/mrp_workorder_views.xml   |  5 +-
 sf_maintenance/__manifest__.py                |  3 +-
 sf_manufacturing/models/mrp_workorder.py      | 12 ++++
 sf_manufacturing/views/mrp_workorder_view.xml | 69 +++++++++++++------
 4 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/mrp_workorder/views/mrp_workorder_views.xml b/mrp_workorder/views/mrp_workorder_views.xml
index efabc78b..61491d4c 100644
--- a/mrp_workorder/views/mrp_workorder_views.xml
+++ b/mrp_workorder/views/mrp_workorder_views.xml
@@ -160,10 +160,7 @@ if env.user.has_group('mrp.group_mrp_workorder_dependencies'):
 <!--        <field name="name">Work Orders</field>-->
 <!--        <field name="type">ir.actions.act_window</field>-->
 <!--        <field name="res_model">mrp.workorder</field>-->
-<!--        <field name="view_mode">kanban,tree,form</field>-->
-<!--        <field name="view_ids" eval="[(5, 0, 0),-->
-<!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}),-->
-<!--            (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>-->
+
 <!--        <field name="target">fullscreen</field>-->
 <!--        <field name="domain">[('state', 'not in', ['done', 'cancel'])]</field>-->
 <!--        <field name="context">{'search_default_workcenter_id': active_id}</field>-->
diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py
index cc2a1d46..17b1e541 100644
--- a/sf_maintenance/__manifest__.py
+++ b/sf_maintenance/__manifest__.py
@@ -12,12 +12,11 @@
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',
-        'views/production_line_base.py',
+        'views/production_line_view.xml',
         'views/maintenance_views.xml',
         'views/maintenance_logs_views.xml',
         'views/equipment_maintenance_standards_views.xml',
         'views/maintenance_request_views.xml',
-        'views/production_line_view.xml',
     ],
     'installable': True,
     'application': False,
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 2c38616e..3b1ecdb1 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -524,6 +524,18 @@ class ResMrpWorkOrder(models.Model):
                 })
         super().button_finish()
 
+    def action_view_schedule_tree(self):
+        # 执行打开树视图的操作(已排程的工单)
+        return {
+            'name': 'Schedule Work Order Tree',
+            'type': 'ir.actions.act_window',
+            'res_model': 'mrp.workorder',
+            'target': 'current',
+            'view_mode': 'tree',
+            'views': [[self.env.ref('mrp.mrp_production_workorder_tree_editable_view').id], 'tree'],
+            'domain': [('schedule_state', '=', '已排')],
+        }
+
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index e024b46c..db5f2ed4 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -11,7 +11,6 @@
                 <field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/>
             </field>
             <field name="name" position="before">
-                <field name="schedule_state"/>
                 <field name="sequence"/>
                 <field name='user_permissions' invisible="1"/>
             </field>
@@ -96,26 +95,26 @@
         </field>
     </record>
 
-    <record model="ir.actions.act_window" id="mrp_workorder_action_scheduled">
-        <field name="name">工单</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mrp.workorder</field>
-        <field name="view_mode">tree,kanban,form</field>
-        <field name="view_id" ref="view_mrp_production_workorder_tree_editable_inherit_sf"/>
+    <!--    <record model="ir.actions.act_window" id="mrp_workorder_action_scheduled">-->
+    <!--        <field name="name">工单</field>-->
+    <!--        <field name="type">ir.actions.act_window</field>-->
+    <!--        <field name="res_model">mrp.workorder</field>-->
+    <!--        <field name="view_mode">tree,kanban,form</field>-->
+    <!--        <field name="view_id" ref="view_mrp_production_workorder_tree_editable_inherit_sf"/>-->
 
-        <!--        <field name="view_ids" eval="[(5, 0, 0),-->
-        <!--            (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_view')}),-->
-        <!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>-->
-        <!--        <field name="target">fullscreen</field>-->
-<!--        <field name="search_view_id" ref="mrp.view_mrp_production_workorder_form_view_filter"/>-->
-<!--        <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>-->
-<!--        <field name="context">{'search_default_workcenter_id': active_id}</field>-->
-        <field name="help" type="html">
-            <p class="o_view_nocontent_workorder">
-                没有已排程的工单！
-            </p>
-        </field>
-    </record>
+    <!--        &lt;!&ndash;        <field name="view_ids" eval="[(5, 0, 0),&ndash;&gt;-->
+    <!--        &lt;!&ndash;            (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_view')}),&ndash;&gt;-->
+    <!--        &lt;!&ndash;            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>&ndash;&gt;-->
+    <!--        &lt;!&ndash;        <field name="target">fullscreen</field>&ndash;&gt;-->
+    <!--        &lt;!&ndash;        <field name="search_view_id" ref="mrp.view_mrp_production_workorder_form_view_filter"/>&ndash;&gt;-->
+    <!--        &lt;!&ndash;        <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>&ndash;&gt;-->
+    <!--        &lt;!&ndash;        <field name="context">{'search_default_workcenter_id': active_id}</field>&ndash;&gt;-->
+    <!--        <field name="help" type="html">-->
+    <!--            <p class="o_view_nocontent_workorder">-->
+    <!--                没有已排程的工单！-->
+    <!--            </p>-->
+    <!--        </field>-->
+    <!--    </record>-->
 
 
     <!--    <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">-->
@@ -440,5 +439,35 @@
             </xpath>
         </field>
     </record>
+
+
+    <record id="mrp_workorder_action_schedule" model="ir.actions.act_window">
+        <field name="name">工单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workorder</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_id" eval="mrp.mrp_production_workorder_tree_editable_view"/>
+        <field name="search_view_id" ref="mrp.view_mrp_production_work_order_search"/>
+        <field name="domain">[('schedule_state', '=', '已排')]</field>
+    </record>
+
+    <menuitem id="menu_mrp_workorder_schedule_todo"
+              name="工单1"
+              action="mrp_workorder_action_schedule"
+              parent="mrp.menu_mrp_manufacturing"
+              sequence="15"/>
+
+    <!--    <record id="action_schedule_workorder_tree" model="ir.actions.server">-->
+    <!--        <field name="name">View Schedule Work Order Tree</field>-->
+    <!--        <field name="model_id" ref="model_mrp_workorder"/>-->
+    <!--        <field name="state">code</field>-->
+    <!--        <field name="code">model.action_view_schedule_tree()</field>-->
+    <!--    </record>-->
+
+    <!--    <record id="menu_schedule_workorder_tree" model="ir.ui.menu">-->
+    <!--        <field name="name">schedule Work Order Tree</field>-->
+    <!--        <field name="action" ref="action_schedule_workorder_tree"/>-->
+    <!--        <field name="sequence" eval="16"/>-->
+    <!--    </record>-->
 </odoo>