From a1a27eba473c476cade23f003d3ac1f1cc1ac27d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 三月 2024 15:14:50 +0800
Subject: [PATCH] 报工明细表字段修改
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index 942d4ee..2b3682b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -9,6 +9,8 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.mm.FinishedGoodsInventoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.example.erp.entity.mm.FinishedGoodsInventory;
@@ -19,23 +21,27 @@
@RestController
@RequestMapping("/FinishedGoodsInventory")
+@Api(value="鎴愬搧搴撳瓨controller",tags={"鎴愬搧搴撳瓨鎿嶄綔鎺ュ彛"})
public class FinishedGoodsInventoryController {
@Autowired
FinishedGoodsInventoryService finishedGoodsInventoryService;
/*鎴愬搧搴撳瓨鏌ヨ*/
+ @ApiOperation("鎴愬搧搴撳瓨鏌ヨ鎺ュ彛")
@PostMapping("/getselet/{pageNum}/{pageSize}")
public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
}
/*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
+ @ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
@PostMapping("/getseletwarehousing/{pageNum}/{pageSize}")
public Result getseletwarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
return Result.seccess(finishedGoodsInventoryService.getseletwarehousing(pageNum,pageSize,flowCard));
}
/*鎴愬搧鍏ュ簱*/
+ @ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
@PostMapping("/addseletwarehousing")
public Result addseletwarehousing( @RequestBody Map<String,Object> object){
if(finishedGoodsInventoryService.addseletwarehousing(object)){
@@ -47,12 +53,14 @@
}
/*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
+ @ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
@PostMapping("/getseletdeliveryDetail/{pageNum}/{pageSize}")
public Result getseletdeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
return Result.seccess(finishedGoodsInventoryService.getseletdeliveryDetail(pageNum,pageSize,orderDetail));
}
/*鎴愬搧鍙戣揣*/
+ @ApiOperation("鎴愬搧鍙戣揣鎺ュ彛")
@PostMapping("/adddeliveryDetail")
public Result adddeliveryDetail( @RequestBody Map<String,Object> object){
if(finishedGoodsInventoryService.adddeliveryDetail(object)){
@@ -64,12 +72,14 @@
}
/* 璋冩嫧鏌ヨ*/
+ @ApiOperation("鍙皟鎷ㄦ暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
}
/*璁㈠崟璋冩嫧*/
+ @ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
@PostMapping("/updateFinishedGoodsInventoryAllocate")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
if(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object)){
@@ -77,18 +87,20 @@
return Result.seccess();
}else {
- throw new ServiceException(Constants.Code_500,"璋冩嫧澶辫触");
+ throw new ServiceException(Constants.Code_500,"璋冩嫧澶辫触,璇锋鏌ヨ鍗曡緭鍏ユ槸鍚︽纭�");
}
}
- /*棰嗗嚭鏌ヨ*/
- @PostMapping("/getselectAllocateFinishedOperateLog/{pageNum}/{pageSize}")
- public Result getselectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedOperateLog finishedOperateLog){
- return Result.seccess(finishedGoodsInventoryService.getselectAllocateFinishedOperateLog(pageNum,pageSize,finishedOperateLog));
+ /*璋冩嫧璁板綍鏌ヨ*/
+ @ApiOperation("璋冩嫧璁板綍鏌ヨ鎺ュ彛")
+ @PostMapping("/getselectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
+ public Result getselectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getselectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
}
/*璁㈠崟棰嗗嚭*/
+ @ApiOperation("璁㈠崟棰嗗嚭鎺ュ彛")
@PostMapping("/updateFinishedGoodsInventoryTakeOut")
public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object> object){
@@ -102,8 +114,52 @@
}
/*棰嗗嚭璁板綍鏌ヨ*/
- @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}")
- public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedOperateLog finishedOperateLog){
- return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,finishedOperateLog));
+ @ApiOperation("棰嗗嚭璁板綍鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
+ }
+
+ /*璁㈠崟杩斿伐*/
+ @ApiOperation("璁㈠崟杩斿伐鏌ヨ鎺ュ彛")
+ @PostMapping("/updateFinishedGoodsInventoryRework")
+ public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"杩斿伐澶辫触");
+
+ }
+ }
+
+
+
+ /*璁㈠崟瀹℃牳*/
+ @ApiOperation("璁㈠崟瀹℃牳鎺ュ彛")
+ @PostMapping("/updateFinishedGoodsInventoryToExamine")
+ public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳")){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
+
+ }
+ }
+ /*璁㈠崟鍙嶅*/
+ @ApiOperation("璁㈠崟鍙嶅鎺ュ彛")
+ @PostMapping("/updateFinishedGoodsInventoryCounterexamination")
+ public Result updateFinishedGoodsInventoryCounterexamination( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅")){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
+
+ }
}
}
--
Gitblit v1.8.0