From 706ebb998c15478872f034cb96786c33ca1ed6a4 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 12 五月 2025 19:57:21 +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 | 22 +++++++++++++++++-----
1 files changed, 17 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 ebc712e..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
@@ -1,14 +1,15 @@
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,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,4 +52,12 @@
return list;
}
+ @RequiresPermissions("ApsPlatOrderPlanManager:planDate:edit")
+ @PutMapping("/planDate")
+ public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
+ {
+ iapPlateOrderPlanManagerService.updatePlanDate(apsPlateOrderPlanDate);
+ return AjaxResult.success();
+ }
+
}
--
Gitblit v1.9.3