From 586070afc1c44d646d42971b6eab4bce46f900f2 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 09 五月 2024 16:32:48 +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/ReworkController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 dd9ff1e..3c3efc7 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
@@ -7,6 +7,7 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReworkService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,6 +16,7 @@
import java.util.Map;
@RestController
+@Api(value="杩斿伐controller",tags={"杩斿伐鎿嶄綔鎺ュ彛"})
@RequestMapping("/rework")
public class ReworkController {
@@ -24,20 +26,20 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
- @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @ApiOperation("鍙繑宸ユ暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectRework/{pageNum}/{pageSize}")
public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
}
- @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @ApiOperation("杩斿伐鏁版嵁鏌ヨ鎺ュ彛")
@PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
}
- @ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
+ @ApiOperation("杩斿伐鎺ュ彛")
@PostMapping("/saveRework")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
if(reworkService.saveRework(object)){
@@ -50,7 +52,7 @@
}
}
- @ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
+ @ApiOperation("杩斿伐瀹℃牳鎺ュ彛")
@PostMapping("/updateRework")
public Result updateRework( @RequestBody Map<String,Object> object){
if(reworkService.updateRework(object)){
--
Gitblit v1.8.0