diff --git a/sf_dlm/data/product_data.xml b/sf_dlm/data/product_data.xml
index a31f97fc..15cfc8b5 100644
--- a/sf_dlm/data/product_data.xml
+++ b/sf_dlm/data/product_data.xml
@@ -30,6 +30,30 @@
             <field name="type">夹具</field>
         </record>
 
+        <record id="product_category_functional_tool_sf" model="product.category">
+            <field name="name">功能刀具</field>
+            <field name="type">功能刀具</field>
+        </record>
+
+
+        <record id="product_functional_tool_sf" model="product.product">
+            <field name="name">功能刀具模板</field>
+            <field name="active" eval="False"/>
+            <field name="categ_id" ref="product_category_functional_tool_sf"/>
+            <field name="route_ids"
+                   eval="[ref('stock.route_warehouse0_mto')]"/>
+            <field name="invoice_policy">delivery</field>
+            <field name="detailed_type">product</field>
+            <field name="sale_ok">false</field>
+            <field name="purchase_ok">true</field>
+            <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="single_manufacturing">true</field>
+            <field name="tracking">serial</field>
+            <field name="is_bfm">false</field>
+        </record>
+
         <record id="product_template_sf" model="product.product">
             <field name="name">CNC加工产品模板</field>
             <field name="active" eval="False"/>
diff --git a/sf_manufacturing/data/stock_data.xml b/sf_manufacturing/data/stock_data.xml
index 8efbdd55..15ad1a55 100644
--- a/sf_manufacturing/data/stock_data.xml
+++ b/sf_manufacturing/data/stock_data.xml
@@ -22,6 +22,15 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
+        <record id="stock_location_locations_virtual_after_assembly" model="stock.location">
+            <field name="name">组装后</field>
+            <field name="location_id" ref="stock.stock_location_locations_virtual"/>
+            <field name="usage">internal</field>
+            <field name="barcode">DJ-ZZ</field>
+            <field name="active">true</field>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
         <record id="outcontract_picking_in" model="stock.picking.type">
             <field name="name">外协入库</field>
             <field name="code">internal</field>
@@ -46,6 +55,18 @@
             <field name="default_location_dest_id" ref="stock_location_locations_virtual_outcontract"/>
         </record>
 
+        <record id="after_assembly_picking_in" model="stock.picking.type">
+            <field name="name">刀具组装入库</field>
+            <field name="code">internal</field>
+            <field name="active">true</field>
+<!--            <field name="partner_id" invisible="1"/>-->
+<!--            <field name="sequence_id" ref="sequence_stock_picking_in"/>-->
+            <field name="company_id" ref="base.main_company"/>
+            <field name="sequence_code">ZR</field>
+            <field name="default_location_src_id" ref="stock_location_locations_virtual_after_assembly"/>
+            <field name="default_location_dest_id"
+                   search="[('barcode','=','WH-PREPRODUCTION')]"/>
+        </record>
 
     </data>
 </odoo>
diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py
index 672741e3..71161b59 100644
--- a/sf_manufacturing/models/model_type.py
+++ b/sf_manufacturing/models/model_type.py
@@ -6,7 +6,7 @@ class ResProductCategory(models.Model):
 
     type = fields.Selection(
         [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"),
-         ("夹具", "夹具")],
+         ("夹具", "夹具"), ("功能刀具", "功能刀具")],
         default="", string="类型")