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

廖井涛

2025-08-04 855f19dd93d031738388d29b4dc2fd089ef13f02

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

@@ -103,13 +103,25 @@
    }

    //分架新增明细查询
    @ApiOperation("分架明细新增接口")
    @ApiOperation("分架新增明细查询")
    @PostMapping("/selectNoCard/{orderId}/{productionId}")
    public Result SelectNoCard(
            @PathVariable String orderId,
            @PathVariable String productionId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectNoCardSv(orderId, productionId, flowCard));

    }

    @ApiOperation("分架新增明细排序查询")
    @PostMapping("/selectSortingCard/{orderId}/{productionId}/{flashback}/{optionVal}")
    public Result selectSortingCard(
            @PathVariable String orderId,
            @PathVariable String productionId,
            @PathVariable String flashback,
            @PathVariable String optionVal,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));

    }

@@ -187,22 +199,23 @@
    }

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

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

    @ApiOperation("打印标签数据查询接口")