From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 39c1b67..6ecc130 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
@@ -2,6 +2,8 @@
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
+import com.example.erp.service.mm.FinishedGoodsInventoryService;
+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;
@@ -22,6 +24,8 @@
public class AppController {
private final OrderService orderService;
private final DeliveryService deliveryService;
+ private final MaterialInventoryService materialInventoryService;
+ private final FinishedGoodsInventoryService finishedGoodsInventoryService;
@ApiOperation("璁㈠崟鎶ヨ〃")
@PostMapping("/getOrderList")
@@ -34,4 +38,17 @@
public Result getDeliveryList(@RequestBody List<String> dates) {
return Result.success(deliveryService.appGetDeliveryList(dates));
}
+
+ @ApiOperation("鍘熺墖搴撳瓨鎶ヨ〃")
+ @PostMapping("/getOriginalGlassList")
+ public Result getOriginalGlassList() {
+ return Result.success(materialInventoryService.appGetStockList());
+ }
+
+
+ @ApiOperation("鎴愬搧搴撳瓨鎶ヨ〃")
+ @PostMapping("/getFinishedGoodsInventoryList")
+ public Result getFinishedGoodsInventoryList() {
+ return Result.success(finishedGoodsInventoryService.appFinishedGoodsInventoryList());
+ }
}
--
Gitblit v1.8.0