流程卡合并标记打印

廖井涛

2025-02-17 2e5fe8dc8e213e4928013684d930f68fbd86b157

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -181,19 +181,20 @@
    }

    @ApiOperation("打印流程卡数据查询接口")
    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}")
    public Result getSelectPrinting(
            @PathVariable String printMerge,
            @PathVariable String printLike,
            @PathVariable String merge,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge));
    }

    @ApiOperation("工程打印流程卡数据查询接口")
    @PostMapping("/getSelectPrintProject/{printProject}")
    @PostMapping("/getSelectPrintProject/{printProject}/{merge}")
    public Result getSelectPrintProject(
            @PathVariable String printProject) {
        return Result.seccess(flowCardService.getSelectPrintProject(printProject));
            @PathVariable String printProject,@PathVariable String merge) {
        return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));
    }

    @ApiOperation("打印标签数据查询接口")
@@ -214,7 +215,7 @@
        return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
    }

    @ApiOperation("打印自定义标签数据查询接口")
    @ApiOperation("打印自定义标签数据查询接口明细")
    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
    public Result getSelectPrintCustomLabel( @PathVariable String type,
                                             @PathVariable Integer lableType,
@@ -223,7 +224,7 @@

    }

    @ApiOperation("打印自定义标签数据查询接口2")
    @ApiOperation("打印自定义标签数据查询接口")
    @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
    public Result getSelectPrintCustomLabel2( @PathVariable String type,
                                             @PathVariable Integer lableType,