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 |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 6087bd5..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,10 +169,11 @@
 
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
     @SaCheckPermission("PrintFlowCard.search")
-    @PostMapping("/selectPrint")
+    @PostMapping("/selectPrint/{inquiryMode}")
     public Result selectPrint(
+            @PathVariable String inquiryMode,
             @RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.selectPrintSv(object));
+        return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));
 
     }
 
@@ -283,7 +284,7 @@
         }
     }
 
-    @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囪繑宸ユ暟鎹煡璇㈡帴鍙�")
+    @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
     @PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}")
     public Result getSelectPrintingRefund(
             @PathVariable String printMerge,
@@ -291,4 +292,13 @@
             @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