From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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/ReportingWorkController.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 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..17c0a89 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
@@ -1,10 +1,14 @@
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.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,11 +16,16 @@
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;
+ }
+ @ApiOperation("鎶ュ伐鏂板鏌ヨ")
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@@ -24,15 +33,101 @@
@PathVariable String process) {
return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process));
}
+ @ApiOperation("鏌ヨ宸ュ簭")
@PostMapping ("/selectProcess")
public Result SelectProcess() {
return Result.seccess(reportingWorkService.SelectProcessSv());
}
+ @ApiOperation("鎶ュ伐鏂板")
+ @SaCheckPermission("AddReportingWork.add")
@PostMapping ("/saveReportingWork")
public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork) {
return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
+ @ApiOperation("鎶ュ伐瀹℃牳")
+ @SaCheckPermission("AddReportingWork.review")
+ @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("鎶ュ伐淇敼")
+ @SaCheckPermission("AddReportingWork.update")
+ @PostMapping ("/updateReportingWork/{reviewState}")
+ public Result updateReportingWork(@PathVariable String reviewState,@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.updateReportingWork(reportingWork,reviewState));
+ }
+
+ @ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SelectReportingWorks.search")
+ @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("鍒犻櫎鎶ュ伐鎺ュ彛")
+ @SaCheckPermission("SelectReportingWorks.delete")
+ @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,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚︾鍚堝垹闄ゆ潯浠�");
+//
+// }
+ return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess));
+
+ }
+
+ @ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @SaCheckPermission("QualityInspectionReview.search")
+ @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
+ public Result selectQualityTesting(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable Integer state,
+ @PathVariable String processId,
+ @RequestBody ReportingWork reportingWork){
+ return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectTime1,selectTime2,state,processId,reportingWork));
+
+ }
+
+ @ApiOperation("璐ㄦ瀹℃牳瀹℃牳")
+ @SaCheckPermission("QualityInspectionReview.review")
+ @PostMapping ("/updateQualityStatus/{reportingWorkId}/{username}")
+ public Result updateQualityStatus(@PathVariable String reportingWorkId,@PathVariable String username) {
+ if(reportingWorkService.updateQualityStatusSv(reportingWorkId,username)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
+
+ }
+ }
+
+ @ApiOperation("璐ㄦ瀹℃牳鏄庣粏鏌ヨ鎺ュ彛")
+ @PostMapping ("/detailsQuality/{reportingWorkId}/{processId}/{thisProcess}")
+ public Result detailsQuality(
+ @PathVariable String reportingWorkId,
+ @PathVariable String processId,
+ @PathVariable String thisProcess,
+ @RequestBody ReportingWork reportingWork){
+ return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
+
+ }
}
--
Gitblit v1.8.0