From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index c4c586a..45bb793 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -39,7 +39,7 @@
@PostMapping ("/projectInfo/{projectNo}/{username}")
public Result projectInfo(
@PathVariable String projectNo,@PathVariable String username){
- return Result.seccess(glassOptimizeService.projectInfoSv(projectNo,username));
+ return Result.success(glassOptimizeService.projectInfoSv(projectNo,username));
}
@@ -47,7 +47,7 @@
@ApiOperation("浼樺寲浼犲叆淇℃伅鎺ュ彛")
@PostMapping ("/optimizeInfo/{projectNo}/{username}")
public Result optimizeInfo(@PathVariable String projectNo,@PathVariable String username){
- return Result.seccess(glassOptimizeService.optimizeInfoSv(projectNo,username));
+ return Result.success(glassOptimizeService.optimizeInfoSv(projectNo,username));
}
//宸ョ▼淇℃伅娴佺▼鍗�
@@ -55,7 +55,7 @@
@PostMapping ("/getProcessCard/{projectNo}")
public Result getProcessCard(
@PathVariable String projectNo){
- return Result.seccess(glassOptimizeService.getProcessCardSv(projectNo));
+ return Result.success(glassOptimizeService.getProcessCardSv(projectNo));
}
//搴撳瓨淇℃伅
@@ -65,7 +65,7 @@
@PathVariable String thickness,
@PathVariable String model,@PathVariable String projectNumber,
@RequestParam(name = "type", required = false) Integer type,@RequestParam(name = "username", required = false) String username ){
- return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
+ return Result.success(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
}
@@ -75,7 +75,7 @@
public Result getFlowCardList(
@PathVariable String optionVal,
@PathVariable Integer radio){
- return Result.seccess(glassOptimizeService.getFlowCardList(optionVal,radio));
+ return Result.success(glassOptimizeService.getFlowCardList(optionVal,radio));
}
//宸ョ▼鏌ヨ娴佺▼鍗�
@@ -84,14 +84,14 @@
public Result getUpdateFlowCardList(
@PathVariable String type,@PathVariable String thickness,
@PathVariable Integer radio,@PathVariable String projectNo){
- return Result.seccess(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
+ return Result.success(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
}
//宸ョ▼鏌ヨ娴佺▼鍗�
@ApiOperation("宸ョ▼鏌ヨ娴佺▼鍗�")
@PostMapping ("/getProjectList")
public Result getProjectList(){
- return Result.seccess(glassOptimizeService.getProjectListSv());
+ return Result.success(glassOptimizeService.getProjectListSv());
}
@ApiOperation("鏍规嵁宸ョ▼鍗″彿宸ョ▼鏌ヨ娴佺▼鍗�")
@@ -99,7 +99,7 @@
public Result getProjectByProjectNo(
@PathVariable String projectNo
){
- return Result.seccess(glassOptimizeService.getProjectByProjectNoSv(projectNo));
+ return Result.success(glassOptimizeService.getProjectByProjectNoSv(projectNo));
}
@@ -111,7 +111,7 @@
@PathVariable Date startSelectTime,
@PathVariable Date endSelectTime,
@RequestBody OptimizeProjectMange optimizeProjectMange) {
- return Result.seccess(glassOptimizeService.OptimizeProjectMange(startSelectTime,endSelectTime,optimizeProjectMange));
+ return Result.success(glassOptimizeService.OptimizeProjectMange(startSelectTime,endSelectTime,optimizeProjectMange));
}
//淇敼宸ョ▼鐘舵��
@@ -124,7 +124,7 @@
@PathVariable Integer code
) throws JsonProcessingException {
if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
- return Result.seccess();
+ return Result.success();
} else {
throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
@@ -136,7 +136,7 @@
@PostMapping("/deleteProject/{projectNumber}")
public Result deleteProject(
@PathVariable String projectNumber){
- return Result.seccess(glassOptimizeService.deleteProject(projectNumber,1));
+ return Result.success(glassOptimizeService.deleteProject(projectNumber,1));
}
//妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
@@ -144,7 +144,7 @@
@PostMapping ("/selectProjectCompute/{projectNumber}")
public Result selectProjectCompute(
@PathVariable String projectNumber){
- return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
+ return Result.success(glassOptimizeService.selectProjectComputeSv(projectNumber));
}
//妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
@@ -152,7 +152,7 @@
@PostMapping ("/selectProjectComputeAll/{projectNumber}")
public Result selectProjectComputeAll(
@PathVariable String projectNumber){
- return Result.seccess(glassOptimizeService.selectProjectComputeAll(projectNumber));
+ return Result.success(glassOptimizeService.selectProjectComputeAll(projectNumber));
}
//妯℃嫙璁＄畻娴佺▼鍗¤鎯�
@@ -160,14 +160,14 @@
@PostMapping ("/selectComputeDetail/{processId}/{technologyNumber}/{patchState}")
public Result selectComputeDetail(
@PathVariable String processId, @PathVariable Integer technologyNumber,@PathVariable String patchState){
- return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
+ return Result.success(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
}
@ApiOperation("妯℃嫙璁＄畻")
@PostMapping("/simulationCalculate")
public Result simulationCalculate(@RequestBody Map<String, Object> object) {
try {
- return Result.seccess(glassOptimizeService.SimulationCalculation(object));
+ return Result.success(glassOptimizeService.SimulationCalculation(object));
} catch (Exception e) {
e.printStackTrace();
return Result.error();
@@ -179,7 +179,7 @@
public Result simulationSave(@RequestBody Map<String, Object> object) {
System.out.println("鎺ユ敹鍒扮殑妯℃嫙璁＄畻淇濆瓨鏁版嵁: " + object);
try {
- return Result.seccess(glassOptimizeService.addSimulation(object));
+ return Result.success(glassOptimizeService.addSimulation(object));
} catch (Exception e) {
e.printStackTrace();
return Result.error();
@@ -190,7 +190,7 @@
@PostMapping("/optimizeParms/{username}")
public Result optimizeParmsSave(@RequestBody Map<String, Object> object,@PathVariable String username) {
try {
- return Result.seccess(glassOptimizeService.optimizeParmsSave(object,username));
+ return Result.success(glassOptimizeService.optimizeParmsSave(object,username));
} catch (Exception e) {
e.printStackTrace();
return Result.error();
@@ -200,7 +200,7 @@
@PostMapping("/selectOptimizeParms/{username}")
public Result getOptimizeParms(@PathVariable String username) {
- return Result.seccess(userService.getOptimizeParms(username));
+ return Result.success(userService.getOptimizeParms(username));
}
@@ -209,7 +209,7 @@
@PostMapping("/selectComputeDetailmore")
public Result selectComputeDetailmore(@RequestBody Map<String, Object> object) {
try {
- return Result.seccess(glassOptimizeService.SimulationCalculation(object));
+ return Result.success(glassOptimizeService.SimulationCalculation(object));
} catch (Exception e) {
e.printStackTrace();
return Result.error();
@@ -226,19 +226,19 @@
public Result getProcessCardDetail(
@PathVariable String processId,
@PathVariable Integer technologyNumber){
- return Result.seccess(glassOptimizeService.getProcessCardDetailSv(processId,technologyNumber));
+ return Result.success(glassOptimizeService.getProcessCardDetailSv(processId,technologyNumber));
}
@ApiOperation("鑶滅郴鏌ヨ")
@PostMapping ("/selectGlassType")
public Result selectGlassType(){
- return Result.seccess(glassOptimizeService.selectGlassTypeSv());
+ return Result.success(glassOptimizeService.selectGlassTypeSv());
}
@ApiOperation("鏈�鏂板伐绋嬪彿鏌ヨ")
@PostMapping ("/getProjectId")
public Result getProjectId(){
- return Result.seccess(glassOptimizeService.getProjectIdSv());
+ return Result.success(glassOptimizeService.getProjectIdSv());
}
@ApiOperation("鍒涘缓宸ョ▼鎺ュ彛")
@PostMapping("/addProject/{optionVal}/{projectId}/{projectNmae}")
@@ -247,7 +247,7 @@
@PathVariable String projectId,
@PathVariable String projectNmae,
@RequestBody Map<String,Object> object){
- return Result.seccess(glassOptimizeService.addProjectSv(optionVal,projectId,projectNmae,object));
+ return Result.success(glassOptimizeService.addProjectSv(optionVal,projectId,projectNmae,object));
}
@@ -255,20 +255,20 @@
@PostMapping("/saveOptimizeData/{projectId}")
public Result saveOptimizeResult( @PathVariable String projectId,
@RequestBody Map<String,Object> object){
- return Result.seccess(glassOptimizeService.saveOptimizeResult(object,projectId));
+ return Result.success(glassOptimizeService.saveOptimizeResult(object,projectId));
}
@ApiOperation("鏌ヨ鎶ュ憡鏁版嵁鎺ュ彛")
@PostMapping("/getReportData/{processId}")
public Result getReportData(@PathVariable String processId){
- return Result.seccess(glassOptimizeService.getReportDataSv(processId));
+ return Result.success(glassOptimizeService.getReportDataSv(processId));
}
@ApiOperation("鏌ヨ鐗╂枡淇℃伅鎺ュ彛")
@PostMapping("/materialInfo/{processId}")
public Result materialInfo(
@PathVariable String processId){
- return Result.seccess(glassOptimizeService.getMaterialInfoSv(processId));
+ return Result.success(glassOptimizeService.getMaterialInfoSv(processId));
}
@@ -276,21 +276,21 @@
@PostMapping("/getProductList/{processId}")
public Result getProductList(
@PathVariable String processId){
- return Result.seccess(glassOptimizeService.getProductListSv(processId));
+ return Result.success(glassOptimizeService.getProductListSv(processId));
}
@ApiOperation("鏌ヨ浼樺寲缁撴灉鎺ュ彛")
@PostMapping("/selectOptimizeResult/{processId}")
public Result selectOptimizeResult(
@PathVariable String processId){
- return Result.seccess(glassOptimizeService.selectOptimizeResult(processId));
+ return Result.success(glassOptimizeService.selectOptimizeResult(processId));
}
@ApiOperation("鏌ヨ浼樺寲缁撴灉淇℃伅鎺ュ彛")
@PostMapping("/getOptimizeInfo/{processId}")
public Result getOptimizeInfo(
@PathVariable String processId){
- return Result.seccess(glassOptimizeService.getOptimizeInfoSv(processId));
+ return Result.success(glassOptimizeService.getOptimizeInfoSv(processId));
}
@ApiOperation("鏇存柊浼樺寲缁撴灉鎺ュ彛")
@@ -298,7 +298,7 @@
public Result updateOptimizeResult(
@PathVariable String processId,@RequestBody Map<String,Object> object){
- return Result.seccess(glassOptimizeService.updateOptimizeResult(object,processId));
+ return Result.success(glassOptimizeService.updateOptimizeResult(object,processId));
}
@ApiOperation("OPT鏂囦欢涓嬭浇鎺ュ彛")
@PostMapping("/generateOpt")
@@ -322,19 +322,19 @@
@PostMapping("/getConfiguration/{type}/{username}")
public Result getConfiguration(@PathVariable String type,@PathVariable String username) {
- return Result.seccess(glassOptimizeService.getConfiguration(type,username));
+ return Result.success(glassOptimizeService.getConfiguration(type,username));
}
@ApiOperation("淇墖纾ㄩ噺淇敼")
@PostMapping("/saveConfiguration/{type}/{username}")
public Result saveConfiguration(@PathVariable String type,@PathVariable String username, @RequestBody Map<String,Object> object){
- return Result.seccess(glassOptimizeService.saveConfiguration(object,type,username));
+ return Result.success(glassOptimizeService.saveConfiguration(object,type,username));
}
@ApiOperation("妯℃嫙鎺掔増")
@PostMapping("/simulatedTypesetting")
public Result simulatedTypesetting(@RequestBody Map<String, Object> object) {
- return Result.seccess(glassOptimizeService.simulatedTypesetting1(object));
+ return Result.success(glassOptimizeService.simulatedTypesetting1(object));
}
@@ -425,7 +425,7 @@
@ApiOperation("妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�")
@PostMapping ("/selectProjectComputeMpThirdParty/{projectNumber}")
public Result selectProjectComputeMpThirdParty( @PathVariable String projectNumber){
- return Result.seccess(glassOptimizeService.selectProjectComputeMpThirdParty(projectNumber));
+ return Result.success(glassOptimizeService.selectProjectComputeMpThirdParty(projectNumber));
}
//妯℃嫙璁＄畻娴佺▼鍗¤鎯呯涓夋柟
@@ -433,14 +433,14 @@
@PostMapping ("/selectComputeDetailThirdParty/{processId}/{technologyNumber}")
public Result selectComputeDetailThirdParty(
@PathVariable String processId, @PathVariable Integer technologyNumber){
- return Result.seccess(glassOptimizeService.selectComputeDetailThirdParty(processId,technologyNumber));
+ return Result.success(glassOptimizeService.selectComputeDetailThirdParty(processId,technologyNumber));
}
@ApiOperation("妯℃嫙璁＄畻淇濆瓨")
@PostMapping("/simulationSaveThirdParty")
public Result simulationSaveThirdParty(@RequestBody Map<String, Object> object) {
try {
- return Result.seccess(glassOptimizeService.simulationSaveThirdParty(object));
+ return Result.success(glassOptimizeService.simulationSaveThirdParty(object));
} catch (Exception e) {
e.printStackTrace();
return Result.error();
@@ -452,21 +452,21 @@
@PostMapping("/deleteProjectThirdParty/{projectNumber}")
public Result deleteProjectThirdParty(
@PathVariable String projectNumber){
- return Result.seccess(glassOptimizeService.deleteProjectThirdParty(projectNumber));
+ return Result.success(glassOptimizeService.deleteProjectThirdParty(projectNumber));
}
@ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
@PostMapping ("/projectInfoThirdParty/{projectNo}")
public Result projectInfoThirdParty(
@PathVariable String projectNo){
- return Result.seccess(glassOptimizeService.projectInfoThirdParty(projectNo));
+ return Result.success(glassOptimizeService.projectInfoThirdParty(projectNo));
}
//搴撳瓨淇℃伅
@ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
@GetMapping ("/materialStoreSvThirdParty/{projectNumber}")
public Result materialStoreSvThirdParty(@PathVariable String projectNumber ){
- return Result.seccess(glassOptimizeService.materialStoreSvThirdParty(projectNumber));
+ return Result.success(glassOptimizeService.materialStoreSvThirdParty(projectNumber));
}
//宸ョ▼淇℃伅娴佺▼鍗�
@@ -474,13 +474,13 @@
@PostMapping ("/getProcessCardMpThirdParty/{projectNo}")
public Result getProcessCardMpThirdParty(
@PathVariable String projectNo){
- return Result.seccess(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
+ return Result.success(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
}
@ApiOperation("mes宸ョ▼浠诲姟涓嬪彂鎺ュ彛")
@PostMapping("/getIssuingProjects")
public Result issuingProjects(@RequestBody String projectNo) throws JsonProcessingException {
- return Result.seccess(glassOptimizeService.issuingProjects(projectNo));
+ return Result.success(glassOptimizeService.issuingProjects(projectNo));
}
--
Gitblit v1.8.0