From ebad141991d8408b04c3e27f361fb4b4a64e519a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 23 Feb 2026 02:16:35 +0800 Subject: [PATCH] ✨ feat(mes): 添加采购入库明细列表接口及上架明细表单功能 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java | 15 +++++++-------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java | 10 ---------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java | 1 - yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java | 10 ---------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java | 7 ------- 5 files changed, 7 insertions(+), 36 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java index abd103f..5cf0afb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java @@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailRespVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; @@ -96,13 +94,14 @@ public class MesWmItemReceiptDetailController { return success(buildRespVOList(Collections.singletonList(detail)).get(0)); } - @GetMapping("/page") - @Operation(summary = "获得采购入库明细分页") + @GetMapping("/list-by-line") + @Operation(summary = "获得采购入库明细列表（按行编号）") + @Parameter(name = "lineId", description = "行编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") - public CommonResult> getItemReceiptDetailPage( - @Valid MesWmItemReceiptDetailPageReqVO pageReqVO) { - PageResult pageResult = itemReceiptDetailService.getItemReceiptDetailPage(pageReqVO); - return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + public CommonResult> getItemReceiptDetailListByLineId( + @RequestParam("lineId") Long lineId) { + List list = itemReceiptDetailService.getItemReceiptDetailListByLineId(lineId); + return success(buildRespVOList(list)); } // ==================== 拼接 VO ==================== diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java index 5aebb81..0771f1b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java @@ -1,9 +1,6 @@ package cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -15,13 +12,6 @@ import java.util.List; @Mapper public interface MesWmItemReceiptDetailMapper extends BaseMapperX { - default PageResult selectPage(MesWmItemReceiptDetailPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesWmItemReceiptDetailDO::getReceiptId, reqVO.getReceiptId()) - .eqIfPresent(MesWmItemReceiptDetailDO::getLineId, reqVO.getLineId()) - .orderByDesc(MesWmItemReceiptDetailDO::getId)); - } - default List selectListByReceiptId(Long receiptId) { return selectList(MesWmItemReceiptDetailDO::getReceiptId, receiptId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java index b3d429a..42a4ba0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java @@ -154,7 +154,6 @@ public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService @Override public List getArrivalNoticeListByStatus(Integer status) { - // TODO DONE @AI：已在 Mapper 新增 selectListByStatus 方法 if (status == null) { return arrivalNoticeMapper.selectList(); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java index 465c5b5..cbf8e97 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java @@ -1,7 +1,5 @@ package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; import jakarta.validation.Valid; @@ -44,14 +42,6 @@ public interface MesWmItemReceiptDetailService { MesWmItemReceiptDetailDO getItemReceiptDetail(Long id); /** - * 获得采购入库明细分页 - * - * @param pageReqVO 分页参数 - * @return 采购入库明细分页 - */ - PageResult getItemReceiptDetailPage(MesWmItemReceiptDetailPageReqVO pageReqVO); - - /** * 按入库单编号获得明细列表 * * @param receiptId 入库单编号 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java index 6fc3a57..406f4b1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java @@ -1,8 +1,6 @@ package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptDetailMapper; @@ -66,11 +64,6 @@ public class MesWmItemReceiptDetailServiceImpl implements MesWmItemReceiptDetail } @Override - public PageResult getItemReceiptDetailPage(MesWmItemReceiptDetailPageReqVO pageReqVO) { - return itemReceiptDetailMapper.selectPage(pageReqVO); - } - - @Override public List getItemReceiptDetailListByReceiptId(Long receiptId) { return itemReceiptDetailMapper.selectListByReceiptId(receiptId); } -- libgit2 0.21.4