From b864a88a6d34cbed2cfaad7f5e843ea1330c9c91 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 七月 2024 10:31:33 +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 | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 1338259..0820141 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
@@ -58,14 +58,22 @@
return Result.seccess(replenishService.updateReplenish(object));
}
- @ApiOperation("娴佺▼鍗¤ˉ鐗囨墦鍗版煡璇㈡帴鍙�")
- @PostMapping("/selectReplenishPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
- public Result selectReplenishPrintFlowCard(
+ @ApiOperation("琛ョ墖娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("PrintFlowCard.search")
+ @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
+ public Result selectPrint(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
- @PathVariable String orderId,
- @PathVariable String project,
@RequestBody FlowCard flowCard) {
- return Result.seccess(replenishService.selectReplenishPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
+ return Result.seccess(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));
+
+ }
+
+ @ApiOperation("琛ョ墖鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel/{type}")
+ public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,object));
+
}
}
--
Gitblit v1.8.0