Merge remote-tracking branch 'origin/dev_business' into dev_business

云

9 天以前 106aaa378126774a2547b6c0d559c62114579f4c

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java

@@ -65,8 +65,19 @@
        if (CollUtil.isEmpty(pageResult.getList())) {
            return success(PageResult.empty(pageResult.getTotal()));
        }
        buildGroupItemInfo(pageResult.getList());
        buildSnGroupItemVO(pageResult.getList());
        return success(pageResult);
    }

    @GetMapping("/list-by-uuid")
    @Operation(summary = "获得批次 SN 码明细列表")
    @Parameter(name = "uuid", description = "批次 UUID", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-sn:query')")
    public CommonResult<List<MesWmSnRespVO>> getSnListByUuid(
            @RequestParam("uuid") @NotBlank(message = "批次 UUID 不能为空") String uuid) {
        List<MesWmSnRespVO> list = BeanUtils.toBean(snService.getSnListByUuid(uuid), MesWmSnRespVO.class);
        buildSnItemVO(list);
        return success(list);
    }

    @DeleteMapping("/delete-batch")
@@ -85,7 +96,7 @@
    public void exportSnGroupExcel(@Valid MesWmSnPageReqVO reqVO, HttpServletResponse response) throws IOException {
        reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        List<MesWmSnGroupRespVO> list = snService.getSnGroupPage(reqVO).getList();
        buildGroupItemInfo(list);
        buildSnGroupItemVO(list);
        ExcelUtils.write(response, "SN码分组.xls", "数据", MesWmSnGroupRespVO.class, list);
    }

@@ -96,13 +107,13 @@
    @ApiAccessLog(operateType = EXPORT)
    public void exportSnExcel(@RequestParam("uuid") String uuid, HttpServletResponse response) throws IOException {
        List<MesWmSnRespVO> list = BeanUtils.toBean(snService.getSnListByUuid(uuid), MesWmSnRespVO.class);
        buildItemInfo(list);
        buildSnItemVO(list);
        ExcelUtils.write(response, "SN码明细.xls", "数据", MesWmSnRespVO.class, list);
    }

    // ==================== 拼接 VO ====================

    private void buildGroupItemInfo(List<MesWmSnGroupRespVO> list) {
    private void buildSnGroupItemVO(List<MesWmSnGroupRespVO> list) {
        if (CollUtil.isEmpty(list)) {
            return;
        }
@@ -115,7 +126,7 @@
        }));
    }

    private void buildItemInfo(List<MesWmSnRespVO> list) {
    private void buildSnItemVO(List<MesWmSnRespVO> list) {
        if (CollUtil.isEmpty(list)) {
            return;
        }