From 5dc5c814c858bd462455c4bea8105039a40c7060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Thu, 14 Nov 2024 16:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E5=B7=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/sale_order_views.xml                | 19 ++----------------
 sf_manufacturing/models/mrp_production.py     | 20 +++++++++----------
 .../views/mrp_production_addional_change.xml  |  6 +++---
 sf_plan/models/custom_plan.py                 | 12 +++++------
 sf_plan/views/view.xml                        |  2 +-
 5 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
index afe3ad75..2ea9a835 100644
--- a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
+++ b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
@@ -42,21 +42,6 @@
         </field>
     </record>
 
-    <record id="jikimo_sale_order_view_search_inherit_quotation" model="ir.ui.view">
-        <field name="name">jikimo.sale.order.search.inherit.quotation</field>
-        <field name="model">sale.order</field>
-        <field name="mode">primary</field>
-        <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
-        <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_quotation']" position="attributes">
-                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
-            </xpath>
-             <xpath expr="//filter[@name='draft']" position="after">
-                <filter string="供货方式待确认" name="supply_method" domain="[('state', '=', 'supply method')]"/>
-            </xpath>
-        </field>
-    </record>
-
     <record id="jikimo_sale_order_view_search_inherit_quotation_supply_method" model="ir.ui.view">
         <field name="name">jikimo.sale.order.search.inherit.quotation.supply.method</field>
         <field name="model">sale.order</field>
@@ -72,8 +57,8 @@
         </field>
     </record>
 
-    <record id="sale.action_quotations" model="ir.actions.act_window">
-        <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation"/>
+    <record id="sale.action_quotations_with_onboarding" model="ir.actions.act_window">
+        <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
     </record>
 
     <record id="action_quotations_supply_method" model="ir.actions.act_window">
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 13be15e3..40239012 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1300,17 +1300,17 @@ class MrpProduction(models.Model):
         return production_values_str
 
     # 增加制造订单类型
-    # production_type = fields.Selection(
-    #     [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
-    #     string='制造类型',
-    #     compute='_compute_production_type',
-    #     store=True
-    # )
+    production_type = fields.Selection(
+        [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
+        string='制造类型',
+        compute='_compute_production_type',
+        store=True
+    )
 
-    # @api.depends('product_id.is_manual_processing')
-    # def _compute_production_type(self):
-    #     for production in self:
-    #         production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
+    @api.depends('product_id.is_manual_processing')
+    def _compute_production_type(self):
+        for production in self:
+            production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
 
 
 class sf_detection_result(models.Model):
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index ee52cb3e..c218c2d5 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -35,10 +35,10 @@
                     <field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'"
                            decoration-success="reservation_state == 'assigned'"/>
                 </xpath>
-                <!-- <xpath expr="//field[@name='state']" position="before">
+                <xpath expr="//field[@name='state']" position="before">
                     <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'"
                            decoration-success="production_type == '自动化产线加工'" optional="show"/>
-                </xpath> -->
+                </xpath>
                 <xpath expr="//field[@name='activity_ids']" position="replace">
                     <field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
                 </xpath>
@@ -91,7 +91,7 @@
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
-                    <!-- <field name="production_type" readonly="1"/> -->
+                    <field name="production_type" readonly="1"/>
                     <field name="manual_quotation" readonly="1"/>
                     <field name="programming_no" readonly="1"/>
                     <field name="programming_state" readonly="1"
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index d8cbe1fd..273cbfc6 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -417,12 +417,12 @@ class sf_production_plan(models.Model):
             raise UserError(e)
         
     # 增加制造订单类型
-    # production_type = fields.Selection(
-    #     [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
-    #     string='制造类型',
-    #     related='production_id.production_type',
-    #     store=True
-    # )
+    production_type = fields.Selection(
+        [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
+        string='制造类型',
+        related='production_id.production_type',
+        store=True
+    )
 
 
 # 机台作业计划
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 9a7d2b26..6d6bc682 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -22,7 +22,7 @@
                     <field name="production_line_id"/>
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
-                    <!-- <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/> -->
+                    <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/>
                     <field name="actual_start_time" optional='hide'/>
                     <field name="actual_end_time" optional='hide'/>
                     <field name="actual_process_time" optional='hide'/>