获得机台新增品牌信息，排单，打包补全部分代码逻辑

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderItemTypeEnum.java

@@ -0,0 +1,27 @@
+package com.cf.imes.framework.common.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum OrderItemTypeEnum {
+
+    PLATE(1, "板材"),
+    PARTS(2, "五金/配件"),
+    OTHER(3, "其他"),
+    QUOTATIONACCESSORIES(4, "报价配件");
+
+    private final Integer type;
+    private String description;
+
+    public boolean equals(Integer status) {
+        return this.type .equals(status) ;
+    }
+
+    public boolean equals(OrderItemTypeEnum enableStatusEnum) {
+        return enableStatusEnum != null && enableStatusEnum.type .equals(this.getType()) ;
+    }
+
+}

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -33,8 +33,11 @@ public interface GlobalErrorCodeConstants {
     ErrorCode INTERNAL_SERVER_ERROR = new ErrorCode(500, "系统异常，请联系客服处理");
     ErrorCode NOT_IMPLEMENTED = new ErrorCode(501, "功能未实现/未开启");
     ErrorCode ERROR_CONFIGURATION = new ErrorCode(502, "错误的配置项");
-    ErrorCode ES_ERROR_UPDATE = new ErrorCode(503, "ES文档更新失败");
-    ErrorCode ES_ERROR_DELETE = new ErrorCode(504, "ES文档删除失败");
+
+    // ES文档更新失败
+    ErrorCode ES_ERROR_UPDATE = new ErrorCode(503, "数据异常，请勿点击过快，请稍等再试");
+    // ES文档删除失败
+    ErrorCode ES_ERROR_DELETE = new ErrorCode(504, "数据异常，请勿点击过快，请稍等再试");
     ErrorCode DATA_EXCEPTION_ERROR = new ErrorCode(505, "数据异常，请联系客服处理");
 
     // ========== 自定义错误段 ==========

cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java

@@ -236,9 +236,13 @@ public class GlobalExceptionHandler {
             return tableNotExistsResult;
         }
 
-//        if(ex instanceof NullPointerException){
-//            return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg());
-//        }
+        if(ex instanceof NullPointerException){
+            // 处理异常
+            log.error("[defaultExceptionHandler]", ex);
+            // 插入异常日志
+            this.createExceptionLog(req, ex);
+            return CommonResult.error(DATA_EXCEPTION_ERROR.getCode(), DATA_EXCEPTION_ERROR.getMsg());
+        }
 
         // 情况二：部分特殊的库的处理
         if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) {