From 69a25cd577d5639f2869bcf80f498b373e80137e Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期三, 17 十二月 2025 10:43:44 +0800
Subject: [PATCH] 修改旋转逻辑，增加辅助旋转功能

---
 north-glass-erp/src/main/java/com/example/erp/controller/AppController.java |   74 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 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..38f1f81 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,19 +1,25 @@
 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.pp.ReportingWorkService;
 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;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/app")
@@ -22,6 +28,10 @@
 public class AppController {
     private final OrderService orderService;
     private final DeliveryService deliveryService;
+    private final MaterialInventoryService materialInventoryService;
+    private final FinishedGoodsInventoryService finishedGoodsInventoryService;
+    private final ReportService reportService;
+    private final ReportingWorkService reportingWorkService;
 
     @ApiOperation("璁㈠崟鎶ヨ〃")
     @PostMapping("/getOrderList")
@@ -34,4 +44,60 @@
     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")
+    @SaCheckPermission("createProductStock.search")
+    public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
+        return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
+    }
+
+    @ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
+    @PostMapping("/addSelectWarehousing")
+    @SaCheckPermission("createProductStock.add")
+    public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
+        return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));
+
+    }
+
+    @ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectDeliveryDetailList")
+    @SaCheckPermission("finishedProductOut.search")
+    public Result getSelectDeliveryDetailList(){
+        return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetailApp());
+    }
+
+    @ApiOperation("鎴愬搧鍑哄簱鎺ュ彛")
+    @PostMapping("/addDeliveryDetail")
+    @SaCheckPermission("finishedProductOut.add")
+    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
+        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
+    }
+
+    @ApiOperation("app澶氫釜娴佺▼鍗℃姤宸�")
+    @PostMapping("/addWorkInProgress")
+    @SaCheckPermission("addReportingWork.add")
+    public Result addWorkInProgress(@RequestBody Map<String,Object> object){
+        return reportingWorkService.addWorkInProgress(object);
+    }
 }

--
Gitblit v1.8.0