From 9c5c958fed902c674e35ec89382703d37e50e21c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 16:11:11 +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 | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 11c2a7d..039cc6c 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,8 +1,11 @@
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;
@@ -15,6 +18,7 @@
import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("/app")
@@ -54,8 +58,33 @@
@ApiOperation("鍗婃垚鍝佸簱瀛樻姤琛�")
@PostMapping("/getWorkInProgress/{selectProcesses}")
- public Result workInProgress(@PathVariable String selectProcesses,WorkInProgressDTO workInProgressDTO) {
+ 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