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

廖井涛

5 天以前 ac225bd66eb7c21b5af1d8533dc59376ea53da6c

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

@@ -24,30 +24,30 @@
    @ApiOperation("查询工序接口")
    @PostMapping  ("/selectProcess")
    public Result selectProcess()  {
        return  Result.seccess(basicDateProduceService.selectProcessSv());
        return  Result.success(basicDateProduceService.selectProcessSv());
    }

    @ApiOperation("查询所有基础数据接口")
    @SaCheckPermission("SelectProductionBasicData.search")
    @SaCheckPermission("selectProductionBasicData.search")
    @PostMapping  ("/selectBasic")
    public Result selectBasic()  {
        return  Result.seccess(basicDateProduceService.selectBasicSv());
        return  Result.success(basicDateProduceService.selectBasicSv());
    }

    @ApiOperation("根据Id查询对应基础数据接口")
    @PostMapping  ("/openSelectId/{id}")
    public Result openSelectId(
            @PathVariable String id){
        return Result.seccess(basicDateProduceService.openSelectIdSv(id));
        return Result.success(basicDateProduceService.openSelectIdSv(id));

    }

    @ApiOperation("删除基础数据接口")
    @SaCheckPermission("SelectProductionBasicData.delete")
    @SaCheckPermission("selectProductionBasicData.delete")
    @PostMapping("/deleteBasic/{id}")
    public Result deleteBasic(@PathVariable String id){
        if(basicDateProduceService.deleteBasicSv(id)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败！");

@@ -61,7 +61,7 @@
                              @PathVariable String name,
                              @PathVariable String type){
        if(basicDateProduceService.updateBasicSv(id,process,name,type)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"修改失败");

@@ -69,11 +69,11 @@
    }

    @ApiOperation("班组基础数据添加接口")
    @SaCheckPermission("AddTeamGroup.add")
    @SaCheckPermission("addTeamGroup.add")
    @PostMapping("/saveTeamGroup")
    public Result saveTeamGroup( @RequestBody Map<String,Object> object){
        if(basicDateProduceService.saveTeamGroupSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -81,11 +81,11 @@
    }

    @ApiOperation("次破类型基础数据添加接口")
    @SaCheckPermission("AddBreakageType.add")
    @SaCheckPermission("addBreakageType.add")
    @PostMapping("/saveBreakageType")
    public Result saveBreakageType( @RequestBody Map<String,Object> object){
        if(basicDateProduceService.saveBreakageTypeSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -93,11 +93,11 @@
    }

    @ApiOperation("次破原因基础数据添加接口")
    @SaCheckPermission("AddBreakageReason.add")
    @SaCheckPermission("addBreakageReason.add")
    @PostMapping("/saveBreakageReason")
    public Result saveBreakageReason( @RequestBody Map<String,Object> object){
        if(basicDateProduceService.saveBreakageReasonSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");