Merge remote-tracking branch 'origin/main'

# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

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

@@ -60,4 +60,6 @@ public interface ErrorCodeConstants {
     ErrorCode FILE_READ_ERR = new ErrorCode(1_002_029_012, "文件读取错误");
     ErrorCode FILE_ADD_ERR = new ErrorCode(1_002_029_012, "文件已经存在是否强制保存");
     ErrorCode FILE_UPLOAD_ERR = new ErrorCode(1_002_029_012, "文件内容为空");
+
+    ErrorCode SOURCE_NOT_EXITS_ERROR = new ErrorCode(1_002_029_013, "源数据查询失败");
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderItemType.java

@@ -0,0 +1,33 @@
+package com.cf.imes.module.executor.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 生产单明细类型
+ *
+ * @author Gqr
+ * @since 2024/6/7 14:50
+ */
+@RequiredArgsConstructor
+@Getter
+public enum OrderItemType {
+
+    BOARD(1, "板材"),
+
+    PARTS(2, "五金/配件"),
+
+    OTHER(3, "其他"),
+
+    QUOTE_PARTS(4, "报价配件");
+
+    /**
+     * 类型编码
+     */
+    private final Integer code;
+
+    /**
+     * 描述
+     */
+    private final String desc;
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderPlanStatusEnum.java

@@ -0,0 +1,32 @@
+package com.cf.imes.module.executor.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 排单状态
+ *
+ * @author Gqr
+ * @since 2024/6/7 14:25
+ */
+@RequiredArgsConstructor
+@Getter
+public enum OrderPlanStatusEnum {
+    NEW(0, "新单"),
+
+    APPLY(1, "板材已申请"),
+
+    OPENING(2, "开料中"),
+
+    OPENED(3, "已开料");
+
+    /**
+     * 类型编码
+     */
+    private final Integer code;
+
+    /**
+     * 描述
+     */
+    private final String desc;
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderPlateFilterTypeEnum.java

@@ -0,0 +1,32 @@
+package com.cf.imes.module.executor.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 生产单板件排单过滤类型
+ *
+ * @author Gqr
+ * @since 2024/6/7 14:31
+ */
+@RequiredArgsConstructor
+@Getter
+public enum OrderPlateFilterTypeEnum {
+    HAS_CUT_THROUGH_SHAPE(1, "有挖穿造型"),
+
+    HAS_CUT_PUNCH(2, "有挖穿孔"),
+
+    HAS_2D_KNIFE_PATHS(4, "有二维刀路"),
+
+    STACKABLE(8, "可叠");
+
+    /**
+     * 类型编码
+     */
+    private final Integer code;
+
+    /**
+     * 描述
+     */
+    private final String desc;
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -655,13 +655,16 @@ public class OrderServiceImpl implements OrderService {
             case "配件汇总1-模板.xlsx":// 配件汇总
                 map.put(orderDO, orderPartsMapper.selectPartAll(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId()));
                 break;
-            case "板材明细-按房间-模板.xlsx"://
+            case "板材明细-按房间-模板.xlsx":
                 break;
-            case "板材明细-按板材-模板.xlsx"://
+            case "板材明细-按板材-模板.xlsx":
+                map.put(orderDO, plateMapper.selectPlateGoodsList(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId()));
+
                 break;
-            case "板材汇总-按房间-模板.xlsx"://
+            case "板材汇总-按房间-模板.xlsx":
                 break;
-            case "板材汇总-按板材-模板.xlsx"://
+            case "板材汇总-按板材-模板.xlsx":
+                map.put(orderDO, plateMapper.selectPlateGoodsList(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId()));
                 break;
             default:
                 // 处理默认情况，可以选择忽略或者做其他处理

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java

@@ -498,7 +498,7 @@ public class ApiTypeRealize {
                         .groupId(0L)
                         .partsId(0L)
                         .plateId(plateId)
-                        .num(0.0)
+                        .num(1.0)
                         .build();
 
                 if (plateDetail.get(plate.getInteger("BlockNo")) != null) {