diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 41a78ed0..eb6f9fc1 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -837,19 +837,15 @@ class ProductProduct(models.Model):
 
         return stock_lot
 
-    def get_stock_lot_name(self, tool_assembly_order_id):
+    def get_stock_lot_name(self, obj):
         """
             生成功能刀具序列号
         """
-        tool_assembly_order = self.env['sf.functional.tool.assembly.order'].search(
-            [('id', '=', tool_assembly_order_id)])
-        code = 'JKM-T-' + str(tool_assembly_order.after_assembly_functional_tool_type_id.code) + '-' + str(
-            tool_assembly_order.after_assembly_functional_tool_diameter) + '-'
+        company = obj.cutting_tool_cutterhandle_model_id.code.split('-', 1)[0]
         new_time = datetime.strptime(str(fields.Date.today()), "%Y-%m-%d").strftime("%Y%m%d")
-        code += str(new_time) + '-'
+        code = '%s-GNDJ-%s-%s' % (company, obj.after_assembly_functional_tool_type_id.code, new_time)
         stock_lot_id = self.env['stock.lot'].sudo().search(
-            [('name', 'like', new_time), ('product_id.categ_type', '=', '功能刀具'),
-             ('product_id.tracking', '=', 'serial')], limit=1, order="id desc")
+            [('name', 'like', code)], limit=1, order="id desc")
         if not stock_lot_id:
             num = "%03d" % 1
         else: