✨ feat(mes): 添加采购入库明细列表接口及上架明细表单功能

YunaiV
1 parent 9b29666e
Showing 5 changed files with 7 additions and 36 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.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<PageResult<MesWmItemReceiptDetailRespVO>> getItemReceiptDetailPage(
-            @Valid MesWmItemReceiptDetailPageReqVO pageReqVO) {
-        PageResult<MesWmItemReceiptDetailDO> pageResult = itemReceiptDetailService.getItemReceiptDetailPage(pageReqVO);
-        return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
+    public CommonResult<List<MesWmItemReceiptDetailRespVO>> getItemReceiptDetailListByLineId(
+            @RequestParam("lineId") Long lineId) {
+        List<MesWmItemReceiptDetailDO> list = itemReceiptDetailService.getItemReceiptDetailListByLineId(lineId);
+        return success(buildRespVOList(list));
     }
  
     // ==================== 拼接 VO ====================
 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<MesWmItemReceiptDetailDO> {
  
-    default PageResult<MesWmItemReceiptDetailDO> selectPage(MesWmItemReceiptDetailPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MesWmItemReceiptDetailDO>()
-                .eqIfPresent(MesWmItemReceiptDetailDO::getReceiptId, reqVO.getReceiptId())
-                .eqIfPresent(MesWmItemReceiptDetailDO::getLineId, reqVO.getLineId())
-                .orderByDesc(MesWmItemReceiptDetailDO::getId));
-    }
-
     default List<MesWmItemReceiptDetailDO> selectListByReceiptId(Long receiptId) {
         return selectList(MesWmItemReceiptDetailDO::getReceiptId, receiptId);
     }
@@ -154,7 +154,6 @@ public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService 
  
     @Override
     public List<MesWmArrivalNoticeDO> getArrivalNoticeListByStatus(Integer status) {
-        // TODO DONE @AI：已在 Mapper 新增 selectListByStatus 方法
         if (status == null) {
             return arrivalNoticeMapper.selectList();
         }
 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<MesWmItemReceiptDetailDO> getItemReceiptDetailPage(MesWmItemReceiptDetailPageReqVO pageReqVO);
-
-    /**
      * 按入库单编号获得明细列表
      *
      * @param receiptId 入库单编号
 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<MesWmItemReceiptDetailDO> getItemReceiptDetailPage(MesWmItemReceiptDetailPageReqVO pageReqVO) {
-        return itemReceiptDetailMapper.selectPage(pageReqVO);
-    }
-
-    @Override
     public List<MesWmItemReceiptDetailDO> getItemReceiptDetailListByReceiptId(Long receiptId) {
         return itemReceiptDetailMapper.selectListByReceiptId(receiptId);
     }