From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 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
new file mode 100644
index 0000000..039cc6c
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
@@ -0,0 +1,90 @@
+package com.example.erp.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.example.erp.common.Result;
+import com.example.erp.dto.pp.WorkInProgressDTO;
+import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
+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.*;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/app")
+@RequiredArgsConstructor
+@Api(value="App涓撳睘鎺ュ彛",tags={"App涓撳睘鎺ュ彛"})
+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")
+ 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());
+ }
+
+
+ @ApiOperation("鎴愬搧搴撳瓨鎶ヨ〃")
+ @PostMapping("/getFinishedGoodsInventoryList")
+ public Result getFinishedGoodsInventoryList() {
+ return Result.success(finishedGoodsInventoryService.appFinishedGoodsInventoryList());
+ }
+
+ @ApiOperation("鍗婃垚鍝佸簱瀛樻姤琛�")
+ @PostMapping("/getWorkInProgress/{selectProcesses}")
+ public Result getworkInProgress(@PathVariable String selectProcesses,WorkInProgressDTO workInProgressDTO) {
+ return Result.success(reportService.workInProgressSv(1, 999999999, "", "", selectProcesses,"","", workInProgressDTO));
+
+ }
+
+ @ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectWarehousingList")
+ public Result getSelectWarehousingList(@RequestBody String processId){
+ return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(processId));
+ }
+
+ @ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
+ @PostMapping("/addSelectWarehousing")
+ public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
+ return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));
+
+ }
+
+ @ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectDeliveryDetailList")
+ public Result getSelectDeliveryDetailList(){
+ return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetailApp());
+ }
+
+ @ApiOperation("鎴愬搧鍑哄簱鎺ュ彛")
+ @PostMapping("/addDeliveryDetail")
+ public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
+ return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
+ }
+}
--
Gitblit v1.8.0