From 457e468312c247ef078b2db7de336baf8cc398d5 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 17:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 1d1fa17..e6bc32c 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
@@ -4,6 +4,7 @@
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,7 +29,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝
*/
- @RequiresPermissions("ApsPlatOrderPlanManager:list")
+// @RequiresPermissions("ApsPlatOrderPlanManager:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
{
@@ -37,4 +38,15 @@
return getDataTable(list);
}
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
+ */
+// @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
+ @GetMapping("/requirement/list")
+ public List<ApsPlateStandardRequire> list(String workOrderNo)
+ {
+ List<ApsPlateStandardRequire> list = iapPlateOrderPlanManagerService.selectApsPlanStandardRequire(workOrderNo);
+ return list;
+ }
+
}
--
Gitblit v1.9.3