blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-10-14 81cad8df0f1b33700e7fc80f271eda7f1180efb0 
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java


@@ -2,6 +2,8 @@




import cn.dev33.satoken.annotation.SaCheckPermission;


import com.example.erp.common.Constants;


import com.example.erp.dto.pp.FlowCardDTO;


import com.example.erp.dto.pp.TeamOutputDTO;


import com.example.erp.entity.pp.FlowCard;


import com.example.erp.entity.sd.DeliveryDetail;


import com.example.erp.entity.sd.Order;


@@ -10,11 +12,14 @@


import com.example.erp.entity.sd.OrderGlassDetail;


import com.example.erp.exception.ServiceException;


import com.example.erp.service.pp.FlowCardService;


import com.example.erp.tools.DownExcel;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.*;




import javax.servlet.http.HttpServletResponse;


import java.io.IOException;


import java.sql.Date;


import java.util.List;


import java.util.Map;


@@ -42,12 +47,11 @@


    //分架查询


    @ApiOperation("分架查询接口")


    @SaCheckPermission("selectAddProcess.search")


    @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")


    @PostMapping("/selectAddProcess/{selectDate}")


    public Result selectAddProcess(


            @PathVariable Date selectTime1,


            @PathVariable Date selectTime2,


            @PathVariable List<String> selectDate,


            @RequestBody FlowCard flowCard) {


        return Result.seccess(flowCardService.selectAddProcess(selectTime1, selectTime2, flowCard));


        return Result.seccess(flowCardService.selectAddProcess(selectDate, flowCard));


    }




    //分架明细查询


@@ -98,13 +102,25 @@


    }




    //分架新增明细查询


    @ApiOperation("分架明细新增接口")


    @ApiOperation("分架新增明细查询")


    @PostMapping("/selectNoCard/{orderId}/{productionId}")


    public Result SelectNoCard(


            @PathVariable String orderId,


            @PathVariable String productionId,


            @RequestBody FlowCard flowCard) {


        return Result.seccess(flowCardService.selectNoCardSv(orderId, productionId, flowCard));




    }




    @ApiOperation("分架新增明细排序查询")


    @PostMapping("/selectSortingCard/{orderId}/{productionId}/{flashback}/{optionVal}")


    public Result selectSortingCard(


            @PathVariable String orderId,


            @PathVariable String productionId,


            @PathVariable String flashback,


            @PathVariable String optionVal,


            @RequestBody FlowCard flowCard) {


        return Result.seccess(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));




    }




@@ -159,16 +175,15 @@




    @ApiOperation("流程卡打印查询接口")


    @SaCheckPermission("selectPrintFlowCard.search")


    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")


    @PostMapping("/selectPrintFlowCard/{selectDate}/{orderId}/{project}/{userId}/{state}")


    public Result selectPrintFlowCard(


            @PathVariable Date selectTime1,


            @PathVariable Date selectTime2,


            @PathVariable List<String> selectDate,


            @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,state, flowCard));


        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));


    }




    @ApiOperation("流程卡明细查询接口")


@@ -182,20 +197,23 @@


    }




    @ApiOperation("打印流程卡数据查询接口")


    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}")


    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}/{compound}/{landingSequence}")


    public Result getSelectPrinting(


            @PathVariable String printMerge,


            @PathVariable String printLike,


            @PathVariable String merge,


            @PathVariable String flashback,


            @PathVariable String compound,


            @PathVariable String landingSequence,


            @RequestBody Map<String, Object> object) {


        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge));


        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));


    }




    @ApiOperation("工程打印流程卡数据查询接口")


    @PostMapping("/getSelectPrintProject/{printProject}/{merge}")


    @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}/{landingSequence}")


    public Result getSelectPrintProject(


            @PathVariable String printProject,@PathVariable String merge) {


        return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));


            @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback,@PathVariable String landingSequence) {


        return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));


    }




    @ApiOperation("打印标签数据查询接口")


@@ -286,11 +304,10 @@




    @ApiOperation("工程打印查询接口")


    @SaCheckPermission("selectPrintFlowCard.search")


    @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")


    @PostMapping("/selectPrintPrintProject/{selectDate}")


    public Result selectPrintFlowCard(


            @PathVariable Date selectTime1,


            @PathVariable Date selectTime2) {


        return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));


            @PathVariable List<String> selectDate) {


        return Result.seccess(flowCardService.selectPrintFlowCard(selectDate));


    }




    @ApiOperation("修改是否打印状态")


@@ -329,6 +346,16 @@


            @PathVariable String mergeTechnologyNumber,


            @RequestBody Map<String, Object> object) {


        return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));


    }




    @ApiOperation("合并打印流程卡补片数据查询接口")


    @PostMapping("/getSelectPrintingConsolidated/{printMerge}/{printLike}/{mergeTechnologyNumber}")


    public Result getSelectPrintingConsolidated(


            @PathVariable String printMerge,


            @PathVariable String printLike,


            @PathVariable String mergeTechnologyNumber,


            @RequestBody Map<String, Object> object) {


        return Result.seccess(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));


    }




    @ApiOperation("打印流程卡返工数据查询接口")


@@ -386,6 +413,12 @@


        return Result.seccess(flowCardService.getProcessCard(processCards));


    }




    @ApiOperation("获取流程卡接口")


    @PostMapping("/getProcessCardList/all")


    public Result getProcessCardAll(@RequestBody Map<String,String> processCards)  {


        return Result.seccess(flowCardService.getProcessCardAll(processCards));


    }




    @ApiOperation("复选框删除流程卡")


    @SaCheckPermission("selectProcessCard.delete")


    @PostMapping("/checkboxDelete")


@@ -414,16 +447,17 @@


    }




    @ApiOperation("修改工艺流程")


    @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")


    @PostMapping("/updateProcess/{processId}/{orderNumber}/{technologyNumber}/{orderId}/{process}")


    public Result updateProcess(


            @PathVariable String processId,


            @PathVariable String orderNumber,


            @PathVariable String technologyNumber,


            @PathVariable String orderId,


            @PathVariable String process,


            @RequestBody Map<String, Object> object


    ) {




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


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


    }




    @ApiOperation("工程打印标签次数修改")


@@ -457,4 +491,34 @@


    public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {


        return Result.seccess(flowCardService.processCardAutoRack(object));


    }




    @ApiOperation("流程卡查询导出")


    @PostMapping("/exportDateProcess")


    public void exportDateProcess(HttpServletResponse response,


                                 @RequestBody Map<String, Object> dates


    ) throws IOException, IllegalAccessException, InstantiationException {


        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字


        DownExcel.download(response, FlowCardDTO.class, flowCardService.exportDateProcessSv(dates), "DateProcess");


    }




    @ApiOperation("修改生产终止数量")


    @PostMapping("/updateTermination/{processId}/{orderNumber}/{value}")


    public Result updateTermination(


            @PathVariable String processId,


            @PathVariable Integer orderNumber,


            @PathVariable Integer value


    ) {




        return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,value));


    }




    @ApiOperation("查询用于修改生产终止数量的完工数量")


    @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")


    public Result selectCompleted(


            @PathVariable String processId,


            @PathVariable Integer orderNumber,


            @PathVariable String process) {


        return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,process));




    }


}