From 2b49c5d247ca32b5aaa47e50749f8b17efa3f408 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 八月 2024 14:42:39 +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/ReplenishController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index 0820141..a248dda 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -70,10 +70,18 @@
}
@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(replenishService.getSelectPrintCustomLabelSv(type,object));
+ return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
}
+
+// @ApiOperation("琛ョ墖鍒犻櫎鎺ュ彛")
+// @SaCheckPermission("SelectReplenish.review")
+// @PostMapping("/deleteReplenish")
+// public Result deleteReplenish( @RequestBody Map<String,Object> object){
+// return Result.seccess(replenishService.deleteReplenishSv(object));
+// }
}
--
Gitblit v1.8.0