diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 8e25ae1f..766bb8a9 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -471,14 +471,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list)
         return records
 
-    def write(self, vals):
-        res = super().write(vals)
-        for item in self:
-            if item:
-                if vals.get('min_stock_num') or vals.get('max_stock_num'):
-                    item.enroll_functional_tool_real_time_distribution()
-        return res
-
 
 class MachineTableToolChangingApply(models.Model):
     _name = 'sf.machine.table.tool.changing.apply'
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index c1687cde..d762c865 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -362,3 +362,9 @@ class RealTimeDistributionFunctionalTools(models.Model):
             if record:
                 record.enroll_functional_tool_real_time_distribution()
         return records
+
+    def write(self, vals):
+        res = super().write(vals)
+        if vals.get('sf_functional_cutting_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
+            self.enroll_functional_tool_real_time_distribution()
+        return res
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 25fcdde9..dbece7b7 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -540,6 +540,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         return {
             'barcode_id': stock_lot.id,
             'code': self.tool_code,
+            'name': self.after_assembly_functional_tool_name,
             'rfid': self.rfid,
             'tool_groups_id': self.tool_groups_id.id,
             'integral_code_id': self.integral_code_id.id,