From 91b61fe723df498d62c596372521d426299f0f8b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:54:26 +0800
Subject: [PATCH] 标签不显示标题问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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 67448c5..8b732fc 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,
@@ -46,14 +46,14 @@
}
@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,
@@ -111,8 +111,15 @@
}
+ @ApiOperation("APP璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @SaCheckPermission("qualityInspectionReview.search")
+ @PostMapping ("qualityReviewSearch")
+ public Result qualityReviewSearch(){
+ return Result.seccess(reportingWorkService.qualityReviewSearchSv());
+ }
+
@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)){
@@ -157,4 +164,22 @@
return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
+ @ApiOperation("鎶ュ伐杞Щ")
+ @PostMapping ("/reportingWorkTransfer")
+ public Result reportingWorkTransfer(@RequestBody Map<String,String> reportingWork) {
+ return Result.seccess(reportingWorkService.reportingWorkTransferSv(reportingWork));
+ }
+
+ @ApiOperation("鎵嬫満鏌ヨ褰撶彮浜ч噺")
+ @PostMapping ("/selectShiftQuantity")
+ public Result selectShiftQuantity(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.selectShiftQuantitySv(reportingWork));
+ }
+
+ @ApiOperation("鎵嬫満鏌ヨ鏈彮缁勬姤宸ヨ褰�")
+ @PostMapping("/selectReportingWorkRecordByPhone")
+ public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam) {
+ return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
+ }
+
}
--
Gitblit v1.8.0