diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs
index 5560cdc8..347253bc 100644
--- a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs
+++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using JNPF.Common.Security;
 using SqlSugar;
+using Yitter.IdGenerator;
 
 namespace Tnb.BasicData.Entities
 {
@@ -22,7 +23,7 @@ namespace Tnb.BasicData.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public long id {get;set;} = YitIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs
index f39a6882..9c90f8a6 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs
index 55590ce7..a8fb3621 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs
index 86e169c8..70caa0a5 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public char id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs
index bf56217e..cf9fb105 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public char id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs
index 6b04d375..bcc83090 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs
index 6adf9ec4..d4d2b399 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs
index e5db4138..a101a58c 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs
index bf9e394d..f025f57a 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs
index e59b412f..d529927e 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public long id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs
index 9bc76bb3..cba25ca5 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs
@@ -22,7 +22,7 @@ namespace Tnb.ProductionMgr.Entities
            /// Nullable:False
            /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
-           public char id {get;set;} = SnowflakeIdHelper.NextId();
+           public string id {get;set;} = SnowflakeIdHelper.NextId();
 
            /// <summary>
            /// Desc:TODO
diff --git a/system/Tnb.Systems/System/DataBaseService.cs b/system/Tnb.Systems/System/DataBaseService.cs
index bd1d1a4a..0ea80fe0 100644
--- a/system/Tnb.Systems/System/DataBaseService.cs
+++ b/system/Tnb.Systems/System/DataBaseService.cs
@@ -601,6 +601,7 @@ public class DataBaseService : IDynamicApiController, ITransient
         List<string> dirs = new List<string>();
         foreach (string key in nsMapper.Keys)
         {
+            if (key != "eqp_") continue;
             var nsName = nsMapper[key];
             var dir = Path.Combine(FileVariable.GenerateCodePath, nsName);
             dirs.Add(dir);
@@ -661,7 +662,11 @@ public class DataBaseService : IDynamicApiController, ITransient
                 if (sugarAttrs.Count > 0)
                     sugarColumnStr = $"\r\n           [SugarColumn({string.Join(", ", sugarAttrs)})]";
                 var txt = tpl.Replace("{PropertyType}", type).Replace("{PropertyName}", col.DbColumnName).Replace("{SugarColumn}", sugarColumnStr);
-                if (col.DbColumnName == "id") txt = txt.TrimEnd('\n', '\r') + " = SnowflakeIdHelper.NextId();\r\n";
+                if (col.DbColumnName == "id")
+                {
+                    if(type == "string") txt = txt.TrimEnd('\n', '\r') + " = SnowflakeIdHelper.NextId();\r\n";
+                    else if(type == "long") txt = txt.TrimEnd('\n', '\r') + " = YitIdHelper.NextId();\r\n";
+                }
                 else if (type == "string") txt = txt.TrimEnd('\n', '\r') + " = string.Empty;\r\n";
                 return txt;
             })