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

guoyujie

2 天以前 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

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

@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;

import java.sql.Date;
import java.util.List;
import java.util.Map;

@RestController
@@ -27,21 +28,20 @@

    //流程卡管理查询
    @ApiOperation("流程卡管理查询接口")
    @SaCheckPermission("SelectProcessCard.search")
    @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
    @SaCheckPermission("selectProcessCard.search")
    @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
    public Result dateProcess(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable List<String> selectDate,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
        return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));

    }

    //分架查询
    @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,20 +158,21 @@
    }

    @ApiOperation("流程卡打印查询接口")
    @SaCheckPermission("SelectPrintFlowCard.search")
    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
    @SaCheckPermission("selectPrintFlowCard.search")
    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
    public Result selectPrintFlowCard(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable String orderId,
            @PathVariable String project,
            @PathVariable String userId,
            @PathVariable Integer state,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
    }

    @ApiOperation("流程卡明细查询接口")
    @SaCheckPermission("PrintFlowCard.search")
    @SaCheckPermission("printFlowCard.search")
    @PostMapping("/selectPrint/{inquiryMode}")
    public Result selectPrint(
            @PathVariable String inquiryMode,
@@ -181,12 +182,20 @@
    }

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

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

    @ApiOperation("打印标签数据查询接口")
@@ -201,7 +210,13 @@
        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
    }

    @ApiOperation("打印自定义标签数据查询接口")
    @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,
                                             @PathVariable Integer lableType,
@@ -210,8 +225,17 @@

    }

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

    }

    @ApiOperation("复选框修改排版状态")
    @SaCheckPermission("SelectProcessCard.review")
    @SaCheckPermission("selectProcessCard.review")
    @PostMapping("/updateComposing")
    public Result updateComposing(
            @RequestBody Map<String, Object> object
@@ -220,6 +244,15 @@
        return Result.seccess(flowCardService.updateComposingSv(object));
    }

    @ApiOperation("复选框撤销可排版状态")
    @SaCheckPermission("selectProcessCard.review")
    @PostMapping("/revokeComposing")
    public Result revokeComposing(
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.revokeComposingSv(object));
    }
    @ApiOperation("流程卡打印明细数据排序查询接口")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
    public Result printFlowCardDetails(@PathVariable String processId,
@@ -252,7 +285,7 @@
    }

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

    }

@@ -325,6 +359,14 @@

    }

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

    }

    @ApiOperation("排序汇总查询接口")
    @PostMapping("/selectSortTable")
    public Result selectSortTable(
@@ -333,19 +375,86 @@
    }

    @ApiOperation("合并流程卡接口")
    @PostMapping("/mergeFlowCard")
    public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.mergeFlowCard(object));
    @PostMapping("/mergeFlowCard/{merge}")
    public Result mergeFlowCard(@RequestBody Map<String, Object> object,
                                @PathVariable Integer merge) {
        return Result.seccess(flowCardService.mergeFlowCard(object,merge));
    }
    @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));
    }

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

    @ApiOperation("流程卡合架")
    @PostMapping("/flowCardDetail")
    public Result flowCardDetail(
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.flowCardDetail(object));
    }

    @ApiOperation("保存流程卡合架")
    @PostMapping("/updateProcessCardRack")
    public Result updateProcessCardRack(
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.updateProcessCardRack(object));
    }

    @ApiOperation("智能分架")
    @PostMapping("/processCardAutoRack")
    public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.processCardAutoRack(object));
    }
}