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 | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 c6729a2..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
@@ -47,12 +47,11 @@
//鍒嗘灦鏌ヨ
@ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
@SaCheckPermission("selectAddProcess.search")
- @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")
+ @PostMapping("/selectAddProcess/{selectDate}")
public Result selectAddProcess(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectAddProcess(selectTime1, selectTime2, flowCard));
+ return Result.seccess(flowCardService.selectAddProcess(selectDate, flowCard));
}
//鍒嗘灦鏄庣粏鏌ヨ
@@ -176,16 +175,15 @@
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
@SaCheckPermission("selectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
+ @PostMapping("/selectPrintFlowCard/{selectDate}/{orderId}/{project}/{userId}/{state}")
public Result selectPrintFlowCard(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable String orderId,
@PathVariable String project,
@PathVariable String userId,
@PathVariable Integer state,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -306,11 +304,10 @@
@ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
@SaCheckPermission("selectPrintFlowCard.search")
- @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
+ @PostMapping("/selectPrintPrintProject/{selectDate}")
public Result selectPrintFlowCard(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2) {
- return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
+ @PathVariable List<String> selectDate) {
+ return Result.seccess(flowCardService.selectPrintFlowCard(selectDate));
}
@ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
@@ -351,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