流程卡根据订单查询和 mes报工

guoyuji

2024-08-28 fb6c0942b508b14f0c97aa84e56a5cf1434c1b3f

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

    //修改排版状态
@@ -157,36 +159,40 @@

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

    @ApiOperation("流程卡明细查询接口")
    @SaCheckPermission("PrintFlowCard.search")
    @PostMapping("/selectPrint/{orderId}")
    @PostMapping("/selectPrint/{inquiryMode}")
    public Result selectPrint(
            @PathVariable String orderId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectPrintSv(orderId, flowCard));
            @PathVariable String inquiryMode,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));

    }

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

    @ApiOperation("打印标签数据查询接口")
    @PostMapping("/getSelectPrintLabel/{projectNo}")
    public Result getSelectPrintLabel(@PathVariable String projectNo) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
    @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
    public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
    }

    @ApiOperation("打印标签查询接口")
@@ -215,11 +221,12 @@
    }

    @ApiOperation("流程卡打印明细数据排序查询接口")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
    public Result printFlowCardDetails(@PathVariable String processId,
                                       @PathVariable String technologyNumber,
                                       @PathVariable String process,
                                       @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber, flowCard));
        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
    }

    @ApiOperation("保存打印排序接口")
@@ -252,4 +259,89 @@
            @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, "保存失败");

        }
    }

    @ApiOperation("打印流程卡补片数据查询接口")
    @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,mergeTechnologyNumber));
    }

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

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

    }

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

    }

    @ApiOperation("排序汇总查询接口")
    @PostMapping("/selectSortTable")
    public Result selectSortTable(
                                  @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 String processCard)  {
        return Result.seccess(flowCardService.getProcessCard(processCard));
    }


}