diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
index 4247c6bd..8f22834c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
@@ -123,8 +123,8 @@ namespace Tnb.WarehouseMgr
                                 setSortingH.id = SnowflakeIdHelper.NextId();
                                 setSortingH.kittingout_id = ko.id;
                                 setSortingH.seq = ko.seq;
-                                setSortingH.org_id = curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value;
-                                setSortingH.create_id = curUser.FindFirst(ClaimConst.CLAINMUSERID)?.Value;
+                                setSortingH.org_id = ko.org_id;
+                                setSortingH.create_id = ko.create_id;
                                 setSortingH.create_time = DateTime.Now;
                                 await curDb.Insertable(setSortingH).ExecuteCommandAsync();
 
@@ -164,8 +164,6 @@ namespace Tnb.WarehouseMgr
         [HttpPost]
         public async Task KittingOutByIsToBeShipped(CancellationTokenSource? cts = default)
         {
-            if (_userManager.User == null) return;
-
             var curDb = _db.CopyNew();
             try
             {
@@ -204,7 +202,7 @@ namespace Tnb.WarehouseMgr
 
                                             WmsPretaskH preTask = new()
                                             {
-                                                org_id = _userManager.User.OrganizeId,
+                                                org_id = ko.org_id,
                                                 startlocation_id = sPoint?.location_id!,
                                                 startlocation_code = sPoint?.location_code!,
                                                 endlocation_id = ePoint?.location_id!,
@@ -225,7 +223,7 @@ namespace Tnb.WarehouseMgr
                                                 area_code = it.Key,
                                                 require_id = ko.id,
                                                 require_code = ko.bill_code,
-                                                create_id = _userManager.UserId,
+                                                create_id = ko.create_id,
                                                 create_time = DateTime.Now,
                                                 source_id = ko.source_id,
                                                 source_code = ko.source_code