diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java
index a92169a2b..20679f291 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java
@@ -10,6 +10,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.TenantNum;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.core.ExchangeTypes;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -65,7 +67,7 @@ public class OldTrayTypeListener {
 				syncOldTrayTypeLogEntity.setCreateUser(1714696768639311873L);
 				syncOldTrayTypeLogEntity.setUpdateUser(1714696768639311873L);
 				syncOldTrayTypeLogEntity.setCreateDept(1649331096241836033L);
-				syncOldTrayTypeLogEntity.setTenantId(TenantNum.HUITONGCODE);
+				syncOldTrayTypeLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 				syncOldTrayTypeLogEntity.setCreateTime(new Date());
 				syncOldTrayTypeLogEntity.setUpdateTime(new Date());
 				syncOldTrayTypeLogEntity.setArgs(com.alibaba.fastjson.JSONObject.toJSONString(trayInfoDTO));
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 7eba42f7f..8a24d5f37 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -877,7 +877,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
 			BladeUser user = AuthUtil.getUser();
 			if(user==null){
-				trayGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
+				trayGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 				trayGoodsEntity.setCreateUser(1714696768639311873L);
 				trayGoodsEntity.setUpdateUser(1714696768639311873L);
 				trayGoodsEntity.setCreateDept(1649331096241836033L);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java
index a4504a717..4c90885b5 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java
@@ -35,6 +35,7 @@ import org.springblade.common.constant.TenantNum;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 
@@ -89,7 +90,7 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 		warehouseUpdownGoodsLogEntity.setCreateUser(1714696768639311873L);
 		warehouseUpdownGoodsLogEntity.setUpdateUser(1714696768639311873L);
 		warehouseUpdownGoodsLogEntity.setCreateDept(1649331096241836033L);
-		warehouseUpdownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
+		warehouseUpdownGoodsLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 		warehouseUpdownGoodsLogEntity.setUpdownTypeId(updownTypeEntity.getId());
 		warehouseUpdownGoodsLogEntity.setAreaId(updownTypeEntity.getAreaId());
 		warehouseUpdownGoodsLogEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
index c049c42e4..5a7e96cb3 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
@@ -108,7 +108,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		updownGoodsEntity.setCreateUser(1714696768639311873L);
 		updownGoodsEntity.setUpdateUser(1714696768639311873L);
 		updownGoodsEntity.setCreateDept(1649331096241836033L);
-		updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
+		updownGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 		updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 		updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 		updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -136,7 +136,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 			updownGoodsEntity.setCreateUser(1714696768639311873L);
 			updownGoodsEntity.setUpdateUser(1714696768639311873L);
 			updownGoodsEntity.setCreateDept(1649331096241836033L);
-			updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
+			updownGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 			updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 			updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 			updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 7e966f29f..ba3723c85 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -1644,7 +1644,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				warehouseUpdownGoodsLogEntity.setCreateUser(1714696768639311873L);
 				warehouseUpdownGoodsLogEntity.setUpdateUser(1714696768639311873L);
 				warehouseUpdownGoodsLogEntity.setCreateDept(1649331096241836033L);
-				warehouseUpdownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
+				warehouseUpdownGoodsLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 				warehouseUpdownGoodsLogEntity.setUpdownTypeId(updownTypeEntity.getId());
 				warehouseUpdownGoodsLogEntity.setAreaId(updownTypeEntity.getAreaId());
 				warehouseUpdownGoodsLogEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -1844,7 +1844,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				warehouseUpdownGoodsLogEntity.setCreateUser(1714696768639311873L);
 				warehouseUpdownGoodsLogEntity.setUpdateUser(1714696768639311873L);
 				warehouseUpdownGoodsLogEntity.setCreateDept(1649331096241836033L);
-				warehouseUpdownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
+				warehouseUpdownGoodsLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 				warehouseUpdownGoodsLogEntity.setUpdownTypeId(updownTypeEntity.getId());
 				warehouseUpdownGoodsLogEntity.setAreaId(updownTypeEntity.getAreaId());
 				warehouseUpdownGoodsLogEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -3543,7 +3543,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				updownGoodsEntity.setCreateUser(1714696768639311873L);
 				updownGoodsEntity.setUpdateUser(1714696768639311873L);
 				updownGoodsEntity.setCreateDept(1649331096241836033L);
-				updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
+				updownGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 				updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 				updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 				updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -3652,7 +3652,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				updownGoodsEntity.setCreateUser(1714696768639311873L);
 				updownGoodsEntity.setUpdateUser(1714696768639311873L);
 				updownGoodsEntity.setCreateDept(1649331096241836033L);
-				updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
+				updownGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 				updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 				updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 				updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -3714,7 +3714,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		taryAllocationEntity.setCreateUser(1714696768639311873L);
 		taryAllocationEntity.setUpdateUser(1714696768639311873L);
 		taryAllocationEntity.setCreateDept(1649331096241836033L);
-		taryAllocationEntity.setTenantId(TenantNum.HUITONGCODE);
+		taryAllocationEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 		taryAllocationEntity.setTrayId(trayId);
 		taryAllocationEntity.setAllocationId(allocationId);
 		taryAllocationEntity.setBindStatus("0");
@@ -3821,7 +3821,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			updownGoodsEntity.setCreateUser(1714696768639311873L);
 			updownGoodsEntity.setUpdateUser(1714696768639311873L);
 			updownGoodsEntity.setCreateDept(1649331096241836033L);
-			updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
+			updownGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 			updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 			updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 			updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -3857,7 +3857,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			updownGoodsLogEntity.setCreateUser(1714696768639311873L);
 			updownGoodsLogEntity.setUpdateUser(1714696768639311873L);
 			updownGoodsLogEntity.setCreateDept(1649331096241836033L);
-			updownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
+			updownGoodsLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 			updownGoodsLogEntity.setBindingType(bindingType);
 			updownGoodsLogEntity.setIsAlltrays(isAlltrays);
 			updownGoodsLogEntity.setRemark(remark);
@@ -4010,7 +4010,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		updownTypeEntity.setCreateUser(1714696768639311873L);
 		updownTypeEntity.setUpdateUser(1714696768639311873L);
 		updownTypeEntity.setCreateDept(1649331096241836033L);
-		updownTypeEntity.setTenantId(TenantNum.HUITONGCODE);
+		updownTypeEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 		updownTypeEntity.setUpdownType(updownType);
 		updownTypeEntity.setAreaId(goodsAreaId);
 		updownTypeEntity.setAreaTitle(headline);