From 16bbf8260110e2790f304e8421cf7591837ca302 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 14 七月 2025 11:16:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 f048d79..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));
}
@@ -255,13 +257,11 @@
@ApiOperation("鎵嬫満鎵爜鐜荤拑淇℃伅")
@PostMapping("/scannerGlassInfo/{projectNo}")
public Result scannerGlassInfo(@PathVariable String projectNo) {
- System.out.println("123123");
return Result.seccess(orderService.scannerGlassInfo(projectNo));
}
@PostMapping("/test")
public Result scannerGlassInfo() {
- System.out.println("123123");
return Result.seccess(null);
}
--
Gitblit v1.8.0