From 31bbdedb8f66ad26df451a31c23f1f3283c74f7e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 25 Mar 2026 14:36:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E8=8E=B7=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=80=97=E9=92=A2=E5=8D=B7=E6=8E=A5=E5=8F=A3,=E7=94=A8?= =?UTF-8?q?=E4=BD=9C=E6=8A=A5=E8=A1=A8=E6=88=96=E8=80=85=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在IWmsCoilPendingActionService中新增queryActionIdCoilIdList方法 - 在WmsCoilPendingActionController中新增/actionCoilIdList端点 - 在WmsCoilPendingActionMapper中新增selectActionIdCoilIdList查询方法 - 在WmsCoilPendingActionMapper.xml中添加对应的SQL查询语句 - 在WmsCoilPendingActionServiceImpl中实现查询逻辑 - 创建WmsCoilPendingActionIdCoilVo数据传输对象，仅包含actionId和coilId字段 --- .../WmsCoilPendingActionController.java | 9 +++++++ .../vo/WmsCoilPendingActionIdCoilVo.java | 25 +++++++++++++++++++ .../mapper/WmsCoilPendingActionMapper.java | 6 +++++ .../service/IWmsCoilPendingActionService.java | 6 +++++ .../impl/WmsCoilPendingActionServiceImpl.java | 8 ++++++ .../mapper/klp/WmsCoilPendingActionMapper.xml | 9 +++++++ 6 files changed, 63 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java index be3cbe67..4775ec46 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java @@ -18,6 +18,7 @@ import com.klp.common.core.validate.EditGroup; import com.klp.common.enums.BusinessType; import com.klp.common.utils.poi.ExcelUtil; import com.klp.domain.vo.WmsCoilPendingActionVo; +import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo; import com.klp.domain.vo.TheoryCycleRegressionResultVo; import com.klp.domain.bo.WmsCoilPendingActionBo; import com.klp.service.IWmsCoilPendingActionService; @@ -48,6 +49,14 @@ public class WmsCoilPendingActionController extends BaseController { return iWmsCoilPendingActionService.queryPageList(bo, pageQuery); } + /** + * 查询钢卷待操作：仅返回 actionId 与 coilId + */ + @GetMapping("/actionCoilIdList") + public R> actionCoilIdList(WmsCoilPendingActionBo bo) { + return R.ok(iWmsCoilPendingActionService.queryActionIdCoilIdList(bo)); + } + /** * 导出钢卷待操作列表 */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java new file mode 100644 index 00000000..133a4a61 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java @@ -0,0 +1,25 @@ +package com.klp.domain.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 钢卷待操作：仅返回 actionId 与 coilId + */ +@Data +public class WmsCoilPendingActionIdCoilVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 操作主键ID + */ + private Long actionId; + + /** + * 对应的钢卷ID + */ + private Long coilId; +} + diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java index ea744d92..14e95723 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.common.core.mapper.BaseMapperPlus; import com.klp.domain.WmsCoilPendingAction; import com.klp.domain.vo.WmsCoilPendingActionVo; +import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo; import org.apache.ibatis.annotations.Param; /** @@ -17,6 +18,11 @@ public interface WmsCoilPendingActionMapper extends BaseMapperPlus selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); + /** + * 仅返回 actionId 与 coilId + */ + java.util.List selectActionIdCoilIdList(@Param("ew") QueryWrapper lqw); + /** * 更新删除标志(绕过@TableLogic注解限制) * @param actionId 操作ID diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java index 35ddf717..f0bd97ef 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java @@ -1,6 +1,7 @@ package com.klp.service; import com.klp.domain.vo.WmsCoilPendingActionVo; +import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo; import com.klp.domain.bo.WmsCoilPendingActionBo; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; @@ -33,6 +34,11 @@ public interface IWmsCoilPendingActionService { */ List queryList(WmsCoilPendingActionBo bo); + /** + * 查询钢卷待操作：仅返回 actionId 与 coilId 列表 + */ + List queryActionIdCoilIdList(WmsCoilPendingActionBo bo); + /** * 新增钢卷待操作 */ 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 068c6188..1e503d66 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 @@ -18,6 +18,7 @@ import com.klp.domain.vo.TheoryCyclePointVo; import com.klp.domain.vo.TheoryCycleRegressionResultVo; import com.klp.domain.vo.TheoryCycleRegressionVo; import com.klp.domain.vo.WmsCoilPendingActionVo; +import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo; import com.klp.mapper.WmsCoilPendingActionMapper; import com.klp.mapper.WmsMaterialCoilMapper; import com.klp.service.IWmsCoilPendingActionService; @@ -149,6 +150,13 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer return baseMapper.selectVoList(lqw); } + @Override + public List queryActionIdCoilIdList(WmsCoilPendingActionBo bo) { + // 复用与 /list 相同的查询条件（buildQueryWrapperPlus） + QueryWrapper lqw = buildQueryWrapperPlus(bo); + return baseMapper.selectActionIdCoilIdList(lqw); + } + private LambdaQueryWrapper buildQueryWrapper(WmsCoilPendingActionBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCoilId() != null, WmsCoilPendingAction::getCoilId, bo.getCoilId()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml index cb74b3f5..71c2945c 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml @@ -90,6 +90,15 @@ ${ew.customSqlSegment} + + +