From 73c986cd504f36929165e13e31d1fd35156d0ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 15 Nov 2024 15:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B6=E9=80=A0=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__manifest__.py                           |  2 +-
 .../views/product_product_views.xml           | 10 +++++-----
 .../product_template_management_view.xml      |  3 +++
 sf_manufacturing/__manifest__.py              |  2 +-
 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 +-
 8 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/jikimo_sale_multiple_supply_methods/__manifest__.py b/jikimo_sale_multiple_supply_methods/__manifest__.py
index 7a361bdd..a7d39ac7 100644
--- a/jikimo_sale_multiple_supply_methods/__manifest__.py
+++ b/jikimo_sale_multiple_supply_methods/__manifest__.py
@@ -12,7 +12,7 @@
         'data/stock_routes.xml',
         'data/product_data.xml',
         'views/sale_order_views.xml',
-        'views/product_product_views.xml',
+        # 'views/product_product_views.xml',
     ],'assets': {
             #   'web.assets_backend': [
             #       'jikimo_sale_multiple_supply_methods/static/src/**/*'
diff --git a/jikimo_sale_multiple_supply_methods/views/product_product_views.xml b/jikimo_sale_multiple_supply_methods/views/product_product_views.xml
index 9c0f67ff..2c14d2b5 100644
--- a/jikimo_sale_multiple_supply_methods/views/product_product_views.xml
+++ b/jikimo_sale_multiple_supply_methods/views/product_product_views.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="product_template_only_form_view" model="ir.ui.view">
+    <!-- 由于该模块不能依赖sf_dlm_management, 该功能只能在sf_dlm_management中实现，并且依赖该模块-->
+    <record id="view_product_product_form_inherit_sf" model="ir.ui.view">
         <field name="name">view.product.template.form.inherit.sf</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="inherit_id" ref="sf_dlm_management.view_sale_product_template_form_inherit_sf"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='uom_id']" position="before">
-                <field name="categ_type" invisible="1"/>
-                <field name="is_manual_processing" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
+            <xpath expr="//field[@name='manual_quotation']" position="after">
+                <field name="is_customer_provided" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
             </xpath>
         </field>
     </record>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 59f2c0a1..7f0e9ad5 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -65,6 +65,9 @@
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
                 </field>
+                <xpath expr="//field[@name='uom_id']" position="before">
+                    <field name="is_manual_processing" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
+                </xpath>
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"
                            attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 3320f943..98c71f21 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
     'data': [
         'data/stock_data.xml',
         'data/empty_racks_data.xml',
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'/>