✨ feat(mes): 添加物料消耗记录行的请求和响应 VO 及控制器

新增物料消耗记录行的请求和响应数据对象，包含分页请求和响应结构。同时实现了控制器以支持根据报工编号分页获取消耗行列表的功能。

✨ feat(mes): 添加物料消耗记录行的请求和响应 VO 及控制器
新增物料消耗记录行的请求和响应数据对象，包含分页请求和响应结构。同时实现了控制器以支持根据报工编号分页获取消耗行列表的功能。
YunaiV
1 parent dfa61b7d
Showing 7 changed files with 169 additions and 10 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/vo/MesWmItemConsumeLinePageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/vo/MesWmItemConsumeLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
+package cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+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.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeLineService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+@Tag(name = "管理后台 - MES 物料消耗记录行")
+@RestController
+@RequestMapping("/mes/wm/item-consume-line")
+@Validated
+public class MesWmItemConsumeLineController {
+
+    @Resource
+    private MesWmItemConsumeLineService itemConsumeLineService;
+    @Resource
+    private MesMdItemService itemService;
+    @Resource
+    private MesMdUnitMeasureService unitMeasureService;
+
+    @GetMapping("/page")
+    @Operation(summary = "根据报工编号分页获取消耗行列表")
+    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
+    public CommonResult<PageResult<MesWmItemConsumeLineRespVO>> getItemConsumeLinePage(
+            @Valid MesWmItemConsumeLinePageReqVO pageReqVO) {
+        // 1. 分页查询消耗行
+        PageResult<MesWmItemConsumeLineDO> pageResult =
+                itemConsumeLineService.getItemConsumeLinePage(pageReqVO);
+        PageResult<MesWmItemConsumeLineRespVO> voPage = BeanUtils.toBean(pageResult, MesWmItemConsumeLineRespVO.class);
+        // 2. 拼接物料信息
+        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+                convertSet(pageResult.getList(), MesWmItemConsumeLineDO::getItemId));
+        Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        for (MesWmItemConsumeLineRespVO vo : voPage.getList()) {
+            findAndThen(itemMap, vo.getItemId(), item -> {
+                vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+                findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
+            });
+        }
+        return success(voPage);
+    }
+
+}
+package cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - MES 物料消耗记录行分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesWmItemConsumeLinePageReqVO extends PageParam {
+
+    @Schema(description = "报工记录编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long feedbackId;
+
+}
+package cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - MES 物料消耗记录行 Response VO")
+@Data
+public class MesWmItemConsumeLineRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long id;
+
+    @Schema(description = "消耗记录编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long consumeId;
+
+    @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long itemId;
+
+    @Schema(description = "消耗数量", requiredMode = Schema.RequiredMode.REQUIRED)
+    private BigDecimal quantity;
+
+    @Schema(description = "批次编号")
+    private Long batchId;
+
+    @Schema(description = "批次号")
+    private String batchCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    // ==================== 关联信息 ====================
+
+    @Schema(description = "物资编码")
+    private String itemCode;
+
+    @Schema(description = "物资名称")
+    private String itemName;
+
+    @Schema(description = "规格型号")
+    private String specification;
+
+    @Schema(description = "单位")
+    private String unitName;
+
+}
 package cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume;
+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.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
 import org.apache.ibatis.annotations.Mapper;
-import java.util.List;
-
 /**
  * MES 物料消耗记录行 Mapper
  *
@@ -14,8 +15,11 @@ import java.util.List;
 @Mapper
 public interface MesWmItemConsumeLineMapper extends BaseMapperX<MesWmItemConsumeLineDO> {
-    default List<MesWmItemConsumeLineDO> selectListByConsumeId(Long consumeId) {
-        return selectList(MesWmItemConsumeLineDO::getConsumeId, consumeId);
+    default PageResult<MesWmItemConsumeLineDO> selectPage(MesWmItemConsumeLinePageReqVO reqVO,
+                                                          Long consumeId) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MesWmItemConsumeLineDO>()
+                .eq(MesWmItemConsumeLineDO::getConsumeId, consumeId)
+                .orderByDesc(MesWmItemConsumeLineDO::getId));
     }
 }
@@ -12,4 +12,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MesWmItemConsumeMapper extends BaseMapperX<MesWmItemConsumeDO> {
+    default MesWmItemConsumeDO selectByFeedbackId(Long feedbackId) {
+        return selectOne(MesWmItemConsumeDO::getFeedbackId, feedbackId);
+    }
+
 }
 package cn.iocoder.yudao.module.mes.service.wm.itemconsume;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
 import java.util.List;
@@ -19,11 +21,11 @@ public interface MesWmItemConsumeLineService {
     void createItemConsumeLineBatch(List<MesWmItemConsumeLineDO> lines);
     /**
-     * 根据消耗记录编号查询消耗行
+     * 根据报工记录编号分页查询消耗行
      *
-     * @param consumeId 消耗记录编号
-     * @return 消耗行列表
+     * @param pageReqVO 分页查询参数（含 feedbackId）
+     * @return 消耗行分页
      */
-    List<MesWmItemConsumeLineDO> getItemConsumeLineListByConsumeId(Long consumeId);
+    PageResult<MesWmItemConsumeLineDO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO);
 }
 package cn.iocoder.yudao.module.mes.service.wm.itemconsume;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -20,14 +24,24 @@ public class MesWmItemConsumeLineServiceImpl implements MesWmItemConsumeLineServ
     @Resource
     private MesWmItemConsumeLineMapper itemConsumeLineMapper;
+    @Resource
+    private MesWmItemConsumeMapper itemConsumeMapper;
+
     @Override
     public void createItemConsumeLineBatch(List<MesWmItemConsumeLineDO> lines) {
         itemConsumeLineMapper.insertBatch(lines);
     }
     @Override
-    public List<MesWmItemConsumeLineDO> getItemConsumeLineListByConsumeId(Long consumeId) {
-        return itemConsumeLineMapper.selectListByConsumeId(consumeId);
+    public PageResult<MesWmItemConsumeLineDO> getItemConsumeLinePage(
+            MesWmItemConsumeLinePageReqVO pageReqVO) {
+        // 1. 先通过 feedbackId 找到消耗头
+        MesWmItemConsumeDO consume = itemConsumeMapper.selectByFeedbackId(pageReqVO.getFeedbackId());
+        if (consume == null) {
+            return PageResult.empty();
+        }
+        // 2. 分页查询消耗行
+        return itemConsumeLineMapper.selectPage(pageReqVO, consume.getId());
     }
 }