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

guoyuji

2024-09-26 26633e17d9e9a612e4744405d214cf513d13bffd

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

@@ -65,10 +65,12 @@
    //删除流程卡
    @ApiOperation("删除流程卡接口")
    @SaCheckPermission("SelectProcessCard.delete")
    @PostMapping("/deleteFlowCard/{orderId}/{processId}")
    @PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}")
    public Result deleteOrderWork(
            @PathVariable String orderId,
            @PathVariable String processId
            @PathVariable String processId,
            @PathVariable String userId,
            @PathVariable String userName
    ) {
//        if(flowCardService.deleteFlowCardSv(orderId,processId)){
//            return Result.seccess();
@@ -76,7 +78,7 @@
//            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否已报工");
//
//        }
        return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId));
        return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
    }

    //修改排版状态
@@ -199,6 +201,12 @@
        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
    }

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

    @ApiOperation("打印自定义标签数据查询接口")
    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
    public Result getSelectPrintCustomLabel( @PathVariable String type,
@@ -287,12 +295,13 @@
    }

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

    @ApiOperation("打印流程卡返工数据查询接口")
@@ -305,11 +314,12 @@
    }

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

    }

@@ -328,4 +338,26 @@
                                  @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectSortTableSv(object));
    }

    @ApiOperation("合并流程卡接口")
    @PostMapping("/mergeFlowCard")
    public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.mergeFlowCard(object));
    }
    @ApiOperation("汉玻获取流程卡接口")
    @PostMapping("/getProcessCardList/hanbo")
    public Result getProcessCard(@RequestBody Map<String,String> processCards)  {
        return Result.seccess(flowCardService.getProcessCard(processCards));
    }

    @ApiOperation("复选框删除流程卡")
    @SaCheckPermission("SelectProcessCard.delete")
    @PostMapping("/checkboxDelete")
    public Result checkboxDelete(
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.checkboxDeleteSv(object));
    }

}