系统接口权限整理，修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java

@@ -82,7 +82,7 @@ public class OptimizePlanController {
 
     @PutMapping("/updateCuttingStatus")
     @Operation(summary = "修改开料状态")
-    @PreAuthorize("@ss.hasPermission('placeorder:optimize:updateCuttingStatus')")
+    @PreAuthorize("@ss.hasAnyPermissions('placeorder:optimize:updateCuttingStatus','placeorder:optimize:cutting-materials')")
     public CommonResult<Boolean> updateCuttingStatus(@RequestBody CuttingStatusRespVO respVO) {
         optimizePlanService.updateCuttingStatus(respVO);
         return success(Boolean.TRUE);
@@ -92,7 +92,7 @@ public class OptimizePlanController {
 
     @GetMapping("/getOrderSource")
     @Operation(summary = "获取生产单源数据")
-    @PreAuthorize("@ss.hasPermission('placeorder:optimize')")
+    @PreAuthorize("@ss.hasAnyPermissions('placeorder:optimize','production:manager-list:calculate','manage:order-plan:process-scheme')")
     public CommonResult<OrderSource> getOrderSource(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId,
                                                     @Schema(description = "排单id") @RequestParam(required = false) Long planId,
                                                     @Schema(description = "机台Id")  @RequestParam(required = false) Long machineId
@@ -125,7 +125,7 @@ public class OptimizePlanController {
 
     @PostMapping("/saveProcessSchemeResults")
     @Operation(summary = "保存方案组的优化信息")
-    @PreAuthorize("@ss.hasPermission('placeorder:optimize')")
+    @PreAuthorize("@ss.hasAnyPermissions('placeorder:optimize','manage:order-plan:process-scheme')")
     public CommonResult<Boolean> saveProcessSchemeResults(@RequestBody SaveProcessSchemeReqVO saveProcessSchemeReqVO) {
 
         optimizePlanService.saveProcessSchemeResults(saveProcessSchemeReqVO);
@@ -139,7 +139,7 @@ public class OptimizePlanController {
     @GetMapping("/getProcessSchemeConfig")
     @Operation(summary = "查询加工方案组对应的配置信息")
     @Parameter(name = "planId", description = "排单ID", required = true)
-    @PreAuthorize("@ss.hasPermission('placeorder:optimize')")
+    @PreAuthorize("@ss.hasPermission('manage:order-plan:process-scheme')")
     public CommonResult<PlanProcessSchemeList> getProcessSchemeConfig(@Schema(description = "方案组ID") @NotNull(message = "方案组的ID不能为空")  Long processId,
                                                                       @Schema(description = "排单id") @RequestParam Long planId) {
 
@@ -167,7 +167,7 @@ public class OptimizePlanController {
     @GetMapping("/getPlateModel")
     @Operation(summary = "查询当前生产单的板材造型信息")
     @Parameter(name = "orderId", description = "生产单Id", required = true)
-    @PreAuthorize("@ss.hasPermission('manage:pack:query')")
+//    @PreAuthorize("@ss.hasAnyPermissions('manage:pack:query','manage:pack:pre-pack')")
     public CommonResult<List<OrderModelDO>> getPlateModel (@Valid @RequestParam("orderId") Long orderId) {
 
         return success(optimizePlanService.getPlateModel(orderId));
@@ -177,7 +177,7 @@ public class OptimizePlanController {
 
     @GetMapping("/getPlanPlateData")
     @Operation(summary = "未排单获取板材的所有数据")
-    @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
+//    @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')")
     public CommonResult<OrderSource> getNoPlanPlateData (@Valid NoPlanFilterPlateReqVO reqVO) {
 
         return success(optimizePlanService.getNoPlanPlateData(reqVO));

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java

@@ -42,7 +42,7 @@ public class PlanController {
 
     @PostMapping("/create")
     @Operation(summary = "创建排单")
-    @PreAuthorize("@ss.hasPermission('placeorder:create')")
+//    @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')")
     public CommonResult<Boolean> createPlan(@Validated(CreateGroup.class) @RequestBody PlanSaveReqVO createReqVO) {
         planService.createPlan(createReqVO);
         return success(Boolean.TRUE);
@@ -50,7 +50,7 @@ public class PlanController {
 
     @PutMapping("/update")
     @Operation(summary = "更新排单")
-    @PreAuthorize("@ss.hasPermission('placeorder:update')")
+    @PreAuthorize("@ss.hasAnyPermissions('placeorder:update','manage:order-plan:insert-plate','manage:order-plan:remove-plate')")
     public CommonResult<Boolean> updatePlan(@Validated(UpdateGroup.class) @RequestBody PlanSaveReqVO updateReqVO) {
         planService.updatePlan(updateReqVO);
         return success(true);
@@ -84,14 +84,14 @@ public class PlanController {
 
     @GetMapping("getOrderByPlan")
     @Operation(summary = "根据排单获取生产单分页")
-    @PreAuthorize("@ss.hasPermission('placeorder:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('placeorder:query','placeorder:priority')")
     public CommonResult<PageResult<OrderRespVO>> getOrderByPlanId(@Valid PlanOrderPageReqVO pageReqVO) {
         return success(planService.getOrderByPlanId(pageReqVO));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得排单分页")
-    @PreAuthorize("@ss.hasPermission('placeorder:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('placeorder:query','placeorder:priority')")
     public CommonResult<PageResult<PlanRespVO>> getPlanPage(@Valid PlanPageReqVO pageReqVO) {
         PageResult<PlanRespVO> pageResult = planService.getPlanPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PlanRespVO.class));
@@ -189,7 +189,7 @@ public class PlanController {
     @PostMapping("getPlanGoodsList")
     @Operation(summary = "未排单混单获取分类的排单信息")
     @OperateLog(enable = false)
-    @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')")
+//    @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')")
     public CommonResult<List<PlanActualGoodsResp>> getPlanGoodsList(@Valid @RequestBody SavePlanPlateList savePlanPlateList) {
 
         return success(planService.getPlanGoodsList(savePlanPlateList));

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java

@@ -90,7 +90,7 @@ public class PlateController {
 
     @GetMapping("/getPlatePage")
     @Operation(summary = "获取未排单的生产单板件")
-    @PreAuthorize("@ss.hasAnyPermissions('unplannedOrders:query','placeorder:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('manage:un-order-plan:insert-plate','manage:order-plan:insert-plate')")
     public CommonResult<PageResult<PlateResList>> getPlatePage(@Valid NoPlanPlatePageReqVO reqVO) {
 
         return success(plateService.getOrderPlatePage(reqVO));