From 78a7bb4123ea7096ffe19c08364cf46f5e9fd2cc Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 6 Mar 2026 10:21:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=89=A9=E5=B1=95=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E4=BB=93=E5=BA=93=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在服务接口中增加操作类型和出入库类型参数
- 在控制器层添加相应的请求参数映射
- 在服务实现类中修改查询方法以支持动态过滤条件
- 更新查询逻辑将固定值替换为动态传入的操作类型和出入库类型
- 保持原有的时间范围查询功能并增强其灵活性
---
 .../controller/WmsCoilWarehouseOperationLogController.java  | 4 +++-
 .../klp/service/IWmsCoilWarehouseOperationLogService.java   | 2 +-
 .../impl/WmsCoilWarehouseOperationLogServiceImpl.java       | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

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);