Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-06-30 ab6ac91b7ed9ae3f9c68766f499ece11585c8859

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

    }

@@ -247,9 +249,20 @@
    }

    @ApiOperation("退回流程")
    @PostMapping("/processBack/{orderId}")
    public Result processBack(@PathVariable String orderId)  {
        return  Result.seccess(orderService.processBack(orderId));
    @PostMapping("/processBack/{orderId}/{status}")
    public Result processBack(@PathVariable String orderId,@PathVariable Integer status)  {
        return  Result.seccess(orderService.processBack(orderId,status));
    }

    @ApiOperation("手机扫码玻璃信息")
    @PostMapping("/scannerGlassInfo/{projectNo}")
    public Result scannerGlassInfo(@PathVariable String projectNo)  {
        return  Result.seccess(orderService.scannerGlassInfo(projectNo));
    }

    @PostMapping("/test")
    public Result scannerGlassInfo()  {
        return  Result.seccess(null);
    }