From 46019dd16a231e3b9338c6c62e0cce961751f801 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期五, 11 四月 2025 08:59:21 +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/ApsPlatePlanController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
index 27b6162..308fb5e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
@@ -12,6 +12,7 @@
import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlanTemp;
import com.aps.core.service.IApsPlatePlanService;
+import com.aps.core.service.IApsPlatePlanTempService;
import com.aps.system.api.domain.SysDictData;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,8 @@
public class ApsPlatePlanController extends BaseController {
@Autowired
private IApsPlatePlanService apsPlatePlanService;
-
+ @Autowired
+ private IApsPlatePlanTempService apsPlatePlanTempService;
/**
* 鏌ヨ閽ｉ噾璁″垝绠＄悊鍒楄〃
*/
@@ -61,7 +63,7 @@
/**
* 瀵煎嚭閽ｉ噾璁″垝绠＄悊鍒楄〃
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:export")
+// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:export")
@Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
@@ -102,7 +104,7 @@
/**
* 鑾峰彇閽ｉ噾璁″垝绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:query")
+// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(apsPlatePlanService.selectApsPlatePlanById(id));
@@ -111,7 +113,7 @@
/**
* 鏂板閽ｉ噾璁″垝绠＄悊
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:add")
+// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:add")
@Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsPlatePlan apsPlatePlan) {
@@ -121,7 +123,7 @@
/**
* 淇敼閽ｉ噾璁″垝绠＄悊
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:edit")
+// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:edit")
@Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsPlatePlan apsPlatePlan) {
@@ -131,7 +133,7 @@
/**
* 鍒犻櫎閽ｉ噾璁″垝绠＄悊
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:remove")
+// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:remove")
@Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
@@ -165,4 +167,13 @@
public AjaxResult confirmPart(ApsPlatePlanTemp planTemp) {
return toAjax(apsPlatePlanService.confirmPlan(planTemp));
}
+ /**
+ * 鏌ヨ閽ｉ噾璁″垝涓存椂琛ㄥ垪琛�
+ */
+ @GetMapping("/queryTempPlan")
+ public TableDataInfo list(ApsPlatePlanTemp apsPlatePlanTemp)
+ {
+ List<ApsPlatePlanTemp> list = apsPlatePlanTempService.selectApsPlatePlanTempList(apsPlatePlanTemp);
+ return getDataTable(list);
+ }
}
--
Gitblit v1.9.3