From fcf705e1f9a369cab61e60d72048c36a0e1ee793 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 07 三月 2024 13:48:26 +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/pp/ProductionSchedulingController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 97f42d3..787be26 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
@@ -41,14 +41,14 @@
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
@PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
- public Result SelectSchedulingNot(
+ 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));
+ return Result.seccess(productionSchedulingService.selectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
}
@@ -64,14 +64,25 @@
}
}
- //娣诲姞鎺掍骇鏁版嵁
+ //鍒犻櫎鎺掍骇鏁版嵁
@PostMapping("/deleteScheduling")
- public Result DeleteScheduling( @RequestBody Map<String,Object> object){
+ public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
- if(productionSchedulingService.AddSchedulingSv(object)){
+ if(productionSchedulingService.deleteSchedulingSv(object)){
return Result.seccess();
}else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+
+ }
+ }
+
+ @PostMapping("/examineScheduling")
+ public Result ExamineScheduling( @RequestBody Map<String,Object> object){
+
+ if(productionSchedulingService.ExamineSchedulingSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
}
}
--
Gitblit v1.8.0