Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-22 42bc535c947bcf999c706a753635d35ef73f91e6

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

@@ -33,6 +33,13 @@
        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
    }

    /*发货报表查询*/
    @ApiOperation("发货报表查询接口")
    @PostMapping("/getSelectDeliveryDetailReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectDeliveryDetailReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
    }

    /*发货订单明细查询*/
    @ApiOperation("发货编辑订单明细查询接口")
    @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
@@ -88,6 +95,12 @@
        }
    }

    @ApiOperation("发货订单查询接口")
    @PostMapping("/getSelectDeliveryPrinting")
    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
    }