From ecb3045fb71d05b7ee3bf73fdf413f5091d65f65 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 19 三月 2024 09:22:33 +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 | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 e022d55..5725a3c 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
@@ -24,7 +24,7 @@
this.reportingWorkService = reportingWorkService;
}
-
+ @ApiOperation("鎶ュ伐鏂板鏌ヨ")
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@@ -32,6 +32,7 @@
@PathVariable String process) {
return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process));
}
+ @ApiOperation("鏌ヨ宸ュ簭")
@PostMapping ("/selectProcess")
public Result SelectProcess() {
return Result.seccess(reportingWorkService.SelectProcessSv());
@@ -55,9 +56,9 @@
return Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
}
@ApiOperation("鎶ュ伐淇敼")
- @PostMapping ("/updateReportingWork")
- public Result updateReportingWork(@RequestBody Map<String,Object> reportingWork) {
- return Result.seccess(reportingWorkService.updateReportingWork(reportingWork));
+ @PostMapping ("/updateReportingWork/{reviewState}")
+ public Result updateReportingWork(@PathVariable String reviewState,@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.updateReportingWork(reportingWork,reviewState));
}
@ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
@@ -83,4 +84,40 @@
}
}
+
+ @ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @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("璐ㄦ瀹℃牳瀹℃牳")
+ @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