From 3067d24d5f5d20b5c69e626169227a07e1bf1f49 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 23 四月 2025 09:46:29 +0800
Subject: [PATCH] 提交 app质检审核查询部分代码

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 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 6d839ca..2119f78 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
@@ -49,11 +49,12 @@
 
     //搴撳瓨淇℃伅
     @ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
-    @PostMapping  ("/materialStore/{thickness}/{model}")
+    @GetMapping  ("/materialStore/{thickness}/{model}/{projectNumber}")
     public Result materialStore(
             @PathVariable  String thickness,
-            @PathVariable  String model ){
-        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model));
+            @PathVariable  String model,@PathVariable  String projectNumber,
+            @RequestParam(name = "type", required = false) Integer type ){
+        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type));
     }
 
 
@@ -64,6 +65,15 @@
             @PathVariable String optionVal,
             @PathVariable Integer radio){
         return Result.seccess(glassOptimizeService.getFlowCardList(optionVal,radio));
+    }
+
+    //宸ョ▼鏌ヨ娴佺▼鍗�
+    @ApiOperation("淇敼宸ョ▼鏌ヨ娴佺▼鍗℃帴鍙�")
+    @PostMapping  ("/getUpdateFlowCardList/{type}/{thickness}/{radio}/{projectNo}")
+    public Result getUpdateFlowCardList(
+            @PathVariable String type,@PathVariable String thickness,
+            @PathVariable Integer radio,@PathVariable String projectNo){
+        return Result.seccess(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
     }
 
     //宸ョ▼鏌ヨ娴佺▼鍗�
@@ -85,12 +95,13 @@
 
     //淇敼宸ョ▼鐘舵��
     @ApiOperation("淇敼宸ョ▼鐘舵�佹帴鍙�")
-    @PostMapping("/updateProjectState/{projectNumber}/{state}")
+    @PostMapping("/updateProjectState/{projectNumber}/{state}/{code}")
     public Result updateProjectState(
             @PathVariable String projectNumber,
-            @PathVariable Integer state
+            @PathVariable Integer state,
+            @PathVariable Integer code
     ) {
-        if (glassOptimizeService.updateProjectState(projectNumber, state)) {
+        if (glassOptimizeService.updateProjectState(projectNumber, state,code)) {
             return Result.seccess();
         } else {
             throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
@@ -103,7 +114,7 @@
     @PostMapping("/deleteProject/{projectNumber}")
     public Result deleteProject(
             @PathVariable String projectNumber){
-        return Result.seccess(glassOptimizeService.deleteProject(projectNumber));
+        return Result.seccess(glassOptimizeService.deleteProject(projectNumber,1));
     }
 
     //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
@@ -114,12 +125,20 @@
         return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
     }
 
+    //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+    @ApiOperation("妯℃嫙璁＄畻宸ョ▼鏁版嵁鏌ヨ")
+    @PostMapping  ("/selectProjectComputeAll/{projectNumber}")
+    public Result selectProjectComputeAll(
+            @PathVariable String projectNumber){
+        return Result.seccess(glassOptimizeService.selectProjectComputeAll(projectNumber));
+    }
+
     //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
     @ApiOperation("妯℃嫙璁＄畻娴佺▼鍗¤鎯�")
-    @PostMapping  ("/selectComputeDetail/{processId}")
+    @PostMapping  ("/selectComputeDetail/{processId}/{technologyNumber}/{patchState}")
     public Result selectComputeDetail(
-            @PathVariable String processId){
-        return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId));
+            @PathVariable String processId, @PathVariable Integer technologyNumber,@PathVariable String patchState){
+        return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
     }
 
     @ApiOperation("妯℃嫙璁＄畻")
@@ -251,6 +270,16 @@
         return new ResponseEntity<>(optContent.getBytes(), headers, HttpStatus.OK);
     }
 
+    @PostMapping("/getConfiguration/{type}")
+    public Result getConfiguration(@PathVariable String type) {
+        return Result.seccess(glassOptimizeService.getConfiguration(type));
+    }
+
+    @ApiOperation("淇墖纾ㄩ噺淇敼")
+    @PostMapping("/saveConfiguration/{type}")
+    public Result saveConfiguration(@PathVariable String type, @RequestBody Map<String,Object>  object){
+        return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
+    }
 
 
 

--
Gitblit v1.8.0