From de1933ae9e11a9975cdfb8d03cc718da21eba860 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 13 五月 2024 10:34:56 +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/ReportController.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 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 ac84714..9be9808 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
@@ -72,4 +72,72 @@
}
+ @ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
+ @PostMapping("/damageReport/{selectTime1}/{selectTime2}")
+ public Result damageReport(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.selectDamageReportSv(selectTime1,selectTime2,report));
+
+ }
+ @ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
+ @PostMapping("/splittingDetailsOutside/{orderId}")
+ public Result splittingDetailsOutside(
+ @PathVariable String orderId,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.splittingDetailsOutsideSv(orderId,report));
+
+ }
+
+ @ApiOperation("鍝佽川鎶ヨ〃")
+ @PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
+ public Result qualityReport(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.qualityReportSv(selectTime1,selectTime2,report));
+
+ }
+
+ @ApiOperation("鎴愬搧鐜囨姤琛�")
+ @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
+ public Result yield(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.yieldSv(selectTime1,selectTime2,selectProcesses,report));
+
+ }
+
+ @ApiOperation("鐢熶骇鍙戣揣杩涘害")
+ @PostMapping ("/productionSchedule/{orderId}")
+ public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns){
+ return Result.seccess(reportService.productionScheduleSv(orderId,columns));
+ }
+
+ @ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
+ @PostMapping ("/taskCompletionStatus/{selectTime1}/{selectTime2}")
+ public Result taskCompletionStatus(@PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody List<Integer> columns){
+ return Result.seccess(reportService.taskCompletionStatusSv(selectTime1,selectTime2,columns));
+ }
+
+ @ApiOperation("璁㈠崟璁″垝鍒嗚В")
+ @PostMapping ("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
+ public Result orderPlanDecomposition(@PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report){
+ return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1,selectTime2,report));
+ }
+
+ @ApiOperation("鍘熺墖棰嗘枡")
+ @PostMapping ("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
+ public Result rawMaterialRequisition(@PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report){
+ return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1,selectTime2,report));
+ }
}
--
Gitblit v1.8.0