From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 15c88f5..ecf474c 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
@@ -348,6 +348,16 @@
return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
}
+ @ApiOperation("鍚堝苟鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintingConsolidated/{printMerge}/{printLike}/{mergeTechnologyNumber}")
+ public Result getSelectPrintingConsolidated(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @PathVariable String mergeTechnologyNumber,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
+ }
+
@ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectPrinRework/{printMerge}/{printLike}")
public Result getSelectPrinRework(
--
Gitblit v1.8.0