跟据新需求修改未排单，已排单，新增排单，优化生产等部分接口，禅道381，363，274Bug修改

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

@@ -0,0 +1,29 @@
+package com.cf.imes.framework.common.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum OrderPlateTypeEnum {
+
+
+    LAYERBOARD(0, "层板"),
+    RISER(1, "立板"),
+    BACKBOARD(2, "背板"),
+    SELFINCREASINGBOARD(3, "自增板");
+
+    private final Integer type;
+    private String description;
+
+    public boolean equals(Integer status) {
+        return this.type .equals(status) ;
+    }
+
+    public boolean equals(OrderPlateTypeEnum enableStatusEnum) {
+        return enableStatusEnum != null && enableStatusEnum.type .equals(this.getType()) ;
+    }
+
+
+}

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

@@ -9,10 +9,11 @@ import lombok.Getter;
 public enum PlanStatusEnum {
 
 
-    NEWORDER(0,"新单"),
-    BOARDHASBEENAPPLIEDFOR(1,"板材已申请"),
-    DURINGCUTTING(2,"开料中"),
-    OPENEDMATERIAL(3,"已开料");
+    NOCUTTING(0, "未开料"),
+
+    OPENING(1, "开料中"),
+
+    OPENED(2, "已开料");
 
     private Integer status;
     private String scheduling;

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

@@ -33,6 +33,8 @@ 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文档删除失败");
 
     // ========== 自定义错误段 ==========
     ErrorCode REPEATED_REQUESTS = new ErrorCode(900, "重复请求，请稍后重试"); // 重复请求

cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/service/ESDocumentServiceImpl.java

@@ -1,7 +1,6 @@
 package com.cf.imes.framework.es.core.service;
 
 import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
@@ -17,9 +16,6 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -146,6 +142,7 @@ public class ESDocumentServiceImpl implements ESDocumentService {
             esDocument.setCreator(loginUser.getNickname());
             esDocument.setCreateTime(simpleDateFormat.format(date));
             esDocument.setUpdater(loginUser.getNickname());
+            esDocument.setOrganId(loginUser.getOrganId());
 
             esDocument.setUpdateTime(simpleDateFormat.format(date));
             br.operations(op -> op.index(idx -> idx

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/QueryWrapperX.java

@@ -1,10 +1,10 @@
 package com.cf.imes.framework.mybatis.core.query;
 
 import cn.hutool.core.lang.Assert;
-import com.cf.imes.framework.mybatis.core.enums.SqlConstants;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.cf.imes.framework.mybatis.core.enums.SqlConstants;
 import org.springframework.util.StringUtils;
 
 import java.util.Collection;
@@ -145,6 +145,12 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
         return this;
     }
 
+    @Override
+    public QueryWrapperX<T> isNotNull(String column) {
+        super.isNotNull(column);
+        return this;
+    }
+
     /**
      * 设置只返回最后一条
      *