From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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 | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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 e9d2fba..c6729a2 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
@@ -103,13 +103,25 @@
}
//鍒嗘灦鏂板鏄庣粏鏌ヨ
- @ApiOperation("鍒嗘灦鏄庣粏鏂板鎺ュ彛")
+ @ApiOperation("鍒嗘灦鏂板鏄庣粏鏌ヨ")
@PostMapping("/selectNoCard/{orderId}/{productionId}")
public Result SelectNoCard(
@PathVariable String orderId,
@PathVariable String productionId,
@RequestBody FlowCard flowCard) {
return Result.seccess(flowCardService.selectNoCardSv(orderId, productionId, flowCard));
+
+ }
+
+ @ApiOperation("鍒嗘灦鏂板鏄庣粏鎺掑簭鏌ヨ")
+ @PostMapping("/selectSortingCard/{orderId}/{productionId}/{flashback}/{optionVal}")
+ public Result selectSortingCard(
+ @PathVariable String orderId,
+ @PathVariable String productionId,
+ @PathVariable String flashback,
+ @PathVariable String optionVal,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));
}
@@ -428,16 +440,17 @@
}
@ApiOperation("淇敼宸ヨ壓娴佺▼")
- @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+ @PostMapping("/updateProcess/{processId}/{orderNumber}/{technologyNumber}/{orderId}/{process}")
public Result updateProcess(
@PathVariable String processId,
+ @PathVariable String orderNumber,
@PathVariable String technologyNumber,
@PathVariable String orderId,
@PathVariable String process,
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+ return Result.seccess(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
}
@ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
@@ -480,4 +493,25 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, FlowCardDTO.class, flowCardService.exportDateProcessSv(dates), "DateProcess");
}
+
+ @ApiOperation("淇敼鐢熶骇缁堟鏁伴噺")
+ @PostMapping("/updateTermination/{processId}/{orderNumber}/{value}")
+ public Result updateTermination(
+ @PathVariable String processId,
+ @PathVariable Integer orderNumber,
+ @PathVariable Integer value
+ ) {
+
+ return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,value));
+ }
+
+ @ApiOperation("鏌ヨ鐢ㄤ簬淇敼鐢熶骇缁堟鏁伴噺鐨勫畬宸ユ暟閲�")
+ @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")
+ public Result selectCompleted(
+ @PathVariable String processId,
+ @PathVariable Integer orderNumber,
+ @PathVariable String process) {
+ return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,process));
+
+ }
}
--
Gitblit v1.8.0