From 7097f55c291cc62ab29d9f52caef80f605247e40 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 22:01:59 +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 | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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..f878ca4 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
@@ -1,14 +1,14 @@
package com.aps.core.controller.mainPlan;
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;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -28,7 +28,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝
*/
- @RequiresPermissions("ApsPlatOrderPlanManager:list")
+// @RequiresPermissions("ApsPlatOrderPlanManager:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
{
@@ -37,4 +37,22 @@
return getDataTable(list);
}
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
+ */
+// @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
+ @GetMapping("/requirement/list")
+ public List<ApsPlateStandardRequire> list(String workOrderNo)
+ {
+ List<ApsPlateStandardRequire> list = iapPlateOrderPlanManagerService.selectApsPlanStandardRequire(workOrderNo);
+ return list;
+ }
+
+ @PutMapping("/planDate")
+ public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
+ {
+ iapPlateOrderPlanManagerService.updatePlanDate(apsPlateOrderPlanDate);
+ return AjaxResult.success();
+ }
+
}
--
Gitblit v1.9.3