DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 扩展钢卷仓库操作日志查询功能

Browse Source 
- 在服务接口中增加操作类型和出入库类型参数
- 在控制器层添加相应的请求参数映射
- 在服务实现类中修改查询方法以支持动态过滤条件
- 更新查询逻辑将固定值替换为动态传入的操作类型和出入库类型
- 保持原有的时间范围查询功能并增强其灵活性
This commit is contained in:
Joshi
2026-03-06 10:21:02 +08:00
parent 0edeb429c6
commit 78a7bb4123
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/java/com/klp/controller/WmsCoilWarehouseOperationLogController.java
View File

@@ -126,8 +126,10 @@ public class WmsCoilWarehouseOperationLogController extends BaseController {
@GetMapping("/byWarehouseAndTime") @GetMapping("/byWarehouseAndTime")
public R<List<WmsCoilWarehouseOperationLogVo>> getByWarehouseAndTime( public R<List<WmsCoilWarehouseOperationLogVo>> getByWarehouseAndTime(
@RequestParam Long secondWarehouseId, @RequestParam Long secondWarehouseId,
@RequestParam Integer operationType,
@RequestParam Integer inOutType,
@RequestParam(required = false) Date startTime, @RequestParam(required = false) Date startTime,
@RequestParam(required = false) Date endTime) { @RequestParam(required = false) Date endTime) {
return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, startTime, endTime)); return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime));
} }
} }

2
klp-wms/src/main/java/com/klp/service/IWmsCoilWarehouseOperationLogService.java
View File

@@ -59,5 +59,5 @@ public interface IWmsCoilWarehouseOperationLogService {
* @param endTime 结束时间 * @param endTime 结束时间
* @return 操作记录列表（含钢卷信息和库区信息） * @return 操作记录列表（含钢卷信息和库区信息）
*/ */
List<WmsCoilWarehouseOperationLogVo> queryBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Date startTime, Date endTime); List<WmsCoilWarehouseOperationLogVo> queryBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Integer operationType, Integer inOutType, Date startTime, Date endTime);
} }

6
klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java
View File

@@ -128,7 +128,7 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
} }
@Override @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); Set<Long> warehouseIds = getAllChildWarehouseIds(secondWarehouseId);
if (warehouseIds.isEmpty()) { if (warehouseIds.isEmpty()) {
return new ArrayList<>(); return new ArrayList<>();
@@ -136,8 +136,8 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery();
lqw.in(WmsCoilWarehouseOperationLog::getActualWarehouseId, warehouseIds); lqw.in(WmsCoilWarehouseOperationLog::getActualWarehouseId, warehouseIds);
lqw.eq(WmsCoilWarehouseOperationLog::getOperationType,1); lqw.eq(WmsCoilWarehouseOperationLog::getOperationType, operationType);
lqw.eq(WmsCoilWarehouseOperationLog::getInOutType,1); lqw.eq(WmsCoilWarehouseOperationLog::getInOutType, inOutType);
lqw.ge(startTime != null, WmsCoilWarehouseOperationLog::getCreateTime, startTime); lqw.ge(startTime != null, WmsCoilWarehouseOperationLog::getCreateTime, startTime);
lqw.le(endTime != null, WmsCoilWarehouseOperationLog::getCreateTime, endTime); lqw.le(endTime != null, WmsCoilWarehouseOperationLog::getCreateTime, endTime);
lqw.orderByDesc(WmsCoilWarehouseOperationLog::getCreateTime); lqw.orderByDesc(WmsCoilWarehouseOperationLog::getCreateTime);