From 02430791c250d61bef654f62d76de9dfabe826c7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 20 二月 2025 10:51:05 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   78 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 3ffe382..4e30f01 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -111,9 +111,9 @@
     //娣诲姞娴佺▼鍗�
     @ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
     @SaCheckPermission("addProcessCard.add")
-    @PostMapping("/addFlowCard")
-    public Result AddOrderWork(@RequestBody Map<String, Object> object) {
-        if (flowCardService.addFlowCardSv(object)) {
+    @PostMapping("/addFlowCard/{orderId}")
+    public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
+        if (flowCardService.addFlowCardSv(orderId,object)) {
             return Result.seccess();
         } else {
             throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -181,12 +181,20 @@
     }
 
     @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
-    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
+    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}")
     public Result getSelectPrinting(
             @PathVariable String printMerge,
             @PathVariable String printLike,
+            @PathVariable String merge,
             @RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
+        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge));
+    }
+
+    @ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrintProject/{printProject}/{merge}")
+    public Result getSelectPrintProject(
+            @PathVariable String printProject,@PathVariable String merge) {
+        return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));
     }
 
     @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@@ -207,12 +215,21 @@
         return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
     }
 
-    @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+    @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
     @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
     public Result getSelectPrintCustomLabel( @PathVariable String type,
                                              @PathVariable Integer lableType,
                                              @RequestBody Map<String, Object> object) {
         return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
+
+    }
+
+    @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
+    public Result getSelectPrintCustomLabel2( @PathVariable String type,
+                                             @PathVariable Integer lableType,
+                                             @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
 
     }
 
@@ -376,12 +393,57 @@
 
     }
     @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
-    @PostMapping("/getPrintCustomDataProjectNoDetail/{type}")
+    @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
     public Result getPrintCustomDataProjectNoDetail(
             @PathVariable String type,
+            @PathVariable Integer detailType,
             @RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,object));
+        return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
 
     }
 
+    @ApiOperation("淇敼宸ヨ壓娴佺▼")
+    @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+    public Result updateProcess(
+            @PathVariable String processId,
+            @PathVariable String technologyNumber,
+            @PathVariable String orderId,
+            @PathVariable String process,
+            @RequestBody Map<String, Object> object
+    ) {
+
+        return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+    }
+
+    @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+    @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
+    public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
+        return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
+    }
+
+    @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+    @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
+    public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
+        return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
+    }
+
+    @ApiOperation("娴佺▼鍗″悎鏋�")
+    @PostMapping("/flowCardDetail")
+    public Result flowCardDetail(
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.flowCardDetail(object));
+    }
+
+    @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+    @PostMapping("/updateProcessCardRack")
+    public Result updateProcessCardRack(
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.updateProcessCardRack(object));
+    }
+
+    @ApiOperation("鏅鸿兘鍒嗘灦")
+    @PostMapping("/processCardAutoRack")
+    public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.processCardAutoRack(object));
+    }
 }

--
Gitblit v1.8.0