From ec37ee18e2467fbde0eeb1539dcdb846f48ad59f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 03 七月 2025 09:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index cb85036..08abee7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/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));
}
--
Gitblit v1.8.0