From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
index e95a98b..f23e5b7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
@@ -1,16 +1,45 @@
package com.example.erp.controller;
import com.example.erp.common.Result;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.service.mm.MaterialInventoryService;
+import com.example.erp.service.sd.DeliveryService;
+import com.example.erp.service.sd.OrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDate;
+import java.util.List;
+
@RestController
@RequestMapping("/app")
+@RequiredArgsConstructor
+@Api(value="App涓撳睘鎺ュ彛",tags={"App涓撳睘鎺ュ彛"})
public class AppController {
+ private final OrderService orderService;
+ private final DeliveryService deliveryService;
+ private final MaterialInventoryService materialInventoryService;
+ @ApiOperation("璁㈠崟鎶ヨ〃")
@PostMapping("/getOrderList")
- public Result getOrderList() {
- return null;
+ public Result getOrderList(@RequestBody List<String> dates) {
+ return Result.success(orderService.appGetOrderList(dates));
+ }
+
+ @ApiOperation("鍙戣揣鎶ヨ〃")
+ @PostMapping("/getDeliveryList")
+ public Result getDeliveryList(@RequestBody List<String> dates) {
+ return Result.success(deliveryService.appGetDeliveryList(dates));
+ }
+
+ @ApiOperation("鍘熺墖搴撳瓨鎶ヨ〃")
+ @PostMapping("/getOriginalGlassList")
+ public Result getOriginalGlassList() {
+ return Result.success(materialInventoryService.appGetStockList());
}
}
--
Gitblit v1.8.0