Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-09 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6

 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,7 +29,7 @@
    /**
     * 查询钣金工单计划
     */
//    @RequiresPermissions("ApsPlatOrderPlanManager:list")
    @RequiresPermissions("ApsPlatOrderPlanManager:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
    {
@@ -40,7 +41,7 @@
    /**
     * 查询钣金工单需求
     */
//    @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
    @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
    @GetMapping("/requirement/list")
    public List<ApsPlateStandardRequire> list(String workOrderNo)
    {
@@ -48,4 +49,12 @@
        return list;
    }

    @RequiresPermissions("ApsPlatOrderPlanManager:planDate:edit")
    @PutMapping("/planDate")
    public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
    {
        iapPlateOrderPlanManagerService.updatePlanDate(apsPlateOrderPlanDate);
        return AjaxResult.success();
    }

}