物料审批

whycxzp

2022-08-22 fb06e27167f575a241e3c0b21e5f768f6c88bbe1

 src/main/java/com/whyc/controller/WorksheetMainController.java

@@ -40,9 +40,9 @@
        }
    }

    @PostMapping("MaterialRelatedSubmit")
    @ApiOperation(value="散装件-产品审批提交")
    public Response MaterialProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
    @PostMapping("materialRelatedSubmit")
    @ApiOperation(value="物料-产品审批提交")
    public Response materialProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
        DocUser user = ActionUtil.getUser();
        boolean res = service.MaterialProductSubmit(mainDTO,user);
        if(res) {
@@ -52,12 +52,12 @@
        }
    }

    @PostMapping("MaterialSubmit")
    @ApiOperation(value="散装件审批提交")
    public Response MaterialSubmit(@RequestBody WorksheetMain main){
    @PostMapping("materialSubmit")
    @ApiOperation(value="物料审批提交")
    public Response materialSubmit(@RequestBody WorksheetMain main){
        Response<Object> response = new Response<>();
        DocUser user = ActionUtil.getUser();
        Response res = service.MaterialSubmit(main,user);
        Response res = service.materialSubmit(main,user);
        if(res.getCode()==1) {
            response.set(1,true, "提交完成");
        }else if(res.getCode()==3){
@@ -71,11 +71,11 @@
            response.setData2(existCAList);
            response.setData3(existMaterialList);
            if(res.getCode()==21){
                response.setMsg("重复提交:现有散装件及正在进行审批的散装件中,存在当前提交上传的散装件");
                response.setMsg("重复提交:现有物料及正在进行审批的物料中,存在当前提交上传的散装件");
            }else if(res.getCode()==22){
                response.setMsg("重复提交:正在进行审批的散装件中,存在当前提交上传的散装件");
                response.setMsg("重复提交:正在进行审批的物料中,存在当前提交上传的物料");
            }else{
                response.setMsg("重复提交:现有散装件中,存在当前提交上传的散装件");
                response.setMsg("重复提交:现有物料中,存在当前提交上传的物料");
            }
        }
        return response;