From 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 12 五月 2025 18:29:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
index f878ca4..2a85042 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
@@ -3,6 +3,7 @@
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanDate;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateStandardRequire;
@@ -28,19 +29,22 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝
*/
-// @RequiresPermissions("ApsPlatOrderPlanManager:list")
+ @RequiresPermissions("ApsPlatOrderPlanManager:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
{
startPage();
List<ApsPlateOrderPlanManager> list = iapPlateOrderPlanManagerService.selectApsPlanOrderManager(apsPlateOrderPlanManager);
+ list.stream().forEach(item -> {
+ item.setRequireNum(iapPlateOrderPlanManagerService.selectApsPlanStandardRequire(item.getWorkOrderNo()).size());
+ });
return getDataTable(list);
}
/**
* 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
*/
-// @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
+ @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
@GetMapping("/requirement/list")
public List<ApsPlateStandardRequire> list(String workOrderNo)
{
@@ -48,6 +52,7 @@
return list;
}
+ @RequiresPermissions("ApsPlatOrderPlanManager:planDate:edit")
@PutMapping("/planDate")
public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
{
--
Gitblit v1.9.3