From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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/ReworkController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
index fe4574d..b296138 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -34,14 +34,14 @@
@SaCheckPermission("addRework.search")
@PostMapping("/getSelectRework/{pageNum}/{pageSize}")
public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
- return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
+ return Result.success(reworkService.getSelectRework(pageNum,pageSize));
}
@ApiOperation("杩斿伐鏁版嵁鏌ヨ鎺ュ彛")
@SaCheckPermission("selectRework.search")
@PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
- return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
+ return Result.success(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
}
@@ -49,14 +49,14 @@
@SaCheckPermission("addRework.add")
@PostMapping("/saveRework")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
- return Result.seccess(reworkService.saveRework(object));
+ return Result.success(reworkService.saveRework(object));
}
@ApiOperation("杩斿伐瀹℃牳鎺ュ彛")
@SaCheckPermission("selectRework.review")
@PostMapping("/updateRework")
public Result updateRework( @RequestBody Map<String,Object> object){
- return Result.seccess(reworkService.updateRework(object));
+ return Result.success(reworkService.updateRework(object));
}
@ApiOperation("杩斿伐娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -66,7 +66,7 @@
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard) {
- return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));
+ return Result.success(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));
}
@@ -74,7 +74,7 @@
@SaCheckPermission("selectRework.delete")
@PostMapping("/deleteRework")
public Result deleteRework( @RequestBody Map<String,Object> object){
- return Result.seccess(reworkService.deleteReworkSv(object));
+ return Result.success(reworkService.deleteReworkSv(object));
}
@ApiOperation("杩斿伐鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
@@ -82,7 +82,7 @@
public Result getSelectReworkPrintCustomLabel( @PathVariable String type,
@PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));
+ return Result.success(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));
}
}
--
Gitblit v1.8.0