Merge remote-tracking branch 'origin/master'

于杰

2025-08-11 ba4f03556d24a1548de75c8219cbc3f06e4ff57c

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

    }

@@ -480,4 +492,25 @@
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, FlowCardDTO.class, flowCardService.exportDateProcessSv(dates), "DateProcess");
    }

    @ApiOperation("修改生产终止数量")
    @PostMapping("/updateTermination/{processId}/{orderNumber}/{value}")
    public Result updateTermination(
            @PathVariable String processId,
            @PathVariable Integer orderNumber,
            @PathVariable Integer value
    ) {

        return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,value));
    }

    @ApiOperation("查询用于修改生产终止数量的完工数量")
    @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")
    public Result selectCompleted(
            @PathVariable String processId,
            @PathVariable Integer orderNumber,
            @PathVariable String process) {
        return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,process));

    }
}