排单异常信息补全，加工方案组删除逻辑更改，ES异常捕捉更改

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java

@@ -305,10 +305,10 @@ public class ErrorCodeConstants {
     public static final ErrorCode ORDER_DATE_ERROR = new ErrorCode(1_002_041_001, "生产单信息不存在，请重新进入或切换生产单");
     public static final ErrorCode ORDER_PLATE_ERROR = new ErrorCode(1_002_041_002, "生产单对应的板材数据为空，请检查是否为空单或重新导入生产单，或联系客服");
     public static final ErrorCode ORDER_PLAN_DATE_ERROR = new ErrorCode(1_002_041_004, "排单信息不存在，请重新进入或切换排单");
-    public static final ErrorCode ORDER_PLAN_OPTIMIZE_ERROR = new ErrorCode(1_002_041_005, "排单的优化数据异常，请将该排单重新优化");
+    public static final ErrorCode ORDER_PLAN_OPTIMIZE_ERROR = new ErrorCode(1_002_041_005, "当前排单对应的优化数据为空，请重新进行优化");
     public static final ErrorCode ORDER_PLATE_MODEL_DATE_ERROR = new ErrorCode(1_002_041_006, "生产单对应的板材造型数据为空，请重新导入生产单");
     public static final ErrorCode ORDER_PLAN_PLATE_ERROR = new ErrorCode(1_002_041_007, "当前排单对应的板材数据有异常，请查看板材信息或联系客服");
-    public static final ErrorCode ORDER_PLAN_ERROR = new ErrorCode(1_002_041_008, "当前排单对应的生产单数据有异常，请查看生产单信息或联系客服");
+    public static final ErrorCode ORDER_PLAN_ERROR = new ErrorCode(1_002_041_008, "当前排单对应的生产单数据为空，请重新创建排单");
     public static final ErrorCode ORDER_PLAN_PLATE_MODEL_DATE_ERROR = new ErrorCode(1_002_041_009, "当前排单对应的板材造型数据为空，请检查板材信息或者联系客服");
     public static final ErrorCode ORDER_GOODS_DATA_ERROR = new ErrorCode(1_002_041_010, "当前大板数据异常，请检查大板信息或者联系客服");
     public static final ErrorCode ORDER_PACK_DATA_NULL_ERROR = new ErrorCode(1_002_041_011, "当前包裹数据为空，请重新查看包裹数据或联系客服");
@@ -340,6 +340,11 @@ public class ErrorCodeConstants {
     public static final ErrorCode CREAT_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_002_041_033, "当前板材已有小板创建板材，请重新查询生产单信息再创建");
     public static final ErrorCode UPDATE_NO_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_002_041_034, "当前排单无开料板，无法取消开料，请重新尝试");
     public static final ErrorCode PLAN_PLATE_DATA_ERROR = new ErrorCode(1_002_041_035, "当前排单没有选择板材数据，请进行选择");
+    public static final ErrorCode DELETE_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_002_041_036, "当前删除的小板信息有误，请检查小板是否存在或重新创建排单");
+    public static final ErrorCode PLAN_PLATE_OPTIMIZE_DATA_ERROR = new ErrorCode(1_002_041_037, "当前排单对应的优化数据异常，请重新进行优化");
+
+
+
 
 
     //=========== 应用信息 1-002-037-000 ============
@@ -378,5 +383,5 @@ public class ErrorCodeConstants {
     public static final ErrorCode SYSTEM_PROCESS_SCHEME_DATA_ERROR = new ErrorCode(1_002_040_015, "加工方案组的：{} 为空，无法保存，请进行配置");
     public static final ErrorCode SYSTEM_PROCESS_SCHEME_CONFIG_DATA_ERROR = new ErrorCode(1_002_040_016, "加工方案组的：{} 为空，请检查配置信息");
     public static final ErrorCode SYSTEM_PROCESS_SCHEME_CONFIG_FIELD_ERROR = new ErrorCode(1_002_040_017, "当前方案组的配置异常，请重新配置");
-
+    public static final ErrorCode SYSTEM_PROCESS_SCHEME_CONFIG_IS_PLAN = new ErrorCode(1_002_040_018, "当前方案组已在排单中使用，无法删除");
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java

@@ -1,5 +1,6 @@
 package com.cf.imes.module.system.api.systemconfig;
 
+import cn.hutool.core.collection.CollUtil;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.Assert.AssertUtils;
@@ -23,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -73,7 +75,9 @@ public class SystemConfigApiImpl implements SystemConfigApi {
                 .in(SystemConfigDO::getId, processIds)
                 .select(SystemConfigDO::getId,SystemConfigDO::getName));
 
-//        AssertUtils.notEmpty(systemConfigDOS,PROCESS_CONFIG_DATA_ERROR);
+        if(CollUtil.isEmpty(systemConfigDOS)){
+            return success(new ArrayList<>());
+        }
 
         return success(BeanUtils.toBean(systemConfigDOS,SystemConfigRespDTO.class));
     }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessSchemeServiceHandler.java

@@ -5,6 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
+import com.cf.imes.module.executor.api.plan.OrderPlanApi;
 import com.cf.imes.module.system.controller.admin.systemconfig.vo.*;
 import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
 import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigMapper;
@@ -20,6 +21,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray;
 import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString;
+import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_PROCESS_SCHEME_CONFIG_IS_PLAN;
 import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_PROCESS_SCHEME_DATA_ERROR;
 
 /**
@@ -34,6 +36,8 @@ public class ProcessSchemeServiceHandler extends AbstractSystemConfigServiceHand
     @Resource
     private SystemConfigMapper systemConfigMapper;
 
+    @Resource
+    private OrderPlanApi orderPlanApi;
 
     @Override
     public List<SystemConfigDO> selectList(ConfigPageReqVO pageReqVO) {
@@ -125,6 +129,12 @@ public class ProcessSchemeServiceHandler extends AbstractSystemConfigServiceHand
     @Override
     public void deleteConfig(ConfigDeleteReqVO reqVO) {
 
+        Boolean data = orderPlanApi.getOrderProcessScheme(reqVO.getId()).getCheckedData();
+
+        if(Boolean.TRUE.equals(data)){
+            throw exception(SYSTEM_PROCESS_SCHEME_CONFIG_IS_PLAN);
+        }
+
         systemConfigMapper.deleteById(reqVO.getId());
 
     }