Accept Merge Request #1513: (feature/sale_order_route_pick -> develop)

Merge Request: 给坯料模板增加按订单补给

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1513?initial=true

jikimo_sale_multiple_supply_methods/__manifest__.py

@@ -6,7 +6,7 @@
     'author': 'fox',
     'website': '',
     'category': '',
-    'depends': ['product', 'sf_dlm', 'sale_stock', 'sf_sale'],
+    'depends': ['sf_dlm', 'sale_stock', 'sf_sale'],
     "data": [
         'security/ir.model.access.csv',
         'data/stock_routes.xml',

jikimo_sale_multiple_supply_methods/data/product_data.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <data noupdate="0">
+    <data noupdate="1">
         <record id="product_template_manual_processing" model="product.template">
             <field name="name">人工线下加工模板</field>
             <field name="active" eval="False"/>
@@ -15,7 +15,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="single_manufacturing">true</field>
             <field name="tracking">serial</field>
-            <field name="categ_type">成品</field>
+            <!-- <field name="categ_type">成品</field> -->
             <field name="is_manual_processing">true</field>
         </record>
 
@@ -30,7 +30,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="categ_type">成品</field>
+            <!-- <field name="categ_type">成品</field> -->
         </record>
 
         <record id="product_template_outsourcing" model="product.template">
@@ -44,7 +44,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="categ_type">成品</field>
+            <!-- <field name="categ_type">成品</field> -->
         </record>
 
         <record id="product_template_default" model="product.template">
@@ -57,7 +57,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="categ_type">成品</field>
+            <!-- <field name="categ_type">成品</field> -->
         </record>
 
         <!-- 供应商信息（业务平台），由于数据是python创建，只能指定ID -->
@@ -79,12 +79,20 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="categ_type">坯料</field>
+            <!-- <field name="categ_type">坯料</field> -->
             <field name="seller_ids" eval="[ref('jikimo_sale_multiple_supply_methods.product_supplierinfo_bfm')]"/>
         </record>
 
         <record id="sf_dlm.product_embryo_sf_self_machining" model="product.product">
             <field name="is_manual_processing">true</field>
         </record>
+
+        <record id="sf_dlm.product_embryo_sf_self_machining" model="product.product">
+            <field name="route_ids" eval="[(4, ref('mrp_subcontracting.route_resupply_subcontractor_mto'))]"/>
+        </record>
+
+        <record id="sf_dlm.product_embryo_sf_purchase" model="product.product">
+            <field name="route_ids" eval="[(4, ref('mrp_subcontracting.route_resupply_subcontractor_mto'))]"/>
+        </record>
     </data> 
 </odoo>

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', 'jikimo_sale_multiple_supply_methods'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'],
     'data': [
         'data/stock_data.xml',
         'data/empty_racks_data.xml',

sf_manufacturing/models/mrp_production.py

@@ -1301,17 +1301,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):

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"

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
+    # )
 
 
 # 机台作业计划

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'/>