Merge remote-tracking branch 'origin/master'

于杰

2025-11-04 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d

 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.FinishedGoodsInventoryService;
import com.example.erp.service.mm.MaterialInventoryService;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.service.sd.OrderService;
@@ -24,6 +25,7 @@
    private final OrderService orderService;
    private final DeliveryService deliveryService;
    private final MaterialInventoryService materialInventoryService;
    private final FinishedGoodsInventoryService finishedGoodsInventoryService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
@@ -42,4 +44,11 @@
    public Result getOriginalGlassList() {
        return Result.success(materialInventoryService.appGetStockList());
    }


    @ApiOperation("成品库存报表")
    @PostMapping("/getFinishedGoodsInventoryList")
    public Result getFinishedGoodsInventoryList() {
        return Result.success(finishedGoodsInventoryService.appFinishedGoodsInventoryList());
    }
}