diff --git a/klp-ui/src/api/wms/pendingAction.js b/klp-ui/src/api/wms/pendingAction.js index 8b2d4eaf..4fb19e7f 100644 --- a/klp-ui/src/api/wms/pendingAction.js +++ b/klp-ui/src/api/wms/pendingAction.js @@ -9,6 +9,31 @@ export function listPendingAction(query) { }) } +// 查询钢卷待操作列表(包含已删除记录) +// includeDeleted: 0=不包含已删除(默认), 1=包含已删除记录, 2=仅查询已删除记录 +export function listPendingActionWithDeleted(query) { + return request({ + url: '/wms/coilPendingAction/list', + method: 'get', + params: { + ...query, + includeDeleted: 1 + } + }) +} + +// 仅查询已删除的钢卷待操作列表 +export function listDeletedPendingAction(query) { + return request({ + url: '/wms/coilPendingAction/list', + method: 'get', + params: { + ...query, + includeDeleted: 2 + } + }) +} + // 查询钢卷待操作详细 export function getPendingAction(actionId) { return request({ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java index 7360d6a2..02dd3376 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java @@ -109,5 +109,10 @@ public class WmsCoilPendingActionBo extends BaseEntity { //备注 private String remark; + + /** + * 是否包含已删除记录(0=不包含,1=包含已删除,2=仅查询已删除) + */ + private Integer includeDeleted; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java index 23e200e2..776a4431 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java @@ -112,8 +112,21 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime()); // 根据更新人查询 qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy()); - //逻辑删除 - qw.eq("wcpa.del_flag", 0); + //逻辑删除 - 支持查询已删除记录 + if (bo.getIncludeDeleted() != null) { + if (bo.getIncludeDeleted() == 1) { + // 包含已删除记录:不添加del_flag过滤,查询所有记录 + } else if (bo.getIncludeDeleted() == 2) { + // 仅查询已删除记录 + qw.eq("wcpa.del_flag", 1); + } else { + // 默认:仅查询正常记录 + qw.eq("wcpa.del_flag", 0); + } + } else { + // 未传参数时默认仅查询正常记录 + qw.eq("wcpa.del_flag", 0); + } return qw; }