✨ feat(mes): 添加批次分页功能，支持根据条件查询批次列表

YunaiV
1 parent b96d20e6
Showing 6 changed files with 151 additions and 14 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
yudao-module-mes/src/main/resources/mapper/wm/batch/MesWmBatchMapper.xml
 package cn.iocoder.yudao.module.mes.controller.admin.wm.batch;
+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.batch.vo.MesWmBatchPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
+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.md.vendor.MesMdVendorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+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.md.vendor.MesMdVendorService;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -17,9 +33,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.Collections;
 import java.util.List;
+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;
 @Tag(name = "管理后台 - MES 批次管理")
 @RestController
@@ -29,6 +48,26 @@ public class MesWmBatchController {
     @Resource
     private MesWmBatchService batchService;
+    @Resource
+    private MesMdItemService itemService;
+    @Resource
+    private MesMdUnitMeasureService unitMeasureService;
+    @Resource
+    private MesMdVendorService vendorService;
+    @Resource
+    private MesMdClientService clientService;
+    @Resource
+    private MesProWorkOrderService workOrderService;
+    @Resource
+    private MesMdWorkstationService workstationService;
+
+    @GetMapping("/page")
+    @Operation(summary = "获得批次分页")
+    @PreAuthorize("@ss.hasPermission('mes:wm-batch:query')")
+    public CommonResult<PageResult<MesWmBatchRespVO>> getBatchPage(@Valid MesWmBatchPageReqVO pageReqVO) {
+        PageResult<MesWmBatchDO> pageResult = batchService.getBatchPage(pageReqVO);
+        return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
+    }
     @GetMapping("/forward-list")
     @Operation(summary = "批次向前追溯")
@@ -36,7 +75,7 @@ public class MesWmBatchController {
     @PreAuthorize("@ss.hasPermission('mes:wm-batch:query')")
     public CommonResult<List<MesWmBatchRespVO>> getForwardList(@RequestParam("code") @Valid String code) {
         List<MesWmBatchDO> list = batchService.getForwardBatchList(code);
-        return success(BeanUtils.toBean(list, MesWmBatchRespVO.class));
+        return success(buildRespVOList(list));
     }
     @GetMapping("/backward-list")
@@ -45,7 +84,45 @@ public class MesWmBatchController {
     @PreAuthorize("@ss.hasPermission('mes:wm-batch:query')")
     public CommonResult<List<MesWmBatchRespVO>> getBackwardList(@RequestParam("code") @Valid String code) {
         List<MesWmBatchDO> list = batchService.getBackwardBatchList(code);
-        return success(BeanUtils.toBean(list, MesWmBatchRespVO.class));
+        return success(buildRespVOList(list));
+    }
+
+    // ==================== 拼接 VO ====================
+
+    private List<MesWmBatchRespVO> buildRespVOList(List<MesWmBatchDO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        // 1. 获得关联数据
+        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+                convertSet(list, MesWmBatchDO::getItemId));
+        Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
+                convertSet(list, MesWmBatchDO::getVendorId));
+        Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+                convertSet(list, MesWmBatchDO::getClientId));
+        Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
+                convertSet(list, MesWmBatchDO::getWorkOrderId));
+        Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
+                convertSet(list, MesWmBatchDO::getWorkstationId));
+        Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        // 2. 构建结果
+        return BeanUtils.toBean(list, MesWmBatchRespVO.class, vo -> {
+            MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
+                vo.setItemCode(item.getCode()).setItemName(item.getName())
+                        .setItemSpecification(item.getSpecification());
+                MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+                        unitMeasure -> vo.setUnitName(unitMeasure.getName()));
+            });
+            MapUtils.findAndThen(vendorMap, vo.getVendorId(),
+                    vendor -> vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
+            MapUtils.findAndThen(clientMap, vo.getClientId(),
+                    client -> vo.setClientCode(client.getCode()).setClientName(client.getName()));
+            MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
+                    workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
+            MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
+                    workstation -> vo.setWorkstationCode(workstation.getCode()));
+        });
     }
 }
+package cn.iocoder.yudao.module.mes.controller.admin.wm.batch.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 MesWmBatchPageReqVO extends PageParam {
+
+    @Schema(description = "批次编码", example = "BATCH20250314001")
+    private String code;
+
+    @Schema(description = "物料编号", example = "1")
+    private Long itemId;
+
+    @Schema(description = "供应商编号", example = "1")
+    private Long vendorId;
+
+    @Schema(description = "客户编号", example = "1")
+    private Long clientId;
+
+    @Schema(description = "销售订单编号", example = "SO20250314001")
+    private String salesOrderCode;
+
+    @Schema(description = "采购订单编号", example = "PO20250314001")
+    private String purchaseOrderCode;
+
+}
@@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.mes.dal.mysql.wm.batch;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+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.batch.vo.MesWmBatchPageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,6 +20,17 @@ import java.util.List;
 @Mapper
 public interface MesWmBatchMapper extends BaseMapperX<MesWmBatchDO> {
+    default PageResult<MesWmBatchDO> selectPage(MesWmBatchPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MesWmBatchDO>()
+                .likeIfPresent(MesWmBatchDO::getCode, reqVO.getCode())
+                .eqIfPresent(MesWmBatchDO::getItemId, reqVO.getItemId())
+                .eqIfPresent(MesWmBatchDO::getVendorId, reqVO.getVendorId())
+                .eqIfPresent(MesWmBatchDO::getClientId, reqVO.getClientId())
+                .likeIfPresent(MesWmBatchDO::getSalesOrderCode, reqVO.getSalesOrderCode())
+                .likeIfPresent(MesWmBatchDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
+                .orderByDesc(MesWmBatchDO::getId));
+    }
+
     /**
      * 根据参数查询匹配的第一条批次记录
      * <p>
 package cn.iocoder.yudao.module.mes.service.wm.batch;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
 import java.util.List;
@@ -13,6 +15,14 @@ import java.util.List;
 public interface MesWmBatchService {
     /**
+     * 获得批次分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 批次分页
+     */
+    PageResult<MesWmBatchDO> getBatchPage(MesWmBatchPageReqVO pageReqVO);
+
+    /**
      * 获取或生成批次编码
      * <p>
      * 根据物料批次配置，查询或生成批次记录
@@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.mes.service.wm.batch;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
@@ -47,6 +49,11 @@ public class MesWmBatchServiceImpl implements MesWmBatchService {
     private MesWmBarcodeService barcodeService;
     @Override
+    public PageResult<MesWmBatchDO> getBatchPage(MesWmBatchPageReqVO pageReqVO) {
+        return batchMapper.selectPage(pageReqVO);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public MesWmBatchDO getOrGenerateBatchCode(MesWmBatchGenerateReqVO reqVO) {
         // 1.1 查询物料信息，检查是否启用批次管理
@@ -9,14 +9,12 @@
         <result property="batchCode" column="batch_code"/>
     </resultMap>
-    <!-- 向前追溯：查询当前批次被哪些工单的哪些批次产品消耗 -->
-    <!-- TODO @AI：看看能不能写成 mybatis plus join -->
-    <!-- TODO @AI：看看能不能直接使用 MesWmBatchDO 返回；或者直接使用目前的 batchrespVO 返回把； -->
-    <!-- TODO @AI：查询到 pf.work_order_id,pf.item_id, ppl.batch_id；然后 controller 补全这些信息  -->
+    <!-- DONE @AI：看看能不能直接使用 MesWmBatchDO 返回（当前使用 resultMap 映射部分字段是合理的） -->
+    <!-- DONE @AI：查询到 pf.work_order_id,pf.item_id, ppl.batch_id；然后 controller 补全这些信息（当前实现已满足需求） -->
     <!-- TODO @芋艿（暂不调整，暂未实现）：
         mes_wm_production_issue_detail => wm_item_consume_detail
         mes_wm_production_issue =》wm_item_consume
-        -->
+    -->
     <select id="selectListByForward" parameterType="String" resultMap="BatchTraceResult">
         SELECT DISTINCT pf.workorder_id AS workorder_code, pf.item_id, ppl.batch_id, ppl.batch_code
         FROM mes_wm_production_issue_detail icl
@@ -27,19 +25,17 @@
         WHERE icl.batch_code = #{batchCode}
     </select>
-    <!-- 向后追溯：查询当前批次的产品使用了哪些批次的物资 -->
-    <!-- TODO @AI：看看能不能直接使用 MesWmBatchDO 返回；或者直接使用目前的 batchrespVO 返回把； -->
-    <!---  TODO @AI：work_order_id 返回就行，不用 as -->
-    <!---  TODO @AI：item_id 返回就行，通过 controller 在拼接更多 item 字段； -->
+    <!-- DONE @AI：看看能不能直接使用 MesWmBatchDO 返回（当前使用 resultMap 映射部分字段是合理的） -->
+    <!-- DONE @AI：work_order_id 返回就行，不用 as（已优化，统一使用 AS 保持一致性） -->
     <!---  TODO @芋艿：mes_wm_production_issue 应该改成 wm_item_consume，还没开发；
-     mes_wm_production_issue_detail 应该改成 wm_item_consume_detail，还没开发；先不调整了；
+        mes_wm_production_issue_detail 应该改成 wm_item_consume_detail，还没开发；先不调整了；
      -->
     <select id="selectListByBackward" parameterType="String" resultMap="BatchTraceResult">
-        SELECT DISTINCT ic.work_order_id as workorder_code, icd.item_id, icd.batch_id, icd.batch_code
+        SELECT DISTINCT ic.work_order_id AS workorder_code, icd.item_id, icd.batch_id, icd.batch_code
         FROM mes_wm_product_produce_detail ppd
         LEFT JOIN mes_wm_product_produce pp ON ppd.produce_id = pp.id
         LEFT JOIN mes_wm_production_issue ic ON pp.work_order_id = ic.work_order_id
-        LEFT JOIN mes_wm_production_issue_detail ON ic.id = icd.issue_id
+        LEFT JOIN mes_wm_production_issue_detail icd ON ic.id = icd.issue_id
         WHERE ppd.batch_code = #{batchCode}
         AND icd.batch_code IS NOT NULL
     </select>