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/ReworkController.java

@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.sd.Delivery;
@@ -30,36 +31,36 @@

    /*发货订单查询*/
    @ApiOperation("可返工数据查询接口")
    @SaCheckPermission("AddRework.search")
    @SaCheckPermission("addRework.search")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
    }

    @ApiOperation("返工数据查询接口")
    @SaCheckPermission("SelectRework.search")
    @SaCheckPermission("selectRework.search")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


    @ApiOperation("返工接口新增")
    @SaCheckPermission("AddRework.add")
    @SaCheckPermission("addRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.saveRework(object));
    }

    @ApiOperation("返工审核接口")
    @SaCheckPermission("SelectRework.review")
    @SaCheckPermission("selectRework.review")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.updateRework(object));
    }

    @ApiOperation("返工流程卡明细查询接口")
    @SaCheckPermission("PrintFlowCard.search")
    @SaCheckPermission("printReworkFlowCard.search")
    @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
    public Result selectPrint(
            @PathVariable Date selectTime1,
@@ -68,4 +69,11 @@
        return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));

    }

    @ApiOperation("返工删除接口")
    @SaCheckPermission("selectRework.delete")
    @PostMapping("/deleteRework")
    public Result deleteRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.deleteReworkSv(object));
    }
}