From a12834e87a110fbf1414e24eb574f2e87b29e03c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 09:10:01 +0800
Subject: [PATCH] 提交装箱打印添加批次
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 81 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 7e412ec..6d2c01e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -1,31 +1,22 @@
package com.example.erp.controller.pp;
import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.pp.*;
-import com.example.erp.entity.pp.DamageDetails;
-import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Report;
-import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
-import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportService;
-import com.example.erp.service.pp.WorkOrderService;
import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.sql.Date;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ExecutionException;
@RestController
@Api(value = "鐢熶骇鎶ヨ〃controller", tags = {"鐢熶骇鎶ヨ〃鎿嶄綔鎺ュ彛"})
@@ -39,14 +30,18 @@
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
- @SaCheckPermission("processCardProgress.search")
@PostMapping("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
return Result.seccess(reportService.processCardProgressSv(orderId, columns));
}
+ @ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
+ @SaCheckPermission("selectOrder.search")
+ @PostMapping("/processCardProgressCollect/{orderId}")
+ public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+ return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
+ }
@ApiOperation("璺ㄥ伐搴忔鐮�")
- @SaCheckPermission("crossProcessBreaking.search")
@PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
public Result getOrderReport(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@@ -57,7 +52,6 @@
}
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
- @SaCheckPermission("workInProgress.search")
@PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgress(
@PathVariable Integer pageNum,
@@ -72,7 +66,6 @@
}
@ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
- @SaCheckPermission("processToBeCompleted.search")
@PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result selectProcessToBeCompleted(
@PathVariable Date selectTime1,
@@ -86,20 +79,18 @@
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
- @SaCheckPermission("damageReport.search")
@PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
public Result damageReport(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
@RequestBody DamageReportDTO damageReportDTO) {
return Result.seccess(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
}
@ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
- @SaCheckPermission("splittingDetailsOutside.search")
@PostMapping("/splittingDetailsOutside/{orderId}")
public Result splittingDetailsOutside(
@PathVariable String orderId,
@@ -109,7 +100,6 @@
}
@ApiOperation("鍝佽川鎶ヨ〃")
- @SaCheckPermission("qualityReport.search")
@PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
public Result qualityReport(
@PathVariable Date selectTime1,
@@ -120,7 +110,6 @@
}
@ApiOperation("鎴愬搧鐜囨姤琛�")
- @SaCheckPermission("yield.search")
@PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result yield(
@PathVariable Date selectTime1,
@@ -132,23 +121,21 @@
}
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
- @SaCheckPermission("productionSchedule.search")
@PostMapping("/productionSchedule/{orderId}")
public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
return Result.seccess(reportService.productionScheduleSv(orderId, columns));
}
@ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
- @SaCheckPermission("taskCompletionStatus.search")
- @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}")
+ @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}/{orderId}")
public Result taskCompletionStatus(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
+ @PathVariable String orderId,
@RequestBody List<Integer> columns) {
- return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2, columns));
+ return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
}
@ApiOperation("璁㈠崟璁″垝鍒嗚В")
- @SaCheckPermission("orderPlanDecomposition.search")
@PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
public Result orderPlanDecomposition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -157,7 +144,6 @@
}
@ApiOperation("璁㈠崟鎶ュ伐")
- @SaCheckPermission("orderPlanDecomposition.search")
@PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
public Result orderReportingWorks(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -166,7 +152,6 @@
}
@ApiOperation("鍘熺墖棰嗘枡")
- @SaCheckPermission("rawMaterialRequisition.search")
@PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
public Result rawMaterialRequisition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -175,13 +160,12 @@
}
@ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
- @SaCheckPermission("damageReport.search")
@PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result teamOutput(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
@PathVariable String selectProcesses,
@RequestBody TeamOutputDTO teamOutputDTO) {
return Result.seccess(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
@@ -196,7 +180,7 @@
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃瀵煎嚭")
@PostMapping("/exportDamageReport")
- public void exportDamageReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ public void exportDamageReport(HttpServletResponse response, @RequestBody Map<String, Object> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, DamageReportDTO.class, reportService.exportDamageReportSv(dates), "DamageReport");
}
@@ -226,14 +210,23 @@
DownExcel.download(response, WorkInProgressDTO.class, reportService.exportWorkInProgressSv(dates), "WorkInProgress");
}
+ @ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛ㄥ鍑�")
+ @PostMapping("/exportWorkInProgressCombination")
+ public void exportWorkInProgressCombination(HttpServletResponse response,
+ @RequestBody Map<String, Object> dates)
+ throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, WorkInProgressCombinationDTO.class, reportService.exportWorkInProgressCombinationSv(dates), "WorkInProgressCombination");
+ }
+
//
- @ApiOperation("浠诲姟瀹屾垚鎯呭喌瀵煎嚭")
- @PostMapping("/exportTaskCompletionStatus")
- public void exportTaskCompletionStatus(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
- //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
- DownExcel.download(response, TaskCompletionStatusDTO.class, reportService.exportDamageReportSv(dates), "TaskCompletionStatus");
- }
+// @ApiOperation("浠诲姟瀹屾垚鎯呭喌瀵煎嚭")
+// @PostMapping("/exportTaskCompletionStatus")
+// public void exportTaskCompletionStatus(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+// //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+// DownExcel.download(response, TaskCompletionStatusDTO.class, reportService.exportDamageReportSv(dates), "TaskCompletionStatus");
+// }
@ApiOperation("鍘熺墖棰嗘枡瀵煎嚭")
@PostMapping("/exportRawMaterialRequisition")
@@ -288,4 +281,18 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
}
+
+ @ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
+ @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ public Result workInProgressCombination(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @PathVariable String optionVal,
+ @RequestBody WorkInProgressDTO workInProgressDTO) {
+ return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
+
+ }
}
--
Gitblit v1.8.0