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

guoyuji

2024-09-26 8c29a327707574f1e04cd25218e05ba9b4c8e4a8

 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;
@@ -39,7 +40,7 @@
    @ApiOperation("返工数据查询接口")
    @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));
    }

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