Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-09-26 26633e17d9e9a612e4744405d214cf513d13bffd

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

@@ -201,6 +201,12 @@
        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
    }

    @ApiOperation("打印标签明细查询接口")
    @PostMapping("/getSelectPrintLabelDetails")
    public Result getSelectPrintLabelDetails(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
    }

    @ApiOperation("打印自定义标签数据查询接口")
    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
    public Result getSelectPrintCustomLabel( @PathVariable String type,
@@ -308,11 +314,12 @@
    }

    @ApiOperation("流程卡明细按编号查询接口")
    @PostMapping("/selectPrintDetails/{inquiryMode}")
    @PostMapping("/selectPrintDetails/{inquiryMode}/{type}")
    public Result selectPrintDetails(
            @PathVariable String inquiryMode,
            @PathVariable Integer type,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
        return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));

    }