添加流程排序汇总查询，修改报工查询流程卡显示层

chenlu

2024-08-14 ec49ea0aa44ebbbe2faea2894539ac4ca515bd6b

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

@@ -157,38 +157,40 @@

    @ApiOperation("流程卡打印查询接口")
    @SaCheckPermission("SelectPrintFlowCard.search")
    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
    public Result selectPrintFlowCard(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable String orderId,
            @PathVariable String project,
            @PathVariable String userId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
    }

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

    }

    @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("打印标签数据查询接口")
    @PostMapping("/getSelectPrintLabel/{projectNo}")
    public Result getSelectPrintLabel(@PathVariable String projectNo) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
    @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
    public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
    }

    @ApiOperation("打印标签查询接口")
@@ -217,11 +219,12 @@
    }

    @ApiOperation("流程卡打印明细数据排序查询接口")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
    public Result printFlowCardDetails(@PathVariable String processId,
                                       @PathVariable String technologyNumber,
                                       @PathVariable String process,
                                       @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber, flowCard));
        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
    }

    @ApiOperation("保存打印排序接口")
@@ -282,4 +285,47 @@

        }
    }

    @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));
    }

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

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

    }

    @ApiOperation("打印自定义标签数据按编号查询接口")
    @PostMapping("/getSelectPrintCustomLabelDetails/{type}/{lableType}")
    public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
                                             @PathVariable Integer lableType,
                                             @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));

    }

    @ApiOperation("排序汇总查询接口")
    @PostMapping("/selectSortTable")
    public Result selectSortTable(
                                  @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectSortTableSv(object));
    }
}