From ce06fcc3113dc45647910deef0e4adeaa97bfa3f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 15 十月 2025 13:32:40 +0800
Subject: [PATCH] 语言修改
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 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 046fd12..bdee6f6 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
@@ -33,10 +33,18 @@
private UserService userService;
//宸ョ▼淇℃伅
@ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
- @PostMapping ("/projectInfo/{projectNo}")
+ @PostMapping ("/projectInfo/{projectNo}/{username}")
public Result projectInfo(
- @PathVariable String projectNo){
- return Result.seccess(glassOptimizeService.projectInfoSv(projectNo));
+ @PathVariable String projectNo,@PathVariable String username){
+ return Result.seccess(glassOptimizeService.projectInfoSv(projectNo,username));
+ }
+
+
+ // 浼樺寲淇℃伅浼犲叆
+ @ApiOperation("浼樺寲浼犲叆淇℃伅鎺ュ彛")
+ @PostMapping ("/optimizeInfo/{projectNo}/{username}")
+ public Result optimizeInfo(@PathVariable String projectNo,@PathVariable String username){
+ return Result.seccess(glassOptimizeService.optimizeInfoSv(projectNo,username));
}
//宸ョ▼淇℃伅娴佺▼鍗�
@@ -53,8 +61,8 @@
public Result materialStore(
@PathVariable String thickness,
@PathVariable String model,@PathVariable String projectNumber,
- @RequestParam(name = "type", required = false) Integer type ){
- return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type));
+ @RequestParam(name = "type", required = false) Integer type,@RequestParam(name = "username", required = false) String username ){
+ return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
}
@@ -83,6 +91,16 @@
return Result.seccess(glassOptimizeService.getProjectListSv());
}
+ @ApiOperation("鏍规嵁宸ョ▼鍗″彿宸ョ▼鏌ヨ娴佺▼鍗�")
+ @PostMapping ("/getProjectByProjectNo/{projectNo}")
+ public Result getProjectByProjectNo(
+ @PathVariable String projectNo
+ ){
+ return Result.seccess(glassOptimizeService.getProjectByProjectNoSv(projectNo));
+ }
+
+
+
//宸ョ▼绠＄悊鏌ヨ
@ApiOperation("宸ョ▼绠＄悊鏌ヨ鎺ュ彛")
@PostMapping("/optimizeProjectMange/{startSelectTime}/{endSelectTime}")
@@ -101,7 +119,7 @@
@PathVariable Integer state,
@PathVariable Integer states,
@PathVariable Integer code
- ) {
+ ) throws JsonProcessingException {
if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
return Result.seccess();
} else {
@@ -156,6 +174,7 @@
@ApiOperation("妯℃嫙璁＄畻淇濆瓨")
@PostMapping("/simulationSave")
public Result simulationSave(@RequestBody Map<String, Object> object) {
+ System.out.println("鎺ユ敹鍒扮殑妯℃嫙璁＄畻淇濆瓨鏁版嵁: " + object);
try {
return Result.seccess(glassOptimizeService.addSimulation(object));
} catch (Exception e) {
@@ -236,12 +255,39 @@
return Result.seccess(glassOptimizeService.saveOptimizeResult(object,projectId));
}
+ @ApiOperation("鏌ヨ鎶ュ憡鏁版嵁鎺ュ彛")
+ @PostMapping("/getReportData/{processId}")
+ public Result getReportData(@PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getReportDataSv(processId));
+ }
+
+ @ApiOperation("鏌ヨ鐗╂枡淇℃伅鎺ュ彛")
+ @PostMapping("/materialInfo/{processId}")
+ public Result materialInfo(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getMaterialInfoSv(processId));
+ }
+
+
+ @ApiOperation("鏌ヨ浜у搧鍒楄〃鎺ュ彛")
+ @PostMapping("/getProductList/{processId}")
+ public Result getProductList(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getProductListSv(processId));
+ }
@ApiOperation("鏌ヨ浼樺寲缁撴灉鎺ュ彛")
@PostMapping("/selectOptimizeResult/{processId}")
public Result selectOptimizeResult(
@PathVariable String processId){
return Result.seccess(glassOptimizeService.selectOptimizeResult(processId));
+ }
+
+ @ApiOperation("鏌ヨ浼樺寲缁撴灉淇℃伅鎺ュ彛")
+ @PostMapping("/getOptimizeInfo/{processId}")
+ public Result getOptimizeInfo(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getOptimizeInfoSv(processId));
}
@ApiOperation("鏇存柊浼樺寲缁撴灉鎺ュ彛")
@@ -271,15 +317,15 @@
return new ResponseEntity<>(optContent.getBytes(), headers, HttpStatus.OK);
}
- @PostMapping("/getConfiguration/{type}")
- public Result getConfiguration(@PathVariable String type) {
- return Result.seccess(glassOptimizeService.getConfiguration(type));
+ @PostMapping("/getConfiguration/{type}/{username}")
+ public Result getConfiguration(@PathVariable String type,@PathVariable String username) {
+ return Result.seccess(glassOptimizeService.getConfiguration(type,username));
}
@ApiOperation("淇墖纾ㄩ噺淇敼")
- @PostMapping("/saveConfiguration/{type}")
- public Result saveConfiguration(@PathVariable String type, @RequestBody Map<String,Object> object){
- return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
+ @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));
}
@ApiOperation("妯℃嫙鎺掔増")
@@ -356,7 +402,11 @@
return Result.seccess(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
}
-
+ @ApiOperation("mes宸ョ▼浠诲姟涓嬪彂鎺ュ彛")
+ @PostMapping("/getIssuingProjects")
+ public Result issuingProjects(@RequestBody String projectNo) throws JsonProcessingException {
+ return Result.seccess(glassOptimizeService.issuingProjects(projectNo));
+ }
--
Gitblit v1.8.0