Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91

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

@@ -169,20 +169,20 @@

    @ApiOperation("流程卡明细查询接口")
    @SaCheckPermission("PrintFlowCard.search")
    @PostMapping("/selectPrint/{orderId}")
    @PostMapping("/selectPrint")
    public Result selectPrint(
            @PathVariable String orderId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectPrintSv(orderId, flowCard));
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectPrintSv(object));

    }

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

    @ApiOperation("打印标签数据查询接口")
@@ -282,4 +282,13 @@

        }
    }

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