From d499e1ac4d1872badb2190ce4cdba31836488b4f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 18 三月 2024 13:25:30 +0800
Subject: [PATCH] 订单作废按钮以及弯钢弧度设置大小片
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index d2efb21..e022d55 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -2,9 +2,12 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportingWorkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -12,9 +15,14 @@
import java.sql.Date;
@RestController
@RequestMapping("/reportingWork")
+@Api(value="鎶ュ伐controller",tags={"鎶ュ伐鎺у埗鍣�"})
public class ReportingWorkController {
- @Autowired
+ final
ReportingWorkService reportingWorkService;
+
+ public ReportingWorkController(ReportingWorkService reportingWorkService) {
+ this.reportingWorkService = reportingWorkService;
+ }
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
@@ -29,10 +37,50 @@
return Result.seccess(reportingWorkService.SelectProcessSv());
}
+ @ApiOperation("鎶ュ伐鏂板")
@PostMapping ("/saveReportingWork")
public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork) {
return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
+ @ApiOperation("鎶ュ伐瀹℃牳")
+ @PostMapping ("/reviewReportingWork")
+ public Result ReviewReportingWork(@RequestBody Map<String,String> reportingWork) {
+ return Result.seccess(reportingWorkService.ReviewReportingWorkSv(reportingWork));
+ }
+ @ApiOperation("鎶ュ伐淇敼鏌ヨ")
+ @PostMapping ("/selectUpdateReportingWork/{reportingWorkId}")
+ public Result SelectUpdateReportingWork(@PathVariable String reportingWorkId) {
+ return Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
+ }
+ @ApiOperation("鎶ュ伐淇敼")
+ @PostMapping ("/updateReportingWork")
+ public Result updateReportingWork(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.updateReportingWork(reportingWork));
+ }
+
+ @ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
+ @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
+ public Result selectReportingWork(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @RequestBody ReportingWork reportingWork){
+ return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));
+
+ }
+
+ @ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
+ @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}")
+ public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,@PathVariable String thisProcess){
+ if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚︾鍚堝垹闄ゆ潯浠�");
+
+ }
+ }
}
--
Gitblit v1.8.0