diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilWarehouseOperationLogVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilWarehouseOperationLogVo.java
index a6c7308e..54ec8631 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilWarehouseOperationLogVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilWarehouseOperationLogVo.java
@@ -61,7 +61,7 @@ public class WmsCoilWarehouseOperationLogVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    private WmsWarehouseVo warehouse;
+    private WmsActualWarehouseVo warehouse;
 
     private WmsMaterialCoilVo coil;
 
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java
index 2ca90b93..12560609 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java
@@ -7,20 +7,19 @@ import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.klp.domain.WmsActualWarehouse;
 import com.klp.domain.WmsMaterialCoil;
 import com.klp.domain.bo.WmsMaterialCoilBo;
+import com.klp.domain.vo.WmsActualWarehouseVo;
+import com.klp.mapper.WmsActualWarehouseMapper;
 import com.klp.service.IWmsMaterialCoilService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.domain.bo.WmsCoilWarehouseOperationLogBo;
 import com.klp.domain.vo.WmsCoilWarehouseOperationLogVo;
 import com.klp.domain.vo.WmsMaterialCoilVo;
-import com.klp.domain.vo.WmsWarehouseVo;
 import com.klp.domain.WmsCoilWarehouseOperationLog;
-import com.klp.domain.WmsWarehouse;
 import com.klp.mapper.WmsCoilWarehouseOperationLogMapper;
-import com.klp.mapper.WmsWarehouseMapper;
-import com.klp.mapper.WmsMaterialCoilMapper;
 import com.klp.service.IWmsCoilWarehouseOperationLogService;
 
 import java.util.*;
@@ -37,7 +36,7 @@ import java.util.stream.Collectors;
 public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehouseOperationLogService {
 
     private final WmsCoilWarehouseOperationLogMapper baseMapper;
-    private final WmsWarehouseMapper wmsWarehouseMapper;
+    private final WmsActualWarehouseMapper wmsActualWarehouseMapper;
     private final IWmsMaterialCoilService wmsMaterialCoilService;
 
     /**
@@ -122,9 +121,9 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
     @Override
     public boolean deleteByCoilIdAndTypes(Long coilId, String operationType, String inOutType) {
         LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery();
-        lqw.eq(coilId != null, WmsCoilWarehouseOperationLog::getCoilId, coilId);
-        lqw.eq(operationType != null, WmsCoilWarehouseOperationLog::getOperationType, operationType);
-        lqw.eq(inOutType != null, WmsCoilWarehouseOperationLog::getInOutType, inOutType);
+        lqw.eq(WmsCoilWarehouseOperationLog::getCoilId, coilId);
+        lqw.eq(WmsCoilWarehouseOperationLog::getOperationType, operationType);
+        lqw.eq(WmsCoilWarehouseOperationLog::getInOutType, inOutType);
         return baseMapper.delete(lqw) > 0;
     }
 
@@ -162,14 +161,14 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
         }
 
 
-        Map<Long, WmsWarehouseVo> warehouseMap = new HashMap<>();
+        Map<Long, WmsActualWarehouseVo> warehouseMap = new HashMap<>();
         if (!warehouseIds.isEmpty()) {
-            LambdaQueryWrapper<WmsWarehouse> warehouseQuery = Wrappers.lambdaQuery();
-            warehouseQuery.in(WmsWarehouse::getWarehouseId, warehouseIds);
-            List<WmsWarehouse> warehouses = wmsWarehouseMapper.selectList(warehouseQuery);
-            for (WmsWarehouse warehouse : warehouses) {
-                WmsWarehouseVo vo = BeanUtil.toBean(warehouse, WmsWarehouseVo.class);
-                warehouseMap.put(warehouse.getWarehouseId(), vo);
+            LambdaQueryWrapper<WmsActualWarehouse> warehouseQuery = Wrappers.lambdaQuery();
+            warehouseQuery.in(WmsActualWarehouse::getActualWarehouseId, warehouseIds);
+            List<WmsActualWarehouse> warehouses = wmsActualWarehouseMapper.selectList(warehouseQuery);
+            for (WmsActualWarehouse warehouse : warehouses) {
+                WmsActualWarehouseVo vo = BeanUtil.toBean(warehouse, WmsActualWarehouseVo.class);
+                warehouseMap.put(warehouse.getActualWarehouseId(), vo);
             }
         }
 
@@ -184,11 +183,11 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
     private Set<Long> getAllChildWarehouseIds(Long parentId) {
         Set<Long> result = new HashSet<>();
         result.add(parentId);
-        LambdaQueryWrapper<WmsWarehouse> lqw = Wrappers.lambdaQuery();
-        lqw.eq(WmsWarehouse::getParentId, parentId);
-        List<WmsWarehouse> children = wmsWarehouseMapper.selectList(lqw);
-        for (WmsWarehouse child : children) {
-            result.addAll(getAllChildWarehouseIds(child.getWarehouseId()));
+        LambdaQueryWrapper<WmsActualWarehouse> lqw = Wrappers.lambdaQuery();
+        lqw.eq(WmsActualWarehouse::getParentId, parentId);
+        List<WmsActualWarehouse> children = wmsActualWarehouseMapper.selectList(lqw);
+        for (WmsActualWarehouse child : children) {
+            result.addAll(getAllChildWarehouseIds(child.getActualWarehouseId()));
         }
         return result;
     }