From 748e47eb02e874e521500b24f5444d6dbaeda3b8 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 25 十二月 2025 11:46:04 +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/ReplenishController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 a9a1d17..04dfd7c 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
@@ -68,12 +68,11 @@
@ApiOperation("琛ョ墖娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@SaCheckPermission("printReplenishFlowCard.search")
- @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
+ @PostMapping("/selectPrint/{selectDate}")
public Result selectPrint(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.success(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));
+ return Result.success(replenishService.selectPrintSv(selectDate, flowCard));
}
@@ -108,4 +107,13 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, exportReplenishDTO.class, replenishService.exportReplenishSv(dates), "PatchLogAddDTO");
}
+
+ @ApiOperation("淇敼鎵撳嵃娆℃暟")
+ @PostMapping("/updatePrintNum")
+ public Result updatePrintNum(
+ @RequestBody List<Map<String, Object>> object
+ ) {
+
+ return Result.success(replenishService.updatePrintNumSv(object));
+ }
}
--
Gitblit v1.8.0