From 2a243dc744898018adf7523dcb2d10ded968b432 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 十二月 2025 10:43:25 +0800
Subject: [PATCH] 流程卡进度打印功能
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 04cea68..11ec07b 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
@@ -8,6 +8,7 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.FlowCardService;
import com.example.erp.tools.DownExcel;
+import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -425,11 +427,19 @@
@ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏌ヨ")
@PostMapping("/selectPrintProjectDetails/{projectNo}")
- public Result selectPrintProjectDetails(
- @PathVariable String projectNo) {
+ public Result selectPrintProjectDetails( @PathVariable String projectNo) {
return Result.success(flowCardService.getPrintProjectDetails(projectNo));
}
+
+ @ApiOperation("宸ョ▼鏄庣粏灏忕墖鎵撳嵃鏌ヨ")
+ @PostMapping("/selectPrintProjectDetailSmallPiece")
+ public Result selectPrintProjectDetailSmallPiece(
+ @RequestBody Map<String, Object> object) throws JsonProcessingException {
+ return Result.success(flowCardService.selectPrintProjectDetailSmallPiece(object));
+
+ }
+
@ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
@PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
public Result getPrintCustomDataProjectNoDetail(
@@ -438,6 +448,15 @@
@RequestBody Map<String, Object> object) {
return Result.success(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
+ }
+
+ @ApiOperation("鑾峰彇鏈�鎶ュ伐鏂板伐搴�")
+ @PostMapping("/getNewProcess/{processId}/{orderNumber}/{technologyNumber}/{orderProcess}")
+ public Result getNewProcess(@PathVariable String processId,
+ @PathVariable String orderNumber,
+ @PathVariable String technologyNumber,
+ @PathVariable List<String> orderProcess){
+ return Result.success(flowCardService.getNewProcessSv(processId,orderNumber,technologyNumber,orderProcess));
}
@ApiOperation("淇敼宸ヨ壓娴佺▼")
@@ -530,4 +549,10 @@
public Result selectProcessCardProgress(@RequestBody Map<String, String> object) {
return flowCardService.selectProcessCardProgressSv(object);
}
+
+ @ApiOperation("娴佺▼鍗¤繘搴︽墦鍗�")
+ @PostMapping("/PrintProgressProcessCard/{selectDate}")
+ public Result PrintProgressProcessCard(@PathVariable List<String> selectDate, @RequestBody List<String> columns) {
+ return Result.success(flowCardService.PrintProgressProcessCardSv(selectDate, columns));
+ }
}
--
Gitblit v1.8.0