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

廖井涛

2025-08-11 80779e662c51601328e8e4054ebd169f5360d12c

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -141,12 +141,14 @@

    @SaCheckPermission("orderReport.search")
    @ApiOperation("查询订单报表")
    @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
    @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}/{model}/{scope}")
    public Result getOrderReport(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @PathVariable Integer model,//0:精确查找，1：模糊查询
                                 @PathVariable Integer scope,//模糊范围
                                 @RequestBody OrderDetail orderDetail)  {
        return  Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
        return  Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));

    }

@@ -263,5 +265,20 @@
        return  Result.seccess(null);
    }

    @PostMapping("/upload-dxf")
    public Result uploadDxf(@RequestBody Map<String,Object> object) {
        return  Result.seccess(orderService.uploadDxf(object));
    }

    @PostMapping("/selectUploadDxf")
    public Result selectUploadDxf(@RequestBody Map<String,Object> object) {
        return  Result.seccess(orderService.selectUploadDxf(object));
    }

    @PostMapping("/updateOrderFile")
    public Result updateOrderFile(@RequestBody Map<String,Object> map)  {
        return  Result.seccess(orderService.updateOrderFile(map));
    }


}