From 7fdc12195ab810476f01f6d332cbcd0a271effdb Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 17 十一月 2025 08:31:09 +0800
Subject: [PATCH] 提交部分报工存入redis功能实现
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 160 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 122 insertions(+), 38 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 fa1191e..61638f7 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,13 +5,17 @@
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 com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
import java.sql.Date;
@RestController
@@ -20,101 +24,109 @@
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("鎶ュ伐鏂板鏌ヨ")
- @SaCheckPermission("AddReportingWork.search")
- @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.success(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.success(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));
+ return Result.success(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));
+ return Result.success(reportingWorkService.ReviewReportingWorkSv(reportingWork));
}
@ApiOperation("鎶ュ伐淇敼鏌ヨ")
@PostMapping ("/selectUpdateReportingWork/{reportingWorkId}")
public Result SelectUpdateReportingWork(@PathVariable String reportingWorkId) {
- return Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
+ return Result.success(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));
+ return Result.success(reportingWorkService.updateReportingWork(reportingWork,reviewState));
}
@ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectReportingWorks.search")
- @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
+ @SaCheckPermission("selectReportingWorks.search")
+ @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectDate}/{orderId}")
public Result selectReportingWork(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable String orderId,
@RequestBody ReportingWork reportingWork){
- return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));
+ return Result.success(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectDate,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));
+ @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.success(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
}
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
- @SaCheckPermission("QualityInspectionReview.search")
- @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
+ @SaCheckPermission("qualityInspectionReview.search")
+ @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectDate}/{state}/{processId}")
public Result selectQualityTesting(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable Integer state,
@PathVariable String processId,
@RequestBody ReportingWork reportingWork){
- return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectTime1,selectTime2,state,processId,reportingWork));
+ return Result.success(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectDate,state,processId,reportingWork));
}
+ @ApiOperation("APP璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @SaCheckPermission("qualityInspectionReview.search")
+ @PostMapping ("qualityReviewSearch")
+ public Result qualityReviewSearch(){
+ return Result.success(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)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
@@ -128,7 +140,79 @@
@PathVariable String processId,
@PathVariable String thisProcess,
@RequestBody ReportingWork reportingWork){
- return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
+ return Result.success(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
}
+
+ @ApiOperation("琛ョ墖鐘舵�佹煡璇�")
+ @PostMapping ("/getPatchCondition/{reportingWorkId}")
+ public Result getPatchCondition(
+ @PathVariable String reportingWorkId) {
+ return Result.success(reportingWorkService.getPatchConditionSv(reportingWorkId));
+ }
+
+ @ApiOperation("mes鎶ュ伐鎺ュ彛")
+ @PostMapping ("/mesReportingWork")
+ public Result mesReportingWork(@RequestBody Map<String,Object> reportingWork){
+ Boolean aBoolean = reportingWorkService.mesReportingWorkSv(reportingWork);
+ if(aBoolean){
+ return Result.success(aBoolean);
+ }else{
+ throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
+ }
+ }
+ @ApiOperation("mes鎶ュ伐鎺ュ彛娴嬭瘯")
+ @PostMapping ("/mesReportingWork1")
+ public Result mesReportingWork1(@RequestBody Map<String,Object> reportingWork) throws JsonProcessingException {
+ return reportingWorkService.mesReportingWorkSv1(reportingWork);
+// if(aBoolean){
+// return Result.success(aBoolean);
+// }else{
+// throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
+// }
+ }
+
+ @ApiOperation("mes鎶ュ伐娆＄牬鏂板")
+ @PostMapping ("/mesSaveReportingWorkWorn")
+ public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork) {
+ return Result.success(reportingWorkService.SaveReportingWorkSv(reportingWork));
+ }
+
+ @ApiOperation("鎶ュ伐杞Щ")
+ @PostMapping ("/reportingWorkTransfer")
+ public Result reportingWorkTransfer(@RequestBody Map<String,String> reportingWork) {
+ return Result.success(reportingWorkService.reportingWorkTransferSv(reportingWork));
+ }
+
+ @ApiOperation("鎵嬫満鏌ヨ褰撶彮浜ч噺")
+ @PostMapping ("/selectShiftQuantity")
+ public Result selectShiftQuantity(@RequestBody Map<String,Object> reportingWork) {
+ return Result.success(reportingWorkService.selectShiftQuantitySv(reportingWork));
+ }
+
+ @ApiOperation("鎵嬫満鏌ヨ鏈彮缁勬姤宸ヨ褰�")
+ @PostMapping("/selectReportingWorkRecordByPhone")
+ public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam) {
+ return Result.success(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
+ }
+
+@ApiOperation("鎵嬫満鏌ヨ鏈伐搴忚澶�")
+ @PostMapping("/selectEquipmentByProcess/{process}")
+ public Result selectEquipmentByProcess(@PathVariable String process) {
+ return Result.success(reportingWorkService.selectEquipmentByProcessSv(process));
+ }@ApiOperation("鎶ュ伐鍏ュ簱鎺ュ彛")
+ @PostMapping("/saveWorkStorage")
+ public Result saveWorkStorage( @RequestBody Map<String,Object> object){
+ return Result.success(reportingWorkService.saveWorkStorage(object));
+
+ }
+
+ @ApiOperation("Mes鎶ュ伐鍩虹鏁版嵁")
+ @PostMapping ("/mesBasicData")
+ public Result mesBasicData() {
+ return Result.success(reportingWorkService.mesBasicDataSv());
+ }
+
}
+
+
--
Gitblit v1.8.0