From 5768f15831c623f2fb8a9e2907144aedb8b61fb4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 11 十一月 2025 09:54:08 +0800
Subject: [PATCH] 订单一键完工功能修改
---
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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..11c2a7d 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,17 @@
package com.example.erp.controller;
import com.example.erp.common.Result;
+import com.example.erp.dto.pp.WorkInProgressDTO;
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.pp.ReportService;
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 org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.List;
@@ -22,6 +23,9 @@
public class AppController {
private final OrderService orderService;
private final DeliveryService deliveryService;
+ private final MaterialInventoryService materialInventoryService;
+ private final FinishedGoodsInventoryService finishedGoodsInventoryService;
+ private final ReportService reportService;
@ApiOperation("璁㈠崟鎶ヨ〃")
@PostMapping("/getOrderList")
@@ -34,4 +38,24 @@
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());
+ }
+
+ @ApiOperation("鍗婃垚鍝佸簱瀛樻姤琛�")
+ @PostMapping("/getWorkInProgress/{selectProcesses}")
+ public Result workInProgress(@PathVariable String selectProcesses,WorkInProgressDTO workInProgressDTO) {
+ return Result.success(reportService.workInProgressSv(1, 999999999, "", "", selectProcesses,"","", workInProgressDTO));
+
+ }
}
--
Gitblit v1.8.0