From a49686ae25f3fc71306a1fd9ed117e8ca89da65b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 27 九月 2024 08:42:18 +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 | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 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 f7a4d0d..d570183 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
@@ -1,25 +1,79 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.pp.ReworkDTO;
+import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.Rework;
+import com.example.erp.entity.sd.Delivery;
+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.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Date;
+import java.util.List;
+import java.util.Map;
@RestController
+@Api(value="杩斿伐controller",tags={"杩斿伐鎿嶄綔鎺ュ彛"})
@RequestMapping("/rework")
public class ReworkController {
@Autowired
ReworkService reworkService;
- @PostMapping("/query/{pageNum}/{pageSize}/{startTime}/{endTime}")
- public Result queryRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,
- @PathVariable String startTime,@PathVariable String endTime
- ){
- return Result.seccess(reworkService.queryRework(pageNum,pageSize,startTime,endTime,null));
+
+ /*鍙戣揣璁㈠崟鏌ヨ*/
+ @ApiOperation("鍙繑宸ユ暟鎹煡璇㈡帴鍙�")
+ @SaCheckPermission("addRework.search")
+ @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
+ public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
+ return Result.seccess(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));
+ }
+
+
+ @ApiOperation("杩斿伐鎺ュ彛鏂板")
+ @SaCheckPermission("addRework.add")
+ @PostMapping("/saveRework")
+ public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
+ return Result.seccess(reworkService.saveRework(object));
+ }
+
+ @ApiOperation("杩斿伐瀹℃牳鎺ュ彛")
+ @SaCheckPermission("selectRework.review")
+ @PostMapping("/updateRework")
+ public Result updateRework( @RequestBody Map<String,Object> object){
+ return Result.seccess(reworkService.updateRework(object));
+ }
+
+ @ApiOperation("杩斿伐娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("printReworkFlowCard.search")
+ @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
+ public Result selectPrint(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));
+
+ }
+
+ @ApiOperation("杩斿伐鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectRework.delete")
+ @PostMapping("/deleteRework")
+ public Result deleteRework( @RequestBody Map<String,Object> object){
+ return Result.seccess(reworkService.deleteReworkSv(object));
}
}
--
Gitblit v1.8.0