From cbf1307dfd22fd494ff119bf958c53d67a056bb9 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 七月 2024 09:51:14 +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/ProcessCardController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 61f61c4..6c3b015 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
@@ -196,10 +196,11 @@
}
@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(flowCardService.getSelectPrintCustomLabelSv(type,object));
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
}
@@ -251,4 +252,14 @@
@PathVariable Date selectTime2) {
return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
}
+
+ @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
+ @PostMapping("/updatePrintState/{printState}")
+ public Result updatePrintState(
+ @PathVariable Integer printState,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
+ }
}
--
Gitblit v1.8.0