From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 4ff5367..ad33db2 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
@@ -92,8 +92,8 @@
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));
@@ -292,14 +292,16 @@
@ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
@SaCheckPermission("workInProgress.search")
- @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{selectProcesses}/{optionVal}")
+ @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, selectProcesses,optionVal, workInProgressDTO));
+ return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
}
}
--
Gitblit v1.8.0