From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 6ba715d..d27b7fe 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
@@ -30,7 +30,7 @@
}
@ApiOperation("鎶ュ伐鏂板鏌ヨ")
- @SaCheckPermission("AddReportingWork.search")
+ @SaCheckPermission("addReportingWork.search")
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}/{reportType}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@@ -40,20 +40,20 @@
return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
}
@ApiOperation("鏌ヨ宸ュ簭")
- @PostMapping ("/selectProcess")
- public Result SelectProcess() {
- return Result.seccess(reportingWorkService.SelectProcessSv());
+ @PostMapping ("/selectProcess/{userId}")
+ public Result SelectProcess(@PathVariable String userId) {
+ return Result.seccess(reportingWorkService.SelectProcessSv(userId));
}
@ApiOperation("鎶ュ伐鏂板")
- @SaCheckPermission("AddReportingWork.add")
+ @SaCheckPermission("addReportingWork.add")
@PostMapping ("/saveReportingWork")
public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork) {
return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
@ApiOperation("鎶ュ伐瀹℃牳")
- @SaCheckPermission("AddReportingWork.review")
+ @SaCheckPermission("addReportingWork.review")
@PostMapping ("/reviewReportingWork")
public Result ReviewReportingWork(@RequestBody Map<String,String> reportingWork) {
return Result.seccess(reportingWorkService.ReviewReportingWorkSv(reportingWork));
@@ -65,14 +65,14 @@
return Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
}
@ApiOperation("鎶ュ伐淇敼")
- @SaCheckPermission("AddReportingWork.update")
+ @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")
+ @SaCheckPermission("selectReportingWorks.search")
@PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
public Result selectReportingWork(
@PathVariable Integer pageNum,
@@ -86,7 +86,7 @@
}
@ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
- @SaCheckPermission("SelectReportingWorks.delete")
+ @SaCheckPermission("selectReportingWorks.delete")
@PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}")
public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,
@PathVariable String thisProcess,@PathVariable String userId
@@ -97,7 +97,7 @@
}
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
- @SaCheckPermission("QualityInspectionReview.search")
+ @SaCheckPermission("qualityInspectionReview.search")
@PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
public Result selectQualityTesting(
@PathVariable Integer pageNum,
@@ -112,7 +112,7 @@
}
@ApiOperation("璐ㄦ瀹℃牳瀹℃牳")
- @SaCheckPermission("QualityInspectionReview.review")
+ @SaCheckPermission("qualityInspectionReview.review")
@PostMapping ("/updateQualityStatus/{reportingWorkId}/{username}")
public Result updateQualityStatus(@PathVariable String reportingWorkId,@PathVariable String username) {
if(reportingWorkService.updateQualityStatusSv(reportingWorkId,username)){
@@ -150,8 +150,17 @@
}else{
throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
}
+ }
+ @ApiOperation("mes鎶ュ伐娆＄牬鏂板")
+ @PostMapping ("/mesSaveReportingWorkWorn")
+ public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
+ }
-
+ @ApiOperation("鎶ュ伐杞Щ")
+ @PostMapping ("/reportingWorkTransfer")
+ public Result reportingWorkTransfer(@RequestBody Map<String,String> reportingWork) {
+ return Result.seccess(reportingWorkService.reportingWorkTransferSv(reportingWork));
}
}
--
Gitblit v1.8.0