From f692a364cdb559ddadc4f6dac86c25848a1d4f34 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 十一月 2025 16:54:53 +0800
Subject: [PATCH] 修改订单首页流程卡终止状态,以及自定义标签打印

---
 north-glass-erp/src/main/java/com/example/erp/controller/AppController.java |    8 ++++++++
 1 files changed, 8 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..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
@@ -2,6 +2,7 @@
 
 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;
@@ -22,6 +23,7 @@
 public class AppController {
     private final OrderService orderService;
     private final DeliveryService deliveryService;
+    private final MaterialInventoryService materialInventoryService;
 
     @ApiOperation("璁㈠崟鎶ヨ〃")
     @PostMapping("/getOrderList")
@@ -34,4 +36,10 @@
     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