From aa7bcbc678a671a51a87c7ba6bbfaa107399a96d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 08 四月 2025 14:28:16 +0800
Subject: [PATCH] 添加优化原片出库报表，除去时间相关筛选
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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 ae654c3..b14eb64 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
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -28,14 +29,13 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
@SaCheckPermission("selectProcessCard.search")
- @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
public Result dateProcess(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
+ return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
}
@@ -159,15 +159,16 @@
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
@SaCheckPermission("selectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
+ @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@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, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -243,6 +244,15 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
+ @ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/revokeComposing")
+ public Result revokeComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.revokeComposingSv(object));
+ }
@ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
public Result printFlowCardDetails(@PathVariable String processId,
@@ -426,4 +436,24 @@
public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
}
+
+ @ApiOperation("娴佺▼鍗″悎鏋�")
+ @PostMapping("/flowCardDetail")
+ public Result flowCardDetail(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.flowCardDetail(object));
+ }
+
+ @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+ @PostMapping("/updateProcessCardRack")
+ public Result updateProcessCardRack(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.updateProcessCardRack(object));
+ }
+
+ @ApiOperation("鏅鸿兘鍒嗘灦")
+ @PostMapping("/processCardAutoRack")
+ public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.processCardAutoRack(object));
+ }
}
--
Gitblit v1.8.0