diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java
index dc575adb..6f206561 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java
@@ -126,8 +126,10 @@ public class WmsCoilWarehouseOperationLogController extends BaseController {
     @GetMapping("/byWarehouseAndTime")
     public R<List<WmsCoilWarehouseOperationLogVo>> getByWarehouseAndTime(
             @RequestParam Long secondWarehouseId,
+            @RequestParam Integer operationType,
+            @RequestParam Integer inOutType,
             @RequestParam(required = false) Date startTime,
             @RequestParam(required = false) Date endTime) {
-        return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, startTime, endTime));
+        return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime));
     }
 }
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilWarehouseOperationLogService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilWarehouseOperationLogService.java
index 07654977..1da1e75f 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsCoilWarehouseOperationLogService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilWarehouseOperationLogService.java
@@ -59,5 +59,5 @@ public interface IWmsCoilWarehouseOperationLogService {
      * @param endTime 结束时间
      * @return 操作记录列表（含钢卷信息和库区信息）
      */
-    List<WmsCoilWarehouseOperationLogVo> queryBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Date startTime, Date endTime);
+    List<WmsCoilWarehouseOperationLogVo> queryBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Integer operationType, Integer inOutType, Date startTime, Date endTime);
 }
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 2a022111..e613d23d 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
@@ -128,7 +128,7 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
     }
 
     @Override
-    public List<WmsCoilWarehouseOperationLogVo> queryBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Date startTime, Date endTime) {
+    public List<WmsCoilWarehouseOperationLogVo> queryBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Integer operationType, Integer inOutType, Date startTime, Date endTime) {
         Set<Long> warehouseIds = getAllChildWarehouseIds(secondWarehouseId);
         if (warehouseIds.isEmpty()) {
             return new ArrayList<>();
@@ -136,8 +136,8 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
 
         LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery();
         lqw.in(WmsCoilWarehouseOperationLog::getActualWarehouseId, warehouseIds);
-        lqw.eq(WmsCoilWarehouseOperationLog::getOperationType,1);
-        lqw.eq(WmsCoilWarehouseOperationLog::getInOutType,1);
+        lqw.eq(WmsCoilWarehouseOperationLog::getOperationType, operationType);
+        lqw.eq(WmsCoilWarehouseOperationLog::getInOutType, inOutType);
         lqw.ge(startTime != null, WmsCoilWarehouseOperationLog::getCreateTime, startTime);
         lqw.le(endTime != null, WmsCoilWarehouseOperationLog::getCreateTime, endTime);
         lqw.orderByDesc(WmsCoilWarehouseOperationLog::getCreateTime);