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

guoyuji

2024-04-12 febc34d3642ad7d1b68be5ac49eea48089b3e2e0

 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}")
@@ -76,6 +83,18 @@
        }
    }

    @ApiOperation("发货删除接口")
    @PostMapping("/deleteDelivery")
    public Result deleteDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.deleteDelivery(object)){
            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");

        }
    }