From 3d66a05e01b17a57f80a422b19fbbff92a69c080 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 二月 2025 16:15:03 +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 | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 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 f96ec19..3be1e02 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
@@ -5,8 +5,10 @@
import com.example.erp.common.Result;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWork;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportingWorkService;
+import com.example.erp.service.userInfo.LogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,34 +22,38 @@
public class ReportingWorkController {
final
ReportingWorkService reportingWorkService;
+ LogService logService;
- public ReportingWorkController(ReportingWorkService reportingWorkService) {
+ public ReportingWorkController(ReportingWorkService reportingWorkService,LogService logService) {
this.reportingWorkService = reportingWorkService;
+ this.logService = logService;
}
@ApiOperation("鎶ュ伐鏂板鏌ヨ")
- @PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
+ @SaCheckPermission("addReportingWork.search")
+ @PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}/{reportType}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@PathVariable String technologyStr,
- @PathVariable String process) {
- return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process));
+ @PathVariable String process,
+ @PathVariable String reportType) {
+ 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));
@@ -59,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,
@@ -80,19 +86,18 @@
}
@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,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚︾鍚堝垹闄ゆ潯浠�");
+ @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
+ ,@PathVariable String userName){
- }
+ return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
+
}
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
- @SaCheckPermission("QualityInspectionReview.search")
+ @SaCheckPermission("qualityInspectionReview.search")
@PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
public Result selectQualityTesting(
@PathVariable Integer pageNum,
@@ -107,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)){
@@ -128,4 +133,28 @@
return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
}
+
+ @ApiOperation("琛ョ墖鐘舵�佹煡璇�")
+ @PostMapping ("/getPatchCondition/{reportingWorkId}")
+ public Result getPatchCondition(
+ @PathVariable String reportingWorkId) {
+ return Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
+ }
+
+ @ApiOperation("mes鎶ュ伐鎺ュ彛")
+ @PostMapping ("/mesReportingWork")
+ public Result mesReportingWork(@RequestBody Map<String,Object> reportingWork){
+ Boolean aBoolean = reportingWorkService.mesReportingWorkSv(reportingWork);
+ if(aBoolean){
+ return Result.seccess(aBoolean);
+ }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));
+ }
+
}
--
Gitblit v1.8.0