From dffdcaa14f32c51a63b4ab2cc7a38eebf17f8f44 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 七月 2024 15:58:34 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   76 +++++++++++++++++++++++++++++++++-----
 1 files changed, 66 insertions(+), 10 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 8038379..8096b83 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
@@ -169,18 +169,21 @@
 
     @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("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@@ -189,11 +192,18 @@
         return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
     }
 
+    @ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectPrintLabel1")
+    public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
+    }
+
     @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
-    @PostMapping("/getSelectPrintCustomLabel/{type}")
+    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
     public Result getSelectPrintCustomLabel( @PathVariable String type,
+                                             @PathVariable Integer lableType,
                                              @RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,object));
+        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
 
     }
 
@@ -207,7 +217,7 @@
         return Result.seccess(flowCardService.updateComposingSv(object));
     }
 
-    @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹煡璇㈡帴鍙�")
+    @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
     @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
     public Result printFlowCardDetails(@PathVariable String processId,
                                        @PathVariable String technologyNumber,
@@ -245,4 +255,50 @@
             @PathVariable Date selectTime2) {
         return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
     }
+
+    @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
+    @PostMapping("/updatePrintState/{printState}")
+    public Result updatePrintState(
+            @PathVariable Integer printState,
+            @RequestBody Map<String, Object> object
+    ) {
+
+        return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
+    }
+
+    @ApiOperation("娴佺▼鍗℃墦鍗拌鍗曟暟鎹帓搴忔煡璇㈡帴鍙�")
+    @PostMapping("/printFlowCardOrderSort/{orderId}")
+    public Result printFlowCardOrderSort(@PathVariable String orderId,
+                                       @RequestBody FlowCard flowCard) {
+        return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
+    }
+
+    @ApiOperation("淇濆瓨鎵撳嵃璁㈠崟鎺掑簭鎺ュ彛")
+    @PostMapping("/printOrderSort")
+    public Result printOrderSort(@RequestBody Map<String, Object> object) {
+        if (flowCardService.printOrderSort(object)) {
+            return Result.seccess();
+        } else {
+            throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+        }
+    }
+
+    @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));
+    }
 }

--
Gitblit v1.8.0