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 | 75 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 27 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 0f800d3..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
@@ -9,11 +9,13 @@
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
@@ -37,51 +39,50 @@
@PathVariable String technologyStr,
@PathVariable String process,
@PathVariable String reportType) {
- return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
+ return Result.success(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
}
@ApiOperation("鏌ヨ宸ュ簭")
@PostMapping ("/selectProcess/{userId}")
public Result SelectProcess(@PathVariable String userId) {
- return Result.seccess(reportingWorkService.SelectProcessSv(userId));
+ return Result.success(reportingWorkService.SelectProcessSv(userId));
}
@ApiOperation("鎶ュ伐鏂板")
@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")
@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")
@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}")
+ @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));
}
@@ -95,22 +96,21 @@
@PathVariable String userId
,@PathVariable String userName){
- return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
+ return Result.success(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
}
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
@SaCheckPermission("qualityInspectionReview.search")
- @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
+ @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));
}
@@ -118,7 +118,7 @@
@SaCheckPermission("qualityInspectionReview.search")
@PostMapping ("qualityReviewSearch")
public Result qualityReviewSearch(){
- return Result.seccess(reportingWorkService.qualityReviewSearchSv());
+ return Result.success(reportingWorkService.qualityReviewSearchSv());
}
@ApiOperation("璐ㄦ瀹℃牳瀹℃牳")
@@ -126,7 +126,7 @@
@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,"瀹℃牳澶辫触");
@@ -140,7 +140,7 @@
@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));
}
@@ -148,7 +148,7 @@
@PostMapping ("/getPatchCondition/{reportingWorkId}")
public Result getPatchCondition(
@PathVariable String reportingWorkId) {
- return Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
+ return Result.success(reportingWorkService.getPatchConditionSv(reportingWorkId));
}
@ApiOperation("mes鎶ュ伐鎺ュ彛")
@@ -156,42 +156,63 @@
public Result mesReportingWork(@RequestBody Map<String,Object> reportingWork){
Boolean aBoolean = reportingWorkService.mesReportingWorkSv(reportingWork);
if(aBoolean){
- return Result.seccess(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.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
+ return Result.success(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
@ApiOperation("鎶ュ伐杞Щ")
@PostMapping ("/reportingWorkTransfer")
public Result reportingWorkTransfer(@RequestBody Map<String,String> reportingWork) {
- return Result.seccess(reportingWorkService.reportingWorkTransferSv(reportingWork));
+ return Result.success(reportingWorkService.reportingWorkTransferSv(reportingWork));
}
@ApiOperation("鎵嬫満鏌ヨ褰撶彮浜ч噺")
@PostMapping ("/selectShiftQuantity")
public Result selectShiftQuantity(@RequestBody Map<String,Object> reportingWork) {
- return Result.seccess(reportingWorkService.selectShiftQuantitySv(reportingWork));
+ return Result.success(reportingWorkService.selectShiftQuantitySv(reportingWork));
}
@ApiOperation("鎵嬫満鏌ヨ鏈彮缁勬姤宸ヨ褰�")
@PostMapping("/selectReportingWorkRecordByPhone")
public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam) {
- return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
+ return Result.success(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
}
@ApiOperation("鎵嬫満鏌ヨ鏈伐搴忚澶�")
@PostMapping("/selectEquipmentByProcess/{process}")
public Result selectEquipmentByProcess(@PathVariable String process) {
- return Result.seccess(reportingWorkService.selectEquipmentByProcessSv(process));
+ return Result.success(reportingWorkService.selectEquipmentByProcessSv(process));
}@ApiOperation("鎶ュ伐鍏ュ簱鎺ュ彛")
@PostMapping("/saveWorkStorage")
public Result saveWorkStorage( @RequestBody Map<String,Object> object){
- return Result.seccess(reportingWorkService.saveWorkStorage(object));
+ return Result.success(reportingWorkService.saveWorkStorage(object));
- }}
+ }
+
+ @ApiOperation("Mes鎶ュ伐鍩虹鏁版嵁")
+ @PostMapping ("/mesBasicData")
+ public Result mesBasicData() {
+ return Result.success(reportingWorkService.mesBasicDataSv());
+ }
+
+}
+
+
--
Gitblit v1.8.0