From c3360be51c33fbdf16a379156d29cc5cd919e50e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 13 六月 2024 16:15:07 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
index 46ab80d..66a89fa 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -37,35 +37,22 @@
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
@SaCheckPermission("ProductionScheduling.search")
- @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
public Result selectScheduling(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable String selectTime1,
@PathVariable String selectTime2,
- @PathVariable String orderId,
+ @PathVariable String orderIds,
@PathVariable String processes,
@PathVariable Integer state,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderId,processes,state,productionScheduling));
+ return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
}
- //鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
- @ApiOperation("鏍规嵁鏉′欢鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.search")
- @PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
- public Result selectSchedulingNot(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
- @PathVariable String orderId,
- @PathVariable String processes,
- @PathVariable Integer state,
- @RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
- }
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
--
Gitblit v1.8.0