From 7c30e26f3cc97ebcbb2cf86e2026b10f2e23994d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:26 +0800
Subject: [PATCH] 流程卡添加订单类型、补片流程卡调整样式，工序待完成报表添加厚度
---
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 039cc6c..cb889b9 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
@@ -9,6 +9,7 @@
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;
@@ -30,6 +31,7 @@
private final MaterialInventoryService materialInventoryService;
private final FinishedGoodsInventoryService finishedGoodsInventoryService;
private final ReportService reportService;
+ private final ReportingWorkService reportingWorkService;
@ApiOperation("璁㈠崟鎶ヨ〃")
@PostMapping("/getOrderList")
@@ -65,8 +67,8 @@
@ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
@PostMapping("/getSelectWarehousingList")
- public Result getSelectWarehousingList(@RequestBody String processId){
- return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(processId));
+ public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
+ return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
}
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
@@ -87,4 +89,11 @@
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