From 4af4c7b1915a555ab61a8cca3c2ab5875be8a18b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 28 十月 2025 14:36:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 12 ++++++------
1 files changed, 6 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 f93d94e..ab5ddb8 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
@@ -31,7 +31,7 @@
@PathVariable String processes,
@PathVariable String orderId,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
+ return Result.success(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@@ -48,7 +48,7 @@
@PathVariable Integer state,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
+ return Result.success(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
}
@@ -61,7 +61,7 @@
public Result addScheduling( @RequestBody Map<String,Object> object){
if(productionSchedulingService.addSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -75,7 +75,7 @@
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
if(productionSchedulingService.deleteSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
@@ -88,7 +88,7 @@
public Result examineScheduling( @RequestBody Map<String,Object> object){
if(productionSchedulingService.examineSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
@@ -101,7 +101,7 @@
public Result cancelReviewScheduling( @RequestBody Map<String,Object> object){
if(productionSchedulingService.cancelReviewSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"鍙嶅澶辫触");
--
Gitblit v1.8.0