标签打印调整，取消left函数的使用

chenlu

2024-12-05 72dc8587cb6fa333dc4584d4ab7e376eea7a9f4f

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

@@ -27,7 +27,7 @@

    //流程卡管理查询
    @ApiOperation("流程卡管理查询接口")
    @SaCheckPermission("SelectProcessCard.search")
    @SaCheckPermission("selectProcessCard.search")
    @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
    public Result dateProcess(
            @PathVariable Integer pageNum,
@@ -41,7 +41,7 @@

    //分架查询
    @ApiOperation("分架查询接口")
    @SaCheckPermission("SelectAddProcess.search")
    @SaCheckPermission("selectAddProcess.search")
    @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")
    public Result selectAddProcess(
            @PathVariable Date selectTime1,
@@ -52,7 +52,7 @@

    //分架明细查询
    @ApiOperation("分架明细查询接口")
    @SaCheckPermission("SplittingDetails.search")
    @SaCheckPermission("splittingDetails.search")
    @PostMapping("/detailsSelect/{orderId}")
    public Result detailsSelect(
            @PathVariable String orderId,
@@ -64,7 +64,7 @@

    //删除流程卡
    @ApiOperation("删除流程卡接口")
    @SaCheckPermission("SelectProcessCard.delete")
    @SaCheckPermission("selectProcessCard.delete")
    @PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}")
    public Result deleteOrderWork(
            @PathVariable String orderId,
@@ -83,7 +83,7 @@

    //修改排版状态
    @ApiOperation("修改排版状态接口")
    @SaCheckPermission("SelectProcessCard.review")
    @SaCheckPermission("selectProcessCard.review")
    @PostMapping("/updateLayoutStatus/{processId}/{state}")
    public Result updateLayoutStatus(
            @PathVariable String processId,
@@ -110,10 +110,10 @@

    //添加流程卡
    @ApiOperation("流程卡创建接口")
    @SaCheckPermission("AddProcessCard.add")
    @PostMapping("/addFlowCard")
    public Result AddOrderWork(@RequestBody Map<String, Object> object) {
        if (flowCardService.addFlowCardSv(object)) {
    @SaCheckPermission("addProcessCard.add")
    @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, "保存失败");
@@ -148,7 +148,7 @@

    //流程卡明细查询
    @ApiOperation("流程卡明细查询接口")
    @SaCheckPermission("SelectDetailProcessCard.search")
    @SaCheckPermission("selectDetailProcessCard.search")
    @PostMapping("/flowCardDetail/{processId}")
    public Result flowCardDetail(
            @PathVariable String processId,
@@ -158,7 +158,7 @@
    }

    @ApiOperation("流程卡打印查询接口")
    @SaCheckPermission("SelectPrintFlowCard.search")
    @SaCheckPermission("selectPrintFlowCard.search")
    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
    public Result selectPrintFlowCard(
            @PathVariable Date selectTime1,
@@ -171,7 +171,7 @@
    }

    @ApiOperation("流程卡明细查询接口")
    @SaCheckPermission("PrintFlowCard.search")
    @SaCheckPermission("printFlowCard.search")
    @PostMapping("/selectPrint/{inquiryMode}")
    public Result selectPrint(
            @PathVariable String inquiryMode,
@@ -201,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,
@@ -211,7 +217,7 @@
    }

    @ApiOperation("复选框修改排版状态")
    @SaCheckPermission("SelectProcessCard.review")
    @SaCheckPermission("selectProcessCard.review")
    @PostMapping("/updateComposing")
    public Result updateComposing(
            @RequestBody Map<String, Object> object
@@ -252,7 +258,7 @@
    }

    @ApiOperation("工程打印查询接口")
    @SaCheckPermission("SelectPrintFlowCard.search")
    @SaCheckPermission("selectPrintFlowCard.search")
    @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
    public Result selectPrintFlowCard(
            @PathVariable Date selectTime1,
@@ -308,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));

    }

@@ -322,6 +329,14 @@
                                             @PathVariable Integer lableType,
                                             @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));

    }

    @ApiOperation("打印自定义标签数据按工程查询接口")
    @PostMapping("/getPrintCustomDataProjectNo/{type}/{projectNo}")
    public Result getPrintCustomDataProjectNo( @PathVariable String type,
                                                    @PathVariable String projectNo) {
        return Result.seccess(flowCardService.getPrintCustomDataProjectNo(type,projectNo));

    }

@@ -339,13 +354,47 @@
    }
    @ApiOperation("汉玻获取流程卡接口")
    @PostMapping("/getProcessCardList/hanbo")
    public Result getProcessCard() {
        return Result.seccess(flowCardService.getProcessCard());
    public Result getProcessCard(@RequestBody Map<String,String> processCards)  {
        return Result.seccess(flowCardService.getProcessCard(processCards));
    }

    @ApiOperation("汉玻确认接收接口")
    @PostMapping("/updateProcessCardState/hanbo")
    public Result updateProcessCardState(@RequestBody Integer id) {
        return Result.seccess(flowCardService.updateProcessCardState(id));
    @ApiOperation("复选框删除流程卡")
    @SaCheckPermission("selectProcessCard.delete")
    @PostMapping("/checkboxDelete")
    public Result checkboxDelete(
            @RequestBody Map<String, Object> object
    ) {

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

    @ApiOperation("工程明细打印查询")
    @PostMapping("/selectPrintProjectDetails/{projectNo}")
    public Result selectPrintProjectDetails(
                                               @PathVariable String projectNo) {
        return Result.seccess(flowCardService.getPrintProjectDetails(projectNo));

    }
    @ApiOperation("工程明细打印标签查询")
    @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
    public Result getPrintCustomDataProjectNoDetail(
            @PathVariable String type,
            @PathVariable Integer detailType,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));

    }

    @ApiOperation("修改工艺流程")
    @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
    public Result updateProcess(
            @PathVariable String processId,
            @PathVariable String technologyNumber,
            @PathVariable String orderId,
            @PathVariable String process,
            @RequestBody Map<String, Object> object
    ) {

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