From 46f40ec4804e7aac968cc5476d8e3057ee98962d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
 <xuhezhe@jikimo.com>
Date: Mon, 7 Aug 2023 16:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AE=8C=E5=90=8E=E7=9C=8B=E6=9D=BF=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/kanban_change.scss        |   5 +-
 .../static/src/xml/kanban_change.xml          |   2 +-
 .../views/mrp_workcenter_views.xml            | 176 ++++++++++--------
 3 files changed, 104 insertions(+), 79 deletions(-)

diff --git a/sf_manufacturing/static/src/scss/kanban_change.scss b/sf_manufacturing/static/src/scss/kanban_change.scss
index e68a6061..bed498d7 100644
--- a/sf_manufacturing/static/src/scss/kanban_change.scss
+++ b/sf_manufacturing/static/src/scss/kanban_change.scss
@@ -11,6 +11,9 @@
   height: 2vw !important;
   border: none !important;
   margin-left: 16px !important;
-  margin-top: 1vw !important;
+}
+
+.o_content > .d-flex {
+  display: block !important;
 }
 
diff --git a/sf_manufacturing/static/src/xml/kanban_change.xml b/sf_manufacturing/static/src/xml/kanban_change.xml
index ccd8fb21..b3718059 100644
--- a/sf_manufacturing/static/src/xml/kanban_change.xml
+++ b/sf_manufacturing/static/src/xml/kanban_change.xml
@@ -4,7 +4,7 @@
         <xpath expr="//t[@t-component='props.Renderer']" position="before">
         <div class="choosekanban">
                 <!--                 <t t-foreach="env['mrp.workcenter'].get_dynamic_data()" t-as="i" t-key="i"> -->
-                <t t-foreach="workOrders" t-as="i" t-key="i">
+                <t t-foreach="workOrders" t-as="i" t-key="i.id">
                     <button t-on-click="buttonClick" t-att-data-id="i.name">
                         <t t-esc="i.name"></t>
                     </button>
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 691bf16d..22037812 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -94,7 +94,7 @@
             <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
                 <field name="production_line_id"/>
                 <field name="equipment_id"/>
-                <field name="production_line_show"/>
+                <field name="production_line_show" invisible="1"/>
             </xpath>
             <xpath expr="//field[@name='resource_calendar_id']" position="after">
                 <field name="is_process_outsourcing"/>
@@ -102,66 +102,75 @@
         </field>
     </record>
 
-<!--     <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> -->
-<!--         <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> -->
-<!--         <field name="model">mrp.workcenter</field> -->
-<!--         <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> -->
-<!--         <field name="arch" type="xml"> -->
-<!--             <xpath expr="//div[@name='plan_order']" position="after"> -->
-<!--                 <div> -->
-<!--                     <a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a> -->
-<!--                 </div> -->
-<!--             </xpath> -->
-<!--         </field> -->
-<!--     </record> -->
-            <!-- 继承原有的看板视图 -->
-        <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
-            <field name="name">mrp.workcenter.kanban.inherit</field>
-            <field name="model">mrp.workcenter</field>
-            <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
-            <field name="arch" type="xml">
-                <xpath expr="//kanban" position="replace">
-                    <kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1" js_class="custom_kanban1">
+    <!--     <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> -->
+    <!--         <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> -->
+    <!--         <field name="model">mrp.workcenter</field> -->
+    <!--         <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> -->
+    <!--         <field name="arch" type="xml"> -->
+    <!--             <xpath expr="//div[@name='plan_order']" position="after"> -->
+    <!--                 <div> -->
+    <!--                     <a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a> -->
+    <!--                 </div> -->
+    <!--             </xpath> -->
+    <!--         </field> -->
+    <!--     </record> -->
+    <!-- 继承原有的看板视图 -->
+    <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
+        <field name="name">mrp.workcenter.kanban.inherit</field>
+        <field name="model">mrp.workcenter</field>
+        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr="//kanban" position="replace">
+                <kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1"
+                        js_class="custom_kanban1">
                     <field name="name"/>
                     <field name="color"/>
                     <field name="workorder_count"/>
                     <field name="working_state"/>
                     <field name="oee_target"/>
                     <field name="production_line_show"/>
+                    <field name="production_line_id"/>
                     <templates>
-                        <t t-name="kanban-box" t-if="record.production_line_id.value == record.production_line_show.raw_value">
+                        <t t-name="kanban-box"
+                           t-if="record.production_line_id.value == record.production_line_show.raw_value">
                             <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}">
                                 <div t-attf-class="o_kanban_card_header o_kanban_record_top">
                                     <div class="o_kanban_record_headings o_kanban_card_header_title">
                                         <span class="o_primary ml8" style="display: inline-block">
                                             <field name="name"/>
-                                            <field name="production_line_show"/>
                                         </span>
                                     </div>
                                     <div class="o_kanban_manage_button_section">
-                                        <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
+                                        <a class="o_kanban_manage_toggle_button" href="#">
+                                            <i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/>
+                                        </a>
                                     </div>
                                 </div>
                                 <div class="container o_kanban_card_content">
                                     <div class="row mb16">
                                         <div class="col-6 o_kanban_primary_left">
                                             <div class="btn-group" name="o_wo">
-                                            <t t-if="record.workorder_count.raw_value &gt; 0">
-                                                <button class="btn btn-primary" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1}">
-                                                    <span>WORK ORDERS</span>
-                                                </button>
-                                            </t>
-                                            <t  t-if="record.workorder_count.raw_value &lt;= 0">
-                                                <button class="btn btn-warning" name="%(mrp.act_product_mrp_production_workcenter)d" type="action">
-                                                    <span>PLAN ORDERS</span>
-                                                </button>
-                                            </t>
+                                                <t t-if="record.workorder_count.raw_value &gt; 0">
+                                                    <button class="btn btn-primary" name="action_work_order"
+                                                            type="object"
+                                                            context="{'search_default_ready': 1, 'search_default_progress': 1}">
+                                                        <span>WORK ORDERS</span>
+                                                    </button>
+                                                </t>
+                                                <t t-if="record.workorder_count.raw_value &lt;= 0">
+                                                    <button class="btn btn-warning"
+                                                            name="%(mrp.act_product_mrp_production_workcenter)d"
+                                                            type="action">
+                                                        <span>PLAN ORDERS</span>
+                                                    </button>
+                                                </t>
                                             </div>
                                         </div>
                                         <div class="col-6 o_kanban_primary_right">
                                             <div class="row" t-if="record.workorder_ready_count.raw_value &gt; 0">
                                                 <div class="col-8">
-                                                    <a name="action_work_order" type="object" context="{'search_default_ready': 1}">
+                                                    <a name="action_work_order" type="object"
+                                                       context="{'search_default_ready': 1}">
                                                         To Launch
                                                     </a>
                                                 </div>
@@ -171,7 +180,8 @@
                                             </div>
                                             <div class="row" t-if="record.workorder_progress_count.raw_value &gt; 0">
                                                 <div class="col-8">
-                                                    <a name="action_work_order" type="object" context="{'search_default_progress': 1}">
+                                                    <a name="action_work_order" type="object"
+                                                       context="{'search_default_progress': 1}">
                                                         In Progress
                                                     </a>
                                                 </div>
@@ -181,7 +191,8 @@
                                             </div>
                                             <div class="row" t-if="record.workorder_late_count.raw_value &gt; 0">
                                                 <div class="col-8">
-                                                    <a name="action_work_order" type="object" context="{'search_default_late': 1}">
+                                                    <a name="action_work_order" type="object"
+                                                       context="{'search_default_late': 1}">
                                                         Late
                                                     </a>
                                                 </div>
@@ -191,7 +202,8 @@
                                             </div>
                                             <div class="row" t-if="record.oee.raw_value &gt; 0">
                                                 <div class="col-6">
-                                                    <a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
+                                                    <a name="%(mrp.mrp_workcenter_productivity_report_oee)d"
+                                                       type="action">
                                                         OEE
                                                     </a>
                                                 </div>
@@ -206,22 +218,26 @@
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages">
-                                            <a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status float-end"
-                                                title="No workorder currently in progress. Click to mark work center as blocked."
-                                                aria-label="No workorder currently in progress. Click to mark work center as blocked."
-                                                attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/>
+                                        <div class="col-12 o_kanban_primary_left"
+                                             style="position:absolute; bottom:10px;" name="wc_stages">
+                                            <a name="%(mrp.act_mrp_block_workcenter)d" type="action"
+                                               class="o_status float-end"
+                                               title="No workorder currently in progress. Click to mark work center as blocked."
+                                               aria-label="No workorder currently in progress. Click to mark work center as blocked."
+                                               attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/>
                                             <a name="unblock" type="object" class=" o_status o_status_red float-end"
-                                                title="Workcenter blocked, click to unblock."
-                                                aria-label="Workcenter blocked, click to unblock."
-                                                attrs="{'invisible': [('working_state','in',('normal','done'))]}"/>
-                                            <a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status o_status_green float-end"
-                                                title="Work orders in progress. Click to block work center."
-                                                aria-label="Work orders in progress. Click to block work center."
-                                                attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
+                                               title="Workcenter blocked, click to unblock."
+                                               aria-label="Workcenter blocked, click to unblock."
+                                               attrs="{'invisible': [('working_state','in',('normal','done'))]}"/>
+                                            <a name="%(mrp.act_mrp_block_workcenter)d" type="action"
+                                               class="o_status o_status_green float-end"
+                                               title="Work orders in progress. Click to block work center."
+                                               aria-label="Work orders in progress. Click to block work center."
+                                               attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
                                         </div>
                                     </div>
-                                </div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
+                                </div>
+                                <div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
                                     <div class="row">
                                         <div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
                                             <div role="menuitem" class="o_kanban_card_manage_title">
@@ -230,24 +246,31 @@
                                             <div role="menuitem" name="plan_order">
                                                 <a name="action_work_order" type="object">Plan Orders</a>
                                             </div>
-                                        <div>
-                                            <a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a>
-                                        </div>
+                                            <div>
+                                                <a name="%(maintenance.hr_equipment_request_action)d" type="action">
+                                                    Maintenance
+                                                </a>
+                                            </div>
                                         </div>
                                         <div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
                                             <div role="menuitem" class="o_kanban_card_manage_title">
                                                 <span>Reporting</span>
                                             </div>
                                             <div role="menuitem">
-                                                <a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">OEE</a>
+                                                <a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
+                                                    OEE
+                                                </a>
                                             </div>
                                             <div role="menuitem">
-                                                <a name="%(mrp.mrp_workorder_workcenter_report)d" type="action" context="{'search_default_thisyear':True}">
+                                                <a name="%(mrp.mrp_workorder_workcenter_report)d" type="action"
+                                                   context="{'search_default_thisyear':True}">
                                                     Performance
                                                 </a>
                                             </div>
                                             <div role="menuitem">
-                                                <a name="action_work_order" type="object" context="{'search_default_waiting': 1}">Waiting Availability</a>
+                                                <a name="action_work_order" type="object"
+                                                   context="{'search_default_waiting': 1}">Waiting Availability
+                                                </a>
                                             </div>
                                         </div>
                                     </div>
@@ -265,9 +288,9 @@
                         </t>
                     </templates>
                 </kanban>
-                </xpath>
-            </field>
-        </record>
+            </xpath>
+        </field>
+    </record>
 
     <!-- MRP.PRODUCTION -->
     <record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
@@ -296,23 +319,22 @@
         </field>
     </record>
 
-<!--&lt;!&ndash;     测试searchpanel &ndash;&gt;-->
-<!--    <record id="view_location_search_sf11111_inherit" model="ir.ui.view">-->
-<!--        <field name="name">mrp.workcenter.inherit</field>-->
-<!--        <field name="model">mrp.workcenter</field>-->
-<!--        <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>-->
-<!--        <field name="arch" type="xml">-->
-<!--            <xpath expr="//search[1]" position="inside">-->
-<!--                <searchpanel class="account_root">-->
-<!--&lt;!&ndash;                     <field name="location_type" icon="fa-filter"/> &ndash;&gt;-->
-<!--                    <field name="production_line_id" select="multi"/>-->
-<!--                </searchpanel>-->
-<!--            </xpath>-->
-<!--        </field>-->
-<!--    </record>-->
+    <!--&lt;!&ndash;     测试searchpanel &ndash;&gt;-->
+    <!--    <record id="view_location_search_sf11111_inherit" model="ir.ui.view">-->
+    <!--        <field name="name">mrp.workcenter.inherit</field>-->
+    <!--        <field name="model">mrp.workcenter</field>-->
+    <!--        <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>-->
+    <!--        <field name="arch" type="xml">-->
+    <!--            <xpath expr="//search[1]" position="inside">-->
+    <!--                <searchpanel class="account_root">-->
+    <!--&lt;!&ndash;                     <field name="location_type" icon="fa-filter"/> &ndash;&gt;-->
+    <!--                    <field name="production_line_id" select="multi"/>-->
+    <!--                </searchpanel>-->
+    <!--            </xpath>-->
+    <!--        </field>-->
+    <!--    </record>-->
 
 
-
-=======
->>>>>>> develop
+    =======
+    >>>>>>> develop
 </odoo>