From 8b7d4b9527b9e196df4b9ac7cf113f06798f7941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 15 八月 2024 15:01:00 +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 |   69 +++++++++++++++++++++++++++-------
 1 files changed, 55 insertions(+), 14 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 5680d66..84a7bf1 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
@@ -157,36 +157,40 @@
 
     @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
     @SaCheckPermission("SelectPrintFlowCard.search")
-    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
     public Result selectPrintFlowCard(
             @PathVariable Date selectTime1,
             @PathVariable Date selectTime2,
             @PathVariable String orderId,
             @PathVariable String project,
+            @PathVariable String userId,
             @RequestBody FlowCard flowCard) {
-        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
+        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
     }
 
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
     @SaCheckPermission("PrintFlowCard.search")
-    @PostMapping("/selectPrint/{orderId}")
+    @PostMapping("/selectPrint/{inquiryMode}")
     public Result selectPrint(
-            @PathVariable String orderId,
-            @RequestBody FlowCard flowCard) {
-        return Result.seccess(flowCardService.selectPrintSv(orderId, flowCard));
+            @PathVariable String inquiryMode,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));
 
     }
 
     @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
-    @PostMapping("/getSelectPrinting")
-    public Result getSelectPrinting(@RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintingSv(object));
+    @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
+    public Result getSelectPrinting(
+            @PathVariable String printMerge,
+            @PathVariable String printLike,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
     }
 
     @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
-    @PostMapping("/getSelectPrintLabel/{projectNo}")
-    public Result getSelectPrintLabel(@PathVariable String projectNo) {
-        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
+    @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
+    public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
+        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
     }
 
     @ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
@@ -215,11 +219,12 @@
     }
 
     @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
-    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
+    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
     public Result printFlowCardDetails(@PathVariable String processId,
                                        @PathVariable String technologyNumber,
+                                       @PathVariable String process,
                                        @RequestBody FlowCard flowCard) {
-        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber, flowCard));
+        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
     }
 
     @ApiOperation("淇濆瓨鎵撳嵃鎺掑簭鎺ュ彛")
@@ -280,4 +285,40 @@
 
         }
     }
+
+    @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}")
+    public Result getSelectPrintingRefund(
+            @PathVariable String printMerge,
+            @PathVariable String printLike,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike));
+    }
+
+    @ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrinRework/{printMerge}/{printLike}")
+    public Result getSelectPrinRework(
+            @PathVariable String printMerge,
+            @PathVariable String printLike,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
+    }
+
+    @ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
+    @PostMapping("/selectPrintDetails/{inquiryMode}")
+    public Result selectPrintDetails(
+            @PathVariable String inquiryMode,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
+
+    }
+
+    @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜缂栧彿鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectPrintCustomLabelDetails/{type}/{lableType}")
+    public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
+                                             @PathVariable Integer lableType,
+                                             @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
+
+    }
 }

--
Gitblit v1.8.0