From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +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/ReworkController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
index 5d5851d..fe4574d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -60,7 +60,7 @@
}
@ApiOperation("杩斿伐娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("printFlowCard.search")
+ @SaCheckPermission("printReworkFlowCard.search")
@PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
public Result selectPrint(
@PathVariable Date selectTime1,
@@ -76,4 +76,13 @@
public Result deleteRework( @RequestBody Map<String,Object> object){
return Result.seccess(reworkService.deleteReworkSv(object));
}
+
+ @ApiOperation("杩斿伐鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectReworkPrintCustomLabel/{type}/{lableType}")
+ public Result getSelectReworkPrintCustomLabel( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));
+
+ }
}
--
Gitblit v1.8.0