From b12470b813601cd4dc27c099335a9fb464059a52 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 21 Apr 2023 11:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BC=81=E4=B8=9A=E7=89=88?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mrp_workorder/views/mrp_workcenter_views.xml | 60 +++++++++-----------
 odoo.conf                                    |  2 +-
 sf_base/views/common_view.xml                |  5 +-
 sf_manufacturing/models/mrp_production.py    |  6 +-
 sf_manufacturing/models/mrp_workorder.py     |  1 +
 5 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/mrp_workorder/views/mrp_workcenter_views.xml b/mrp_workorder/views/mrp_workcenter_views.xml
index a965062e..07c97664 100644
--- a/mrp_workorder/views/mrp_workcenter_views.xml
+++ b/mrp_workorder/views/mrp_workcenter_views.xml
@@ -1,37 +1,29 @@
 <odoo>
-    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
-        <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
-        <field name="model">mrp.workcenter</field>
-        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
-        <field name="arch" type="xml">
-            <!-- Desktop view -->
-            <xpath expr="//div[@name='o_wo']" position="inside">
-                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}" title="Work orders" aria-label="Work orders"/>
-            </xpath>
-        </field>
-    </record>
-
-    <!-- override to change the no content image -->
-    <record id="mrp.action_work_orders" model="ir.actions.act_window">
-        <field name="help" type="html">
-          <p class="o_view_nocontent_workorder">
-            No work orders to do!
-          </p><p>
-            Work orders are operations to do as part of a manufacturing order.
-            Operations are defined in the bill of materials or added in the manufacturing order directly.
-          </p><p>
-            Use the table work center control panel to register operations in the shop floor directly.
-            The tablet provides worksheets for your workers and allow them to scrap products, track time,
-            launch a maintenance request, perform quality tests, etc.
-          </p>
-        </field>
-    </record>
-
-    <menuitem id="menu_mrp_dashboard"
-        name="Overview"
-        action="mrp.mrp_workcenter_kanban_action"
-        groups="mrp.group_mrp_routings"
-        parent="mrp.menu_mrp_root"
-        sequence="5"/>
+<!--    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">-->
+<!--        <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>-->
+<!--        <field name="model">mrp.workcenter</field>-->
+<!--        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>-->
+<!--        <field name="arch" type="xml">-->
+<!--            &lt;!&ndash; Desktop view &ndash;&gt;-->
+<!--            <xpath expr="//div[@name='o_wo']" position="inside">-->
+<!--                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}" title="Work orders" aria-label="Work orders"/>-->
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->
 
+<!--    &lt;!&ndash; override to change the no content image &ndash;&gt;-->
+<!--    <record id="mrp.action_work_orders" model="ir.actions.act_window">-->
+<!--        <field name="help" type="html">-->
+<!--          <p class="o_view_nocontent_workorder">-->
+<!--            No work orders to do!-->
+<!--          </p><p>-->
+<!--            Work orders are operations to do as part of a manufacturing order.-->
+<!--            Operations are defined in the bill of materials or added in the manufacturing order directly.-->
+<!--          </p><p>-->
+<!--            Use the table work center control panel to register operations in the shop floor directly.-->
+<!--            The tablet provides worksheets for your workers and allow them to scrap products, track time,-->
+<!--            launch a maintenance request, perform quality tests, etc.-->
+<!--          </p>-->
+<!--        </field>-->
+<!--    </record>-->
 </odoo>
diff --git a/odoo.conf b/odoo.conf
index 4a01c699..93eb02d3 100644
--- a/odoo.conf
+++ b/odoo.conf
@@ -4,7 +4,7 @@ csv_internal_sep = ,
 data_dir = /var/lib/odoo
 db_host = 172.17.0.2
 db_maxconn = 64
-db_name = sf_dev
+db_name = sf_dev_pro
 db_password = sf
 db_port = 5432
 db_sslmode = prefer
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index 219d212e..be899852 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -203,10 +203,7 @@
 
                     </group>
                     <group>
-
-                                 <button string="测试跳转" name="open_url_action" type="object" confirm="是否确认下发补偿"
-                                    class="btn-primary" />
-                        <field name="remark" widget="code"/>
+                        <field name="remark"/>
                     </group>
                 </form>
             </field>
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 10fa7e25..361d6c01 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -135,9 +135,9 @@ class MrpProduction(models.Model):
                 for route in embryo_routing_workcenter:
                     workorders_values.append(
                         self.env['mrp.workorder'].json_workorder_str('', production, route))
-            # production.workorder_ids = workorders_values
-            # for workorder in production.workorder_ids:
-            #     workorder.duration_expected = workorder._get_duration_expected()
+            production.workorder_ids= workorders_values
+            for workorder in production.workorder_ids:
+                workorder.duration_expected = workorder._get_duration_expected()
 
 
     #在之前的销售单上重新生成制造订单
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index bc43c91b..54c5d39d 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -145,6 +145,7 @@ class ResMrpWorkOrder(models.Model):
             'operation_id': False,
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
+            'quality_point_ids':route.route_workcenter_id.quality_point_ids,
             'routing_type': route.routing_type,
             'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,