From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 11:40:54 +0800
Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
index 094c478..e16b755 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
@@ -107,7 +107,7 @@
/**
* 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
*/
-// @RequiresPermissions("ApsPlateStandardRequire:ApsPlateStandardRequire:supplyGapList")
+ //@RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
@GetMapping("/supplyGapList")
public TableDataInfo selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire)
{
@@ -115,4 +115,26 @@
List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
return getDataTable(list);
}
+
+ @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapListExport")
+ @Log(title = "閽ｉ噾渚涘簲缂哄彛鎶ヨ〃瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/supplyGapListExport")
+ public void supplyGapListExport(HttpServletResponse response, ApsPlateStandardRequire apsPlateStandardRequire)
+ {
+ List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
+ ExcelUtil<ApsPlateStandardRequire> util = new ExcelUtil<ApsPlateStandardRequire>(ApsPlateStandardRequire.class);
+ util.exportExcel(response, list, "閽ｉ噾渚涘簲缂哄彛鎶ヨ〃鏁版嵁");
+ }
+
+
+ /**
+ * 鐢熸垚閽ｉ噾璁″垝
+ * */
+ @PostMapping("/generatorPlan")
+ public AjaxResult generatorPlan()
+ {
+ apsPlateStandardRequireService.generatorPlan();
+ return success();
+ }
+
}
--
Gitblit v1.9.3