From a6db13c4867c99dabf20aed8a91e5ccd9ffa0b90 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 13 二月 2025 15:08:35 +0800
Subject: [PATCH] 修改mes切割报工
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 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 3ffe382..83a5cc9 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
@@ -111,9 +111,9 @@
//娣诲姞娴佺▼鍗�
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
@SaCheckPermission("addProcessCard.add")
- @PostMapping("/addFlowCard")
- public Result AddOrderWork(@RequestBody Map<String, Object> object) {
- if (flowCardService.addFlowCardSv(object)) {
+ @PostMapping("/addFlowCard/{orderId}")
+ public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
+ if (flowCardService.addFlowCardSv(orderId,object)) {
return Result.seccess();
} else {
throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -189,6 +189,13 @@
return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
}
+ @ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintProject/{printProject}")
+ public Result getSelectPrintProject(
+ @PathVariable String printProject) {
+ return Result.seccess(flowCardService.getSelectPrintProject(printProject));
+ }
+
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
@@ -207,12 +214,21 @@
return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
}
- @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
@PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
public Result getSelectPrintCustomLabel( @PathVariable String type,
@PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel2( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
}
@@ -376,12 +392,37 @@
}
@ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
- @PostMapping("/getPrintCustomDataProjectNoDetail/{type}")
+ @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
public Result getPrintCustomDataProjectNoDetail(
@PathVariable String type,
+ @PathVariable Integer detailType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,object));
+ return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
}
+ @ApiOperation("淇敼宸ヨ壓娴佺▼")
+ @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+ public Result updateProcess(
+ @PathVariable String processId,
+ @PathVariable String technologyNumber,
+ @PathVariable String orderId,
+ @PathVariable String process,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
+ public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
+ return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
+ public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
+ return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
+ }
}
--
Gitblit v1.8.0