系统配置，未排单，权限标识更改，优化生产锁单逻辑更改

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

@@ -139,7 +139,7 @@ public class OptimizePlanController {
     @GetMapping("/getProcessSchemeConfig")
     @Operation(summary = "查询加工方案组对应的配置信息")
     @Parameter(name = "planId", description = "排单ID", required = true)
-    @PreAuthorize("@ss.hasPermission('manage:pack:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:optimize')")
     public CommonResult<PlanProcessSchemeList> getProcessSchemeConfig(@Schema(description = "方案组ID") @NotNull(message = "方案组的ID不能为空")  Long processId,
                                                                       @Schema(description = "排单id") @RequestParam(required = false) Long planId) {
 
@@ -153,7 +153,7 @@ public class OptimizePlanController {
 
     @PutMapping("/updateProcessScheme")
     @Operation(summary = "修改排单对应的方案组的是否锁单")
-    @PreAuthorize("@ss.hasPermission('placeorder:update')")
+    @PreAuthorize("@ss.hasPermission('placeorder:optimize')")
     public CommonResult<Boolean> updateProcessScheme(@RequestBody PlanProcessSchemeReqVO reqVO) {
         optimizePlanService.updateProcessScheme(reqVO);
         return success(true);
@@ -174,9 +174,10 @@ public class OptimizePlanController {
 
     }
 
+
     @GetMapping("/getPlanPlateData")
     @Operation(summary = "未排单获取板材的所有数据")
-    @PreAuthorize("@ss.hasPermission('manage:pack:query')")
+    @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
     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

@@ -76,14 +76,14 @@ public class PlanController {
 
     @GetMapping("getPlateByPlanId")
     @Operation(summary = "根据排单id获取小板分页")
-    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<PageResult<PlateResList>> getPlateByPlanId(@Valid GetPlateByPlanIdVO vo) {
         return success(planService.getPlateByPlanId(vo));
     }
 
     @GetMapping("getOrderByPlan")
     @Operation(summary = "根据排单获取生产单分页")
-    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<PageResult<OrderRespVO>> getOrderByPlanId(@Valid PlanOrderPageReqVO pageReqVO) {
         return success(planService.getOrderByPlanId(pageReqVO));
     }
@@ -99,7 +99,7 @@ public class PlanController {
 
     @GetMapping("getPlanList")
     @Operation(summary = "查询排单（未分页）")
-    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<List<PlanRespVO>> getPlanList() {
 
         return success(planService.getPlanList());
@@ -118,7 +118,7 @@ public class PlanController {
 
     @GetMapping("getNotPlanOrderListPage")
     @Operation(summary = "获取未排单的生产单分页列表")
-    @PreAuthorize("@ss.hasPermission('placeorder:query')")
+    @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
     public CommonResult<PageResult<OrderRespVOCopy>> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) {
         return success(planService.getOrderPage(pageReqVO));
     }
@@ -127,7 +127,7 @@ public class PlanController {
 
     @GetMapping("getNotPlanGoodsListPage")
     @Operation(summary = "获取未排单的大板板材分页列表")
-    @PreAuthorize("@ss.hasPermission('placeorder:query')")
+    @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
     public CommonResult<PageResult<OrderGoodsResp>> getOrderGoodsPage(@Valid OrderPageReqVOCopy pageReqVO) {
         return success(planService.getOrderGoodsPage(pageReqVO));
     }
@@ -165,7 +165,7 @@ public class PlanController {
     @GetMapping("getPlateList")
     @Operation(summary = "根据排单ID获取板材列表（未分页）")
     @Parameter(name = "planIds", description = "排单id", required = true)
-    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
+    @PreAuthorize("@ss.hasPermission('placeorder:query')")
     public CommonResult<List<PlateResList>> getPlateList(@Valid @RequestParam("planIds") @Size(max = 20,message = "最多可同时导出20个排单") List<Long> planIds) {
         return success(planService.getPlateList(planIds));
     }
@@ -174,7 +174,7 @@ public class PlanController {
     @GetMapping("getOrderRoomBodyList")
     @Operation(summary = "获取未排单的生产单的柜体和房间名称")
     @Parameter(name = "orderIds", description = "生产单ID", required = true)
-    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
+    @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
     public CommonResult<List<OrderRoomBodyList>> getOrderRoomBody(@Valid @NotEmpty(message = "生产单ID不能为空") @RequestParam  @Size(max = 20,message = "最多可同时查询20个生产单信息") List<Long> orderIds) {
 
         return success(planService.getOrderRoomBody(orderIds));

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

@@ -59,7 +59,7 @@ public class PlateResList {
     @Schema(description = "材质")
     private String material;
     @Schema(description = "纹路")
-    private Boolean texture;
+    private Integer texture;
     @Schema(description = "备注")
     private String remark;
 }

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

@@ -78,8 +78,8 @@ public class PlateController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "未排单获取实际板材")
+    @Operation(summary = "获取实际的开料大板")
-//    @PreAuthorize("@ss.hasPermission('executor:plate:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('unplannedOrders:query','placeorder:query')")
     public CommonResult<PageResult<PlateGoodDO>> getGoodsPlate(@Valid GoodsPlateFilterPageReqVO pageReqVO) {
 
         return success(plateService.getGoodsPlate(pageReqVO));
@@ -89,7 +89,7 @@ public class PlateController {
 
     @GetMapping("/getPlatePage")
     @Operation(summary = "获取未排单的生产单板件")
-//    @PreAuthorize("@ss.hasPermission('executor:plate:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('unplannedOrders:query','placeorder:query')")
     public CommonResult<PageResult<PlateResList>> getPlatePage(@Valid NoPlanPlatePageReqVO reqVO) {
 
         return success(plateService.getOrderPlatePage(reqVO));

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -676,11 +676,15 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
         // 删除原来的优化信息
         if(CollUtil.isNotEmpty(optimizeBoardModelDOS)){
 
+            PlanDO planDO = planMapper.selectById(planId);
+
+            AssertUtils.notEmpty(planDO,ORDER_PLAN_DATE_ERROR);
+
             OptimizeBoardModelDO optimizeBoardModelDO = optimizeBoardModelDOS.get(0);
 
             Boolean isLock = Optional.ofNullable(optimizeBoardModelDO.getIsLock()).orElse(false);
 
-            if(Boolean.TRUE.equals(isLock)){
+            if(Boolean.TRUE.equals(isLock) && planDO.getIsScheduled().equals(true)){
                 throw exception(THIS_PLAN_IS_LOCK);
             }
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java

@@ -34,7 +34,7 @@ public class SystemConfigController {
 
     @GetMapping()
     @Operation(summary = "获得系统配置的分页列表")
-    @PreAuthorize("@ss.hasPermission('system:base-setting:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:query','unplannedOrders:query','placeorder:query')")
     public CommonResult<List<ConfigRespVO>> getSystemConfigPage(@Valid ConfigPageReqVO pageReqVO) {
         List<SystemConfigDO> pageResult = systemConfigService.getSystemConfigList(pageReqVO);
         return success(BeanUtils.toBean(pageResult, ConfigRespVO.class));
@@ -42,7 +42,7 @@ public class SystemConfigController {
 
     @GetMapping("/{id}")
     @Operation(summary = "根据id查询系统配置")
-    @PreAuthorize("@ss.hasPermission('system:base-setting:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:query','unplannedOrders:query','placeorder:query')")
     public CommonResult<ConfigRespVO> getSystemConfig(@PathVariable("id") Long id) {
         SystemConfigDO systemConfigDO = systemConfigService.getSystemConfig(id);
         return success(BeanUtils.toBean(systemConfigDO, ConfigRespVO.class));