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

chenlu

2024-12-27 740a61ac30e319dc3354859f3168c611bd89a955

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

@@ -111,9 +111,9 @@
    //添加流程卡
    @ApiOperation("流程卡创建接口")
    @SaCheckPermission("addProcessCard.add")
    @PostMapping("/addFlowCard")
    public Result AddOrderWork(@RequestBody Map<String, Object> object) {
        if (flowCardService.addFlowCardSv(object)) {
    @PostMapping("/addFlowCard/{orderId}")
    public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
        if (flowCardService.addFlowCardSv(orderId,object)) {
            return Result.seccess();
        } else {
            throw new ServiceException(Constants.Code_500, "保存失败");
@@ -187,6 +187,13 @@
            @PathVariable String printLike,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
    }

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

    @ApiOperation("打印标签数据查询接口")
@@ -397,4 +404,16 @@

        return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
    }

    @ApiOperation("工程打印标签次数修改")
    @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
    public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
        return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
    }

    @ApiOperation("工程打印标签次数修改")
    @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
    public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
        return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
    }
}