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

廖井涛

2024-07-10 78809560f4315777e770acec0e24cb42e2ca97a7

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

@@ -189,11 +189,18 @@
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
    }

    @ApiOperation("打印标签查询接口")
    @PostMapping("/getSelectPrintLabel1")
    public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
    }

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

    }

@@ -207,7 +214,7 @@
        return Result.seccess(flowCardService.updateComposingSv(object));
    }

    @ApiOperation("流程卡打印明细数据查询接口")
    @ApiOperation("流程卡打印明细数据排序查询接口")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
    public Result printFlowCardDetails(@PathVariable String processId,
                                       @PathVariable String technologyNumber,
@@ -245,4 +252,32 @@
            @PathVariable Date selectTime2) {
        return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
    }

    @ApiOperation("修改是否打印状态")
    @PostMapping("/updatePrintState/{printState}")
    public Result updatePrintState(
            @PathVariable Integer printState,
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
    }

    @ApiOperation("流程卡打印订单数据排序查询接口")
    @PostMapping("/printFlowCardOrderSort/{orderId}")
    public Result printFlowCardOrderSort(@PathVariable String orderId,
                                       @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
    }

    @ApiOperation("保存打印订单排序接口")
    @PostMapping("/printOrderSort")
    public Result printOrderSort(@RequestBody Map<String, Object> object) {
        if (flowCardService.printOrderSort(object)) {
            return Result.seccess();
        } else {
            throw new ServiceException(Constants.Code_500, "保存失败");

        }
    }
}