全局替换：生产单 -> 订单

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 
 /**
- * @author 生产单板材开料状态表
+ * @author 订单板材开料状态表
  */
 
 @AllArgsConstructor

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

@@ -10,7 +10,7 @@ public enum PlanTypeEnum {
 
     MIXEDORDERPLAN(1, "混单排单"),
 
-    ORDERPLAN(2, "生产单排单");
+    ORDERPLAN(2, "订单排单");
 
     private Integer type;
     private String scheduling;

cf-framework/cf-spring-boot-starter-mq/src/main/java/com/cf/imes/framework/mq/rabbitmq/constant/RabbitMqConstants.java

@@ -8,22 +8,22 @@ package com.cf.imes.framework.mq.rabbitmq.constant;
  */
 public class RabbitMqConstants {
     /**
-     * 生产单导入excel交换机
+     * 订单导入excel交换机
      */
     public static final String ORDER_IMPORT_DEFAULT_EXCEL_EXCHANGE = "order_import_default_excel_exchange";
 
     /**
-     * 生产单导入excel队列
+     * 订单导入excel队列
      */
     public static final String ORDER_IMPORT_DEFAULT_EXCEL_QUEUE = "order_import_default_excel_queue";
 
     /**
-     * 生产单导入xml交换机
+     * 订单导入xml交换机
      */
     public static final String ORDER_IMPORT_DEFAULT_XML_EXCHANGE = "order_import_default_xml_exchange";
 
     /**
-     * 生产单导入xml队列
+     * 订单导入xml队列
      */
     public static final String ORDER_IMPORT_DEFAULT_XML_QUEUE = "order_import_default_xml_queue";
 
@@ -39,17 +39,17 @@ public class RabbitMqConstants {
     public static final String ORDER_IMPORT_WEBCAD_QUEUE = "order_import_webcad_queue_%s";
 
     /**
-     * 生产单导入死信交换机
+     * 订单导入死信交换机
      */
     public static final String ORDER_IMPORT_DEAD_LETTER_EXCHANGE = "order_import_dead_letter_exchange";
 
     /**
-     * 生产单导入死信队列
+     * 订单导入死信队列
      */
     public static final String ORDER_IMPORT_DEAD_LETTER_QUEUE = "order_import_dead_letter_queue";
 
     /**
-     * 生产单导入死信路由键
+     * 订单导入死信路由键
      */
     public static final String ORDER_IMPORT_DEAD_LETTER_ROUTING_KEY = "order_import_dead_letter_routing_key";
 }

cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/constants/RedisKeyConstants.java

@@ -8,7 +8,7 @@ package com.cf.imes.framework.redis.constants;
  */
 public class RedisKeyConstants {
     /**
-     * 生产单导入
+     * 订单导入
      */
     public static final String ORDER_IMPORT_LOCK_KEY = "order_import:%s";
 

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/customplateno/OrderCustomPlateNoApi.java

@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @since 2024/11/28 18:18
  */
 @FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 生产单自定义板编号序号")
+@Tag(name = "RPC 服务 - 订单自定义板编号序号")
 public interface OrderCustomPlateNoApi {
     String PREFIX = ApiConstants.PREFIX + "/order/customplateno";
 
     @PostMapping(PREFIX + "/initValue")
-    @Operation(summary = "复位/清零生产单下的序号")
+    @Operation(summary = "复位/清零订单下的序号")
     CommonResult<Boolean> resetOrderSeq(@RequestBody CustomPlateNoRuleDTO ruleDTO);
 }

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApi.java

@@ -16,7 +16,7 @@ public interface OrderProcessApi {
     String PREFIX = ApiConstants.PREFIX + "/order-process";
 
     @GetMapping(PREFIX +"/apiGet")
-    @Operation(summary = "获得生产单中的加工组信息表")
+    @Operation(summary = "获得订单中的加工组信息表")
     @Parameter(name = "processGroupId", description = "加工组id", required = true, example = "1024")
     CommonResult<Boolean> getOrderProcessByProcessGroupId(@RequestParam("processGroupId") Long id);
 }

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/OrderComponentApi.java

@@ -24,6 +24,6 @@ public interface OrderComponentApi {
     String PREFIX = ApiConstants.PREFIX + "/order/component";
 
     @PostMapping(PREFIX + "/list")
-    @Operation(summary = "获取生产单下的部件列表")
+    @Operation(summary = "获取订单下的部件列表")
     CommonResult<List<OrderComponentListRespDTO>> getOrderComponentList(@RequestBody OrderComponentListReqDTO dto);
 }

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListReqDTO.java

@@ -12,11 +12,11 @@ import java.util.List;
  * @author Gqr
  * @since 2026/2/25 16:18
  */
-@Schema(description = "RPC 服务 - 部件管理 - 生产单部件列表查询 - Request DTO")
+@Schema(description = "RPC 服务 - 部件管理 - 订单部件列表查询 - Request DTO")
 @Data
 public class OrderComponentListReqDTO implements Serializable {
     private static final long serialVersionUID = -5691595836226548840L;
 
-    @Schema(description = "生产单编号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1,2,3,4]")
+    @Schema(description = "订单编号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1,2,3,4]")
     private List<Long> orderIds;
 }

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListRespDTO.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author Gqr
  * @since 2026/2/25 16:18
  */
-@Schema(description = "RPC 服务 - 部件管理 - 生产单部件列表查询 - Response DTO")
+@Schema(description = "RPC 服务 - 部件管理 - 订单部件列表查询 - Response DTO")
 @Data
 public class OrderComponentListRespDTO implements Serializable {
     private static final long serialVersionUID = -5691595836226548840L;

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApi.java

@@ -26,8 +26,8 @@ public interface OrderPlanApi {
 
 
     @GetMapping(PREFIX +"/apiGetOrder")
-    @Operation(summary = "查询生产单对应的板材已全部开料")
-    @Parameter(name = "orderId", description = "生产单ID", required = true)
+    @Operation(summary = "查询订单对应的板材已全部开料")
+    @Parameter(name = "orderId", description = "订单ID", required = true)
     CommonResult<Boolean> getOrder(@RequestParam("orderId") Long orderId);
 
     @GetMapping(PREFIX +"/apiGetOrderProcessScheme")
@@ -42,7 +42,7 @@ public interface OrderPlanApi {
     * */
 
     @GetMapping(PREFIX +"/apiDataGetPlan")
-    @Operation(summary = "获取当前排单对应的生产单信息")
+    @Operation(summary = "获取当前排单对应的订单信息")
     @Parameter(name = "planId", description = "排单ID", required = true, example = "1024")
     String apiDataGetPlan(@RequestParam("planId") Long planId,@RequestParam("filed") String filed);
 

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/dto/PlanDTO.java

@@ -25,7 +25,7 @@ public class PlanDTO {
      */
     private Long sort;
     /**
-     * 排单类型：1 混单排单，2 生产单排单
+     * 排单类型：1 混单排单，2 订单排单
      */
     private Integer type;
     /**
@@ -42,7 +42,7 @@ public class PlanDTO {
      */
     private LocalDateTime planTime;
     /**
-     * 生产单号
+     * 订单号
      */
     private String orderNos;
 

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

@@ -10,8 +10,8 @@ public class ErrorCodeConstants {
     private ErrorCodeConstants() {
     }
 
-    // ========== 生产单开料排单
-    public static final ErrorCode PLAN_NOT_EXISTS = new ErrorCode(1_003_107_000, "生产单开料排单不存在");
+    // ========== 订单开料排单
+    public static final ErrorCode PLAN_NOT_EXISTS = new ErrorCode(1_003_107_000, "订单开料排单不存在");
 
     public static final ErrorCode PLAN_NOT_ALLOW_DELETE = new ErrorCode(1_003_107_001, "排单号：{}，已开料不予许删除");
 
@@ -20,50 +20,50 @@ public class ErrorCodeConstants {
     public static final ErrorCode PLAN_NOT_DATA_EXISTS = new ErrorCode(1_003_107_007, "排单号：{} 不存在，无法进行操作，请检查排单数据");
     public static final ErrorCode PLAN_PLATE_IS_CUTTING = new ErrorCode(1_003_107_008, "当前排单已有板材开料，无法开启混单");
     public static final ErrorCode PLAN_IS_MIXED_ERROR = new ErrorCode(1_003_107_009, "当前排单为混单，无法开启混单配置");
-    public static final ErrorCode CREATE_PLAN_ORDER_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_010, "创建排单失败：生产单号【{}】板件数量已发生改变，请刷新后重新创建单排");
+    public static final ErrorCode CREATE_PLAN_ORDER_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_010, "创建排单失败：订单号【{}】板件数量已发生改变，请刷新后重新创建单排");
     public static final ErrorCode CREATE_PLAN_GOODS_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_011, "创建排单失败：材质【{}】板件数量已发生改变，请刷新后重新创建单排");
-    public static final ErrorCode ORDER_PLATE_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_012, "更新生产单状态失败：生产单号【{}】板件数量已发生改变，请刷新后重新操作");
+    public static final ErrorCode ORDER_PLATE_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_012, "更新订单状态失败：订单号【{}】板件数量已发生改变，请刷新后重新操作");
     public static final ErrorCode GOODS_PLATE_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_013, "更新材质状态失败：材质【{}】板件数量已发生改变，请刷新后重新操作");
     public static final ErrorCode BODY_PLATE_UPDATE_CONCURRENCY_ERROR = new ErrorCode(1_003_107_014, "更新柜体状态失败：柜体【{}】板件数量已发生改变，请刷新后重新操作");
 
 
-    // ========== 生产单商品 TODO 补充编号 ==========
-    public static final ErrorCode GOODS_NOT_EXISTS = new ErrorCode(1_003_108_000, "生产单商品不存在");
+    // ========== 订单商品 TODO 补充编号 ==========
+    public static final ErrorCode GOODS_NOT_EXISTS = new ErrorCode(1_003_108_000, "订单商品不存在");
 
-    // ========== 生产单 TODO 补充编号 ==========
-    public static final ErrorCode ORDER_NOT_EXISTS = new ErrorCode(1_003_109_000, "生产单不存在");
-    public static final ErrorCode ORDER_NOT_CANCEL = new ErrorCode(1_003_109_001, "生产单以进入生产状态，无法作废");
+    // ========== 订单 TODO 补充编号 ==========
+    public static final ErrorCode ORDER_NOT_EXISTS = new ErrorCode(1_003_109_000, "订单不存在");
+    public static final ErrorCode ORDER_NOT_CANCEL = new ErrorCode(1_003_109_001, "订单以进入生产状态，无法作废");
     public static final ErrorCode PLATE_IS_PLAN = new ErrorCode(1_003_109_002, "删除对象中有已排单板件，请将该对象从排单中移除后再选择删除！");
-    public static final ErrorCode ORDER_ERROR = new ErrorCode(1_003_109_003, "当前生产单柜体，房间已全部删除！");
-    public static final ErrorCode ORDER_DATA_ERROR = new ErrorCode(1_003_109_004, "生产单/排单的数据已无法使用，请删除重新");
-    public static final ErrorCode ORDER_PLAN_ID_NOT_NULL = new ErrorCode(1_003_109_005, "生产单或排单ID至少传入一个");
-    public static final ErrorCode ORDER_PLAN_ID_IS_ONE = new ErrorCode(1_003_109_006, "生产单id与排单id与大板分类ID只能传一个");
+    public static final ErrorCode ORDER_ERROR = new ErrorCode(1_003_109_003, "当前订单柜体，房间已全部删除！");
+    public static final ErrorCode ORDER_DATA_ERROR = new ErrorCode(1_003_109_004, "订单/排单的数据已无法使用，请删除重新");
+    public static final ErrorCode ORDER_PLAN_ID_NOT_NULL = new ErrorCode(1_003_109_005, "订单或排单ID至少传入一个");
+    public static final ErrorCode ORDER_PLAN_ID_IS_ONE = new ErrorCode(1_003_109_006, "订单id与排单id与大板分类ID只能传一个");
 
-    // ========== 生产单 TODO 补充编号 ==========
+    // ========== 订单 TODO 补充编号 ==========
     public static final ErrorCode MODULE_NOT_EXISTS = new ErrorCode(1_003_110_000, "模块不存在");
 
-    // ========== 生产单 TODO 补充编号 ==========
+    // ========== 订单 TODO 补充编号 ==========
     public static final ErrorCode PLATE_NOT_EXISTS = new ErrorCode(1_003_113_000, "板材不存在");
 
-    // ========== 生产单 TODO 补充编号 ==========
-    public static final ErrorCode ORDER_PARTS_NOT_EXISTS = new ErrorCode(1_003_115_000, "生产单配件不存在");
+    // ========== 订单 TODO 补充编号 ==========
+    public static final ErrorCode ORDER_PARTS_NOT_EXISTS = new ErrorCode(1_003_115_000, "订单配件不存在");
 
-    // ========== 生产单 TODO 补充编号 ==========
+    // ========== 订单 TODO 补充编号 ==========
     public static final ErrorCode PHONE_NOT_LAWFUL = new ErrorCode(1_003_116_000, "手机号不合法");
-    public static final ErrorCode CUSTOM_ORDER_EXISTS = new ErrorCode(1_003_117_000, "自定义生产单号存在");
+    public static final ErrorCode CUSTOM_ORDER_EXISTS = new ErrorCode(1_003_117_000, "自定义订单号存在");
     public static final ErrorCode ORDER_PROCESS_NOT_EXISTS = new ErrorCode(1_003_119_001, "工序组不存在");
-    public static final ErrorCode ORDER_PROCESS_EXISTS = new ErrorCode(1_003_119_002, "该生产单工序组已经存在");
+    public static final ErrorCode ORDER_PROCESS_EXISTS = new ErrorCode(1_003_119_002, "该订单工序组已经存在");
     public static final ErrorCode PROCESS_GROUP_NOT_EXISTS = new ErrorCode(1_003_029_003, "工序组不存在");
     public static final ErrorCode ORDER_BODY_NOT_EXISTS = new ErrorCode(1_003_029_004, "当前柜体不存在");
-    public static final ErrorCode RAW_GOODS_NOT_USED_IN_ORDER = new ErrorCode(1_003_029_005, "生产单中未用到此板材");
-    public static final ErrorCode ORDER_NOT_FOUND = new ErrorCode(1_003_029_006, "生产单不存在");
+    public static final ErrorCode RAW_GOODS_NOT_USED_IN_ORDER = new ErrorCode(1_003_029_005, "订单中未用到此板材");
+    public static final ErrorCode ORDER_NOT_FOUND = new ErrorCode(1_003_029_006, "订单不存在");
     public static final ErrorCode APP_TOKEN_ERROR = new ErrorCode(1_003_029_007, "token获取失败");
     public static final ErrorCode PLATE_PLAN_DATA_ERROR = new ErrorCode(1_003_029_008, "接口数据获取，板件明细源数据缺少，请确定接口数据正确");
     public static final ErrorCode PLATE_GOOD_DATA_NULL = new ErrorCode(1_003_029_009, "接口数据获取，板材源数据缺少，请确定接口数据正确");
     public static final ErrorCode GOODS_DATA_ERROR = new ErrorCode(1_003_029_010, "存在小板情况下，缺少板材数据，请确认数据源是否完整");
     public static final ErrorCode PLATE_DATA_ERROR = new ErrorCode(1_003_029_011, "小板获取为空");
     public static final ErrorCode PLATE_PRODUCE_DATA_ERROR = new ErrorCode(1_003_029_012, "小板生产数据获取为空");
-    public static final ErrorCode ORDER_STATUS_CONFLICT = new ErrorCode(1_003_029_013, "生产单状态冲突，禁止投入生产");
+    public static final ErrorCode ORDER_STATUS_CONFLICT = new ErrorCode(1_003_029_013, "订单状态冲突，禁止投入生产");
     public static final ErrorCode ORDER_READ_ERR = new ErrorCode(1_003_029_014, "订单列表获取失败，请刷新重试");
     public static final ErrorCode ORDER_DATE_ERR = new ErrorCode(1_003_029_015, "获取订单列表，时间超出范围，请在30天范围内选择");
     public static final ErrorCode ORDER_TIME_ERR = new ErrorCode(1_003_029_016, "获取订单列表，时间格式输入出错，请更换格式");
@@ -71,26 +71,26 @@ public class ErrorCodeConstants {
     public static final ErrorCode ORDER_DETAIL_DATE_ERR = new ErrorCode(1_003_029_018, "板件生产数据缺失，请确认数据源中是否存在相关数据");
 
     public static final ErrorCode SOURCE_NOT_EXITS_ERROR = new ErrorCode(1_003_029_019, "源数据查询失败");
-    public static final ErrorCode ORDER_DELETED_ERR = new ErrorCode(1_003_029_020, "生产单删除失败");
-    public static final ErrorCode ORDER_RESTORE_ERR = new ErrorCode(1_003_029_021, "生产单还原失败");
+    public static final ErrorCode ORDER_DELETED_ERR = new ErrorCode(1_003_029_020, "订单删除失败");
+    public static final ErrorCode ORDER_RESTORE_ERR = new ErrorCode(1_003_029_021, "订单还原失败");
     public static final ErrorCode API_MES_ERR = new ErrorCode(1_003_029_022, "MES接口数据出错：{}");
     public static final ErrorCode CHANGE_DETAILS_ITEM_ERROR = new ErrorCode(1_003_029_023, "明细转换失败");
 
     // ========== 自定义板编号生成 1_003_030_ ==========
-    public static final ErrorCode CUSTOM_PLATENO_GENERATE_ORDERNO_RULE_NOT_SUPPORT_RESETMODE = new ErrorCode(1_003_030_001, "自定义版编号生产单序号规则中存在不支持的复位类型：{}");
+    public static final ErrorCode CUSTOM_PLATENO_GENERATE_ORDERNO_RULE_NOT_SUPPORT_RESETMODE = new ErrorCode(1_003_030_001, "自定义版编号订单序号规则中存在不支持的复位类型：{}");
     public static final ErrorCode CUSTOM_PLATENO_GENERATE_BODY_RULE_NOT_SUPPORT_RESETMODE = new ErrorCode(1_003_030_002, "自定义版编号柜体序号规则中存在不支持的复位类型：{}");
     public static final ErrorCode CUSTOM_PLATENO_GENERATE_PLATE_RULE_NOT_SUPPORT_RESETMODE = new ErrorCode(1_003_030_003, "自定义版编号板件序号规则中存在不支持的复位类型：{}");
     public static final ErrorCode CUSTOM_PLATENO_GENERATE_ORG_CUSTOM_PLATENO_SEQ_MODIFY_ERROR = new ErrorCode(1_003_030_004, "保存组织下自定义板编号序号配置失败，请联系客服处理");
 
-    // ========== 生产单导入 1_003_031 ==========
-    public static final ErrorCode ORDER_IMPORT_TYPE_NOT_SUPPORT = new ErrorCode(1_003_031_001, "不支持的生产单导入类型：{}");
-    public static final ErrorCode ORDER_IMPORT_ORGAN_LOCK_ERROR = new ErrorCode(1_003_031_002, "组织下存在正在导入的生产单，请稍后再试");
-    public static final ErrorCode ORDER_IMPORT_FILE_ANALYZE_ERROR = new ErrorCode(1_003_031_003, "生产单导入文件解析失败，请检查文件类型和格式");
-    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_EMPTY = new ErrorCode(1_003_031_004, "生产单信息【{}】不能为空");
-    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_LENGTH_ERROR = new ErrorCode(1_003_031_005, "生产单信息【{}】长度不能超过【{}】个字符");
-    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_MOBILE_FORMAT_ERROR = new ErrorCode(1_003_031_006, "生产单信息【{}】手机号格式错误");
-    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_DATE_FORMAT_ERROR = new ErrorCode(1_003_031_007, "生产单信息【{}】日期格式错误");
-    public static final ErrorCode ORDER_IMPORT_ORDER_NOT_EXISTS = new ErrorCode(1_003_031_008, "生产单【{}】不存在");
+    // ========== 订单导入 1_003_031 ==========
+    public static final ErrorCode ORDER_IMPORT_TYPE_NOT_SUPPORT = new ErrorCode(1_003_031_001, "不支持的订单导入类型：{}");
+    public static final ErrorCode ORDER_IMPORT_ORGAN_LOCK_ERROR = new ErrorCode(1_003_031_002, "组织下存在正在导入的订单，请稍后再试");
+    public static final ErrorCode ORDER_IMPORT_FILE_ANALYZE_ERROR = new ErrorCode(1_003_031_003, "订单导入文件解析失败，请检查文件类型和格式");
+    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_EMPTY = new ErrorCode(1_003_031_004, "订单信息【{}】不能为空");
+    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_LENGTH_ERROR = new ErrorCode(1_003_031_005, "订单信息【{}】长度不能超过【{}】个字符");
+    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_MOBILE_FORMAT_ERROR = new ErrorCode(1_003_031_006, "订单信息【{}】手机号格式错误");
+    public static final ErrorCode ORDER_IMPORT_ORDER_FIELD_DATE_FORMAT_ERROR = new ErrorCode(1_003_031_007, "订单信息【{}】日期格式错误");
+    public static final ErrorCode ORDER_IMPORT_ORDER_NOT_EXISTS = new ErrorCode(1_003_031_008, "订单【{}】不存在");
     public static final ErrorCode ORDER_IMPORT_ORDER_CUSTOMERNO_EXISTS = new ErrorCode(1_003_031_009, "{}【{}】已存在");
     public static final ErrorCode ORDER_IMPORT_DETAIL_FIELD_EMPTY = new ErrorCode(1_003_031_010, "导入校验异常：第{}行，导入明细【{}】不能为空");
     public static final ErrorCode ORDER_IMPORT_DETAIL_FIELD_LENGTH_ERROR = new ErrorCode(1_003_031_011, "导入校验异常：第{}行，导入明细【{}】长度不能超过【{}】个字符");
@@ -124,19 +124,19 @@ public class ErrorCodeConstants {
     public static final ErrorCode NO_PRODUCTION_ORDER_INFORMATION_AVAILABLE = new ErrorCode(1_003_006_001, "已经是{}一条了");
 
     //=========== 生产信息 1-003-007-000 ============
-    public static final ErrorCode ORDER_DATE_ERROR = new ErrorCode(1_003_007_000, "生产单信息不存在，请重新进入或切换生产单");
-    public static final ErrorCode ORDER_PLATE_ERROR = new ErrorCode(1_003_007_001, "生产单对应的板材数据为空，请检查是否为空单或重新导入生产单");
+    public static final ErrorCode ORDER_DATE_ERROR = new ErrorCode(1_003_007_000, "订单信息不存在，请重新进入或切换订单");
+    public static final ErrorCode ORDER_PLATE_ERROR = new ErrorCode(1_003_007_001, "订单对应的板材数据为空，请检查是否为空单或重新导入订单");
     public static final ErrorCode ORDER_PLAN_DATE_ERROR = new ErrorCode(1_003_007_002, "排单信息不存在，请重新进入或切换排单");
     public static final ErrorCode ORDER_PLAN_OPTIMIZE_ERROR = new ErrorCode(1_003_007_003, "当前排单对应的优化数据为空，请重新进行优化");
-    public static final ErrorCode ORDER_PLATE_MODEL_DATE_ERROR = new ErrorCode(1_003_007_004, "生产单对应的板材造型数据为空，请重新导入生产单");
+    public static final ErrorCode ORDER_PLATE_MODEL_DATE_ERROR = new ErrorCode(1_003_007_004, "订单对应的板材造型数据为空，请重新导入订单");
     public static final ErrorCode ORDER_PLAN_PLATE_ERROR = new ErrorCode(1_003_007_005, "当前排单对应的板材数据有异常，请查看板材信息");
-    public static final ErrorCode ORDER_PLAN_ERROR = new ErrorCode(1_003_007_006, "当前排单对应的生产单数据为空，请删掉排单并重新创建排单");
-    public static final ErrorCode ORDER_PLAN_PLATE_MODEL_DATE_ERROR = new ErrorCode(1_003_007_007, "当前排单对应的板材造型数据为空，请重新导入生产单并排单");
-    public static final ErrorCode ORDER_GOODS_DATA_ERROR = new ErrorCode(1_003_007_008, "当前大板数据异常，请重新导入该生产单");
+    public static final ErrorCode ORDER_PLAN_ERROR = new ErrorCode(1_003_007_006, "当前排单对应的订单数据为空，请删掉排单并重新创建排单");
+    public static final ErrorCode ORDER_PLAN_PLATE_MODEL_DATE_ERROR = new ErrorCode(1_003_007_007, "当前排单对应的板材造型数据为空，请重新导入订单并排单");
+    public static final ErrorCode ORDER_GOODS_DATA_ERROR = new ErrorCode(1_003_007_008, "当前大板数据异常，请重新导入该订单");
     public static final ErrorCode ORDER_PACK_DATA_NULL_ERROR = new ErrorCode(1_003_007_009, "当前包裹数据为空，请重新查看包裹数据");
     public static final ErrorCode ORDER_PLAN_NO_OPTIMIZE_UPDATE_ERROR = new ErrorCode(1_003_007_010, "当前排单还未保存优化结果，无法对开料结果进行修改");
-    public static final ErrorCode ORDER_NO_DATA_ERROR = new ErrorCode(1_003_007_011, "生产单信息为空，请检查生产单信息");
-    public static final ErrorCode ORDER_PACK_ERROR = new ErrorCode(1_003_007_012, "当前生产单信息有误，请重新选择包裹");
+    public static final ErrorCode ORDER_NO_DATA_ERROR = new ErrorCode(1_003_007_011, "订单信息为空，请检查订单信息");
+    public static final ErrorCode ORDER_PACK_ERROR = new ErrorCode(1_003_007_012, "当前订单信息有误，请重新选择包裹");
     public static final ErrorCode ORDER_PACK_DATA_ERROR = new ErrorCode(1_003_007_013, "当前包裹信息有误，请重新选择包裹");
     public static final ErrorCode ADVANCED_SCREENING_CONFIG_ERROR = new ErrorCode(1_003_007_014, "当前筛选的配置有误，请重新进行配置");
     public static final ErrorCode PLAN_GOODS_DATA_ERROR = new ErrorCode(1_003_007_015, "当前排单未保存大板和小板信息，请重新进行排单");
@@ -147,19 +147,19 @@ public class ErrorCodeConstants {
     public static final ErrorCode PLAN_PLATE_DATA_ERROR = new ErrorCode(1_003_007_020, "当前排单没有选择板材数据，请进行选择");
     public static final ErrorCode DELETE_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_003_007_021, "当前删除的小板信息有误，请检查小板是否存在或重新创建排单");
     public static final ErrorCode PLAN_PLATE_OPTIMIZE_DATA_ERROR = new ErrorCode(1_003_007_022, "当前排单对应的优化数据异常，请重新进行优化");
-    public static final ErrorCode THIS_ORDER_PLATE_DATA_ERROR = new ErrorCode(1_003_007_023, "当前选择的生产单数据为空，请检查生产单信息或者重新导入生产单");
-    public static final ErrorCode THIS_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_003_007_024, "当前排单对应的板材数据为空，请重新进行排单或检查生产单对应的板材信息");
+    public static final ErrorCode THIS_ORDER_PLATE_DATA_ERROR = new ErrorCode(1_003_007_023, "当前选择的订单数据为空，请检查订单信息或者重新导入订单");
+    public static final ErrorCode THIS_PLAN_PLATE_DATA_ERROR = new ErrorCode(1_003_007_024, "当前排单对应的板材数据为空，请重新进行排单或检查订单对应的板材信息");
     public static final ErrorCode PLAN_PROCESS_CONFIG_IS_NULL = new ErrorCode(1_003_007_025, "排单：{} 对应的方案组为空，请进行配置");
     public static final ErrorCode PLAN_PROCESS_CONFIG_ALL_IS_NULL = new ErrorCode(1_003_007_026, "当前所选排单对应的方案组配置均为空，请重新进行方案组配置");
     public static final ErrorCode THIS_PLAN_PROCESS_SCHEME_IS_LOCK = new ErrorCode(1_003_007_027, "当前排单已被锁定，无法修改方案组，请解锁后再进行修改");
     public static final ErrorCode THIS_PLAN_OPTIMIZE_DATA_ERROR = new ErrorCode(1_003_007_028, "当前排单已全部开料，无法进行再次优化");
     public static final ErrorCode THIS_PLAN_PLATE_IS_CUT = new ErrorCode(1_003_007_029, "当前排单已有板材开料，无法修改");
-    public static final ErrorCode THIS_ORDER_NOT_PLATE_DATA = new ErrorCode(1_003_007_030, "当前生产单无板材数据，无法进行用板量计算");
+    public static final ErrorCode THIS_ORDER_NOT_PLATE_DATA = new ErrorCode(1_003_007_030, "当前订单无板材数据，无法进行用板量计算");
     public static final ErrorCode THIS_PLAN_SCHEME_DATA_ERROR = new ErrorCode(1_003_007_031, "当前方案组的优化信息有误，请重新选择方案组或重新导入排单再进行优化");
     public static final ErrorCode PLAN_SORT_DATA_ERROR = new ErrorCode(1_003_007_032, "已无可进行排序的数据，无法进行排序");
     public static final ErrorCode THIS_PLATE_IS_OPTIMIZE = new ErrorCode(1_003_007_033, "小板：{}，已开料，无法删除，请重新选择小板再删除");
     public static final ErrorCode PART_PACK_DATA_ERROR = new ErrorCode(1_003_007_034, "当前包裹数据为空，无法进行操作，请删除包裹");
-    public static final ErrorCode ORDER_PLAN_DATA_ERROR = new ErrorCode(1_003_007_035, "生产单/排单数据有误，请查看对应的数据");
+    public static final ErrorCode ORDER_PLAN_DATA_ERROR = new ErrorCode(1_003_007_035, "订单/排单数据有误，请查看对应的数据");
     public static final ErrorCode ORDER_PLAN_CREATE_PLATE_NUM_REACH_THRESHOLD_ERROR = new ErrorCode(1_003_007_036, "达到排单板件上限{}片，请减少选择板件数量后创建排单");
 
     //=========== 板材信息 1-003-008-000 ============

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

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.enums;
 
 /**
- * 生产单导入常量
+ * 订单导入常量
  *
  * @author Gqr
  * @since 2025/1/14 16:18

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 生产单导入状态枚举
+ * 订单导入状态枚举
  *
  * @author Gqr
  * @since 2025/1/8 16:20

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 生产单导入任务状态枚举
+ * 订单导入任务状态枚举
  *
  * @author Gqr
  * @since 2025/1/8 16:20

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 生产单导入临时表类型枚举
+ * 订单导入临时表类型枚举
  *
  * @author Gqr
  * @since 2025/1/8 16:20

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 生产单导入类型枚举
+ * 订单导入类型枚举
  * @author Gqr
  * @since 2025/1/8 16:20
  */

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/plan/vo/OrderGroupRespVO.java

@@ -18,7 +18,7 @@ public class OrderGroupRespVO {
 
 
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/GoodsController.java

@@ -31,7 +31,7 @@ import com.cf.imes.module.executor.controller.admin.goods.vo.*;
 import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO;
 import com.cf.imes.module.executor.service.goods.GoodsService;
 
-@Tag(name = "管理后台 - 生产单商品对应")
+@Tag(name = "管理后台 - 订单商品对应")
 @RestController
 @RequestMapping("/executor/goods")
 @Validated
@@ -40,16 +40,16 @@ public class GoodsController {
     @Resource
     private GoodsService goodsService;
 
-//    新建生产单新板材商品对应
+//    新建订单新板材商品对应
     @PostMapping("/create")
-    @Operation(summary = "对应生产单商品")
+    @Operation(summary = "对应订单商品")
     @PreAuthorize("@ss.hasPermission('executor:goods:create')")
     public CommonResult<Boolean> createGoods(@Valid @RequestBody List<GoodsSaveReqVO> createReqVOS) {
         return success(goodsService.createCorrespondsGoods(createReqVOS));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "修改对应生产单商品")
+    @Operation(summary = "修改对应订单商品")
     @PreAuthorize("@ss.hasPermission('executor:goods:update')")
     public CommonResult<Boolean> updateGoods(@Valid @RequestBody GoodsSaveReqVO updateReqVO) {
         goodsService.updateGoods(updateReqVO);
@@ -57,7 +57,7 @@ public class GoodsController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除对应生产单商品")
+    @Operation(summary = "删除对应订单商品")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('executor:goods:delete')")
     public CommonResult<Boolean> deleteGoods(@RequestParam("id") Long id) {
@@ -66,7 +66,7 @@ public class GoodsController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得对应生产单商品")
+    @Operation(summary = "获得对应订单商品")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('executor:goods:query')")
     public CommonResult<GoodsRespVO> getGoods(@RequestParam("id") Long id) {
@@ -75,7 +75,7 @@ public class GoodsController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得对应生产单商品分页")
+    @Operation(summary = "获得对应订单商品分页")
     @PreAuthorize("@ss.hasPermission('executor:goods:query')")
     public CommonResult<PageResult<GoodsRespVO>> getGoodsPage(@Valid GoodsPageReqVO pageReqVO) {
         PageResult<GoodsDO> pageResult = goodsService.getGoodsPage(pageReqVO);

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

@@ -12,13 +12,13 @@ import java.time.LocalDateTime;
 
 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 生产单商品分页 Request VO")
+@Schema(description = "管理后台 - 订单商品分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class GoodsPageReqVO extends PageParam {
 
-    @Schema(description = "生产单号", example = "12114")
+    @Schema(description = "订单号", example = "12114")
     private Long orderId;
 
     @Schema(description = "设计端商品ID", example = "832")

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 生产单商品 Response VO")
+@Schema(description = "管理后台 - 订单商品 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class GoodsRespVO {
@@ -17,8 +17,8 @@ public class GoodsRespVO {
     @ExcelProperty("主键")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12114")
-    @ExcelProperty("生产单号")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12114")
+    @ExcelProperty("订单号")
     private Long orderId;
 
     @Schema(description = "设计端商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "832")

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

@@ -5,14 +5,14 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 生产单商品新增/修改 Request VO")
+@Schema(description = "管理后台 - 订单商品新增/修改 Request VO")
 @Data
 public class GoodsSaveReqVO {
 
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4109")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12114")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12114")
     private Long orderId;
 
     @Schema(description = "设计端商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "832")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java

@@ -48,7 +48,7 @@ public class PackController {
 
     @GetMapping("/getOrderPlate")
     @Operation(summary = "查看生产订单对应的没有打包的板材信息")
-    @Parameter(name = "orderId", description = "生产单Id", required = true)
+    @Parameter(name = "orderId", description = "订单Id", required = true)
     @PreAuthorize("@ss.hasAnyPermissions('manage:pack:export-lost-plate','manage:pack:pack')")
     public CommonResult<List<PlateDetailsRespVO>> getOrderPlateList(@Valid @RequestParam("orderId") Long orderId) {
 
@@ -58,8 +58,8 @@ public class PackController {
 
 
     @GetMapping("/getOrderPlateList")
-    @Operation(summary = "查询多个生产单对应的板材信息")
-    @Parameter(name = "orderIds", description = "生产单ID", required = true)
+    @Operation(summary = "查询多个订单对应的板材信息")
+    @Parameter(name = "orderIds", description = "订单ID", required = true)
     @PreAuthorize("@ss.hasAnyPermissions('manage:pack:create','manage:pack:pre-pack','manage:pack:pack')")
     public CommonResult<List<PlateDetailsRespVO>> getOrdersPlateList(@Valid @RequestParam("orderIds") List<Long> orderIds) {
 
@@ -142,7 +142,7 @@ public class PackController {
 
     @GetMapping("/selectPack")
     @Operation(summary = "查询包裹")
-    @Parameter(name = "orderId", description = "生产单Id", required = true)
+    @Parameter(name = "orderId", description = "订单Id", required = true)
     @PreAuthorize("@ss.hasPermission('manage:pack:query')")
     public CommonResult<List<OrderPackRespVO>> selectPack(@Valid @RequestParam("orderId") Long orderId) {
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/prePack/PrePackReqVO.java

@@ -14,7 +14,7 @@ import jakarta.validation.constraints.NotNull;
 public class PrePackReqVO {
 
 
-    @Schema(description = "生产单ID")
+    @Schema(description = "订单ID")
     @NotNull(message = "优化数据异常，请重新优化")
     private Long orderId;
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/DeleteOtherPartsReqVO.java

@@ -13,8 +13,8 @@ import jakarta.validation.constraints.NotNull;
 public class DeleteOtherPartsReqVO {
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号为空，请重新删除配件")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号为空，请重新删除配件")
     private Long orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackReqVO.java

@@ -19,8 +19,8 @@ public class OrderPackReqVO {
     private Long packId;
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号为空")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号为空")
     private Long orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackRespVO.java

@@ -6,7 +6,7 @@ import lombok.Builder;
 import lombok.Data;
 
 
-@Schema(description = "管理后台 -  生产单包裹表 Response VO")
+@Schema(description = "管理后台 -  订单包裹表 Response VO")
 @Data
 @Builder
 public class OrderPackRespVO {
@@ -14,7 +14,7 @@ public class OrderPackRespVO {
     @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
     @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED)

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsReqVO.java

@@ -8,15 +8,15 @@ import lombok.ToString;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
-@Schema(description = "管理后台 - 生产单模块表  Request VO")
+@Schema(description = "管理后台 - 订单模块表  Request VO")
 @Data
 //@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class OrderPartsReqVO /*extends PageParam*/ {
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号为空")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号为空")
     private Long orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPlateDetailsRespVO.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 
 
-@Schema(description = "管理后台 - 查看生产单对应的板件信息")
+@Schema(description = "管理后台 - 查看订单对应的板件信息")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderPlateDetailsRespVO {
@@ -28,7 +28,7 @@ public class OrderPlateDetailsRespVO {
 //    @Schema(description = "当前包裹的板件数", requiredMode = Schema.RequiredMode.REQUIRED)
 //    private Long currentPackNum;
 
-    @Schema(description = "生产单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED)
     List<PlateDetailsRespVO> plateDetailsRespVO;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OtherPackReqVO.java

@@ -16,8 +16,8 @@ import jakarta.validation.constraints.Size;
 public class OtherPackReqVO {
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号为空，请重新新增外部配件")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号为空，请重新新增外部配件")
     private Long orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackPageReqVO.java

@@ -24,8 +24,8 @@ public class PackPageReqVO extends PageParam {
 
 
     @Schema(description = "订单号")
-    @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字")
-    @Length(max = 19,message = "生产单号长度不能超过19")
+    @Pattern(regexp = "^[0-9]*$",message = "订单号必须为数字")
+    @Length(max = 19,message = "订单号长度不能超过19")
     private String orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackReqVO.java

@@ -12,8 +12,8 @@ import jakarta.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class PackReqVO {
 
-    @Schema(description = "生产单ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号为空，请重新删除配件")
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号为空，请重新删除配件")
     private Long orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java

@@ -9,13 +9,13 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 
-@Schema(description = "管理后台 - 生产单表 order_{N} Response VO")
+@Schema(description = "管理后台 - 订单表 order_{N} Response VO")
 @Data
 @Setter
 public class PackRespVO {
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788")
     private Long id;
 
 
@@ -92,13 +92,13 @@ public class PackRespVO {
     private Long pendingNum;
 
 
-    @Schema(description = "生产单对应的板材ID集")
+    @Schema(description = "订单对应的板材ID集")
     private List<Long> plateIdList;
 
-    @Schema(description = "生产单对应的包裹ID集")
+    @Schema(description = "订单对应的包裹ID集")
     private List<Long> packIdList;
 
-//    @Schema(description = "生产单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED)
+//    @Schema(description = "订单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED)
 //    List<PlateDetailsRespVO> plateDetailsRespVO;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackageDetailsReqVO.java

@@ -10,15 +10,15 @@ import org.hibernate.validator.constraints.Length;
 import jakarta.validation.constraints.Pattern;
 
 
-@Schema(description = "管理后台 - 查看生产单下对应的包裹信息")
+@Schema(description = "管理后台 - 查看订单下对应的包裹信息")
 @Data
 @ToString(callSuper = true)
 public class PackageDetailsReqVO extends PageParam {
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字")
-    @Length(max = 19,message = "生产单号长度不能超过 19 位")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Pattern(regexp = "^[0-9]*$",message = "订单号必须为数字")
+    @Length(max = 19,message = "订单号长度不能超过 19 位")
     private String orderId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java

@@ -34,7 +34,7 @@ public class PlateDetailsRespVO {
     @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String bodyId;
 
-    @Schema(description = "生产单ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String orderId;
 
     @Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED)

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PrintOrderPackReqVO.java

@@ -5,14 +5,14 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.ToString;
 
-@Schema(description = "管理后台 - 打印生产单的包裹  Request VO")
+@Schema(description = "管理后台 - 打印订单的包裹  Request VO")
 @Data
 @ToString(callSuper = true)
 public class PrintOrderPackReqVO {
 
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822")
     private Long orderId;
 
 

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

@@ -53,7 +53,7 @@ public class RemainPlateManageController {
     }
 
     @PostMapping("/createMultiple")
-    @Operation(summary = "创建生产单余料板表(多个)")
+    @Operation(summary = "创建订单余料板表(多个)")
     @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:create','producePlan:optimize:remain-plate-store','placeorder:optimize:remain-plate-store')")
     public CommonResult<Boolean> createRemainPlateMultiple(@Valid @RequestBody Set<RemainPlateSaveReqVO> createReqVOS) {
         return success(remainPlateService.createRemainPlateMultiple(createReqVOS));
@@ -96,7 +96,7 @@ public class RemainPlateManageController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得生产单余料板表")
+    @Operation(summary = "获得订单余料板表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('manage:remain-plate:query')")
     public CommonResult<RemainPlateRespVO> getRemainPlate(@RequestParam("id") Long id) {
@@ -105,7 +105,7 @@ public class RemainPlateManageController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得生产单余料板表分页")
+    @Operation(summary = "获得订单余料板表分页")
     @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:query','placeorder:optimize','placeorder:remain-insert','production:manager-list:calculate')")
     public CommonResult<PageResult<RemainPlateRespVO>> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) {
         PageResult<RemainPlateDO> pageResult = remainPlateService.getRemainPlatePage(pageReqVO);
@@ -113,7 +113,7 @@ public class RemainPlateManageController {
     }
 
     @GetMapping("/pageAdd")
-    @Operation(summary = "获得生产单余料板可添加分页")
+    @Operation(summary = "获得订单余料板可添加分页")
     @PreAuthorize("@ss.hasPermission('manage:remain-plate:query')")
     public CommonResult<PageResult<RemainPlateRespVO>> getRemainPlatePageToAdd(@Valid RemainPlatePageReqVO pageReqVO) {
         PageResult<RemainPlateDO> pageResult = remainPlateService.getRemainPlatePageToAdd(pageReqVO);
@@ -121,7 +121,7 @@ public class RemainPlateManageController {
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出生产单余料板表Excel")
+    @Operation(summary = "导出订单余料板表Excel")
     @PreAuthorize("@ss.hasPermission('manage:remain-plate:export')")
     @OperateLog(type = EXPORT)
     public void exportRemainPlateExcel(@Valid RemainPlatePageReqVO pageReqVO,
@@ -129,7 +129,7 @@ public class RemainPlateManageController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<RemainPlateDO> list = remainPlateService.getRemainPlatePage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "生产单余料板表 order_remain_plate_{N}.xls", "数据", RemainPlateRespVO.class,
+        ExcelUtils.write(response, "订单余料板表 order_remain_plate_{N}.xls", "数据", RemainPlateRespVO.class,
                 BeanUtils.toBean(list, RemainPlateRespVO.class));
     }
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/remain/RemainPlatePageReqVO.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 
 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N}分页 Request VO")
+@Schema(description = "管理后台 - 订单余料板表 order_remain_plate_{N}分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/remain/RemainPlateRespVO.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N} Response VO")
+@Schema(description = "管理后台 - 订单余料板表 order_remain_plate_{N} Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class RemainPlateRespVO {

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/remain/RemainPlateSaveReqVO.java

@@ -12,7 +12,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 生产单余料板表 Request VO")
+@Schema(description = "管理后台 - 订单余料板表 Request VO")
 @Data
 public class RemainPlateSaveReqVO {
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/remain/RemainPlateUptReqVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 
 import java.util.Set;
 
-@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N} Response VO")
+@Schema(description = "管理后台 - 订单余料板表 order_remain_plate_{N} Response VO")
 @Data
 public class RemainPlateUptReqVO {
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/process/vo/ProcessPlateReqVO.java

@@ -15,7 +15,7 @@ public class ProcessPlateReqVO {
     private Long processType;
 
 
-    @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单号",requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
 
@@ -23,7 +23,7 @@ public class ProcessPlateReqVO {
 //    private Long stepItemId;
 
 
-    @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
+    @Schema(description = "订单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
     private Long processStepId;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/OrderPackageVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 生产单包裹表 Response VO")
+@Schema(description = "管理后台 - 订单包裹表 Response VO")
 @Data
 public class OrderPackageVO {
 
@@ -15,7 +15,7 @@ public class OrderPackageVO {
     @Schema(description = "主键-包裹ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
     @Schema(description = "自定义单号")
@@ -48,7 +48,7 @@ public class OrderPackageVO {
     @Schema(description = "包裹备注", requiredMode = Schema.RequiredMode.REQUIRED)
     private String packRemark;
 
-    @Schema(description = "生产单备注", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单备注", requiredMode = Schema.RequiredMode.REQUIRED)
     private String orderRemark;
 
     @Schema(description = "出库人", requiredMode = Schema.RequiredMode.REQUIRED)

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class PackageDetailsRespVO {
 
 
-    @Schema(description = "生产单ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String orderId;
 
     @Schema(description = "房间名称-板材类型显示", requiredMode = Schema.RequiredMode.REQUIRED)

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/productionStatus/OrderModuleVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 
 
-@Schema(description = "管理后台 - 生产单模块表 order_module_{N} Response VO")
+@Schema(description = "管理后台 - 订单模块表 order_module_{N} Response VO")
 @Data
 public class OrderModuleVO {
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/productionStatus/OrderPlatePageReqVO.java

@@ -10,7 +10,7 @@ import lombok.ToString;
 import java.util.List;
 
 
-@Schema(description = "管理后台 - 生产单表 order_{N} 分页 Request VO")
+@Schema(description = "管理后台 - 订单表 order_{N} 分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

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

@@ -29,7 +29,7 @@ import com.cf.imes.module.executor.controller.admin.module.vo.*;
 import com.cf.imes.module.executor.dal.dataobject.module.ModuleDO;
 import com.cf.imes.module.executor.service.module.ModuleService;
 
-@Tag(name = "管理后台 - 生产单模块")
+@Tag(name = "管理后台 - 订单模块")
 @RestController
 @RequestMapping("/executor/module")
 @Validated
@@ -39,14 +39,14 @@ public class ModuleController {
     private ModuleService moduleService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建生产单模块")
+    @Operation(summary = "创建订单模块")
     @PreAuthorize("@ss.hasPermission('executor:module:create')")
     public CommonResult<Long> createModule(@Valid @RequestBody ModuleSaveReqVO createReqVO) {
         return success(moduleService.createModule(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新生产单模块")
+    @Operation(summary = "更新订单模块")
     @PreAuthorize("@ss.hasPermission('executor:module:update')")
     public CommonResult<Boolean> updateModule(@Valid @RequestBody ModuleSaveReqVO updateReqVO) {
         moduleService.updateModule(updateReqVO);
@@ -54,7 +54,7 @@ public class ModuleController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除生产单模块")
+    @Operation(summary = "删除订单模块")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('executor:module:delete')")
     public CommonResult<Boolean> deleteModule(@RequestParam("id") Long id) {
@@ -63,7 +63,7 @@ public class ModuleController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得生产单模块")
+    @Operation(summary = "获得订单模块")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('executor:module:query')")
     public CommonResult<ModuleRespVO> getModule(@RequestParam("id") Long id) {
@@ -72,7 +72,7 @@ public class ModuleController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得生产单模块分页")
+    @Operation(summary = "获得订单模块分页")
     @PreAuthorize("@ss.hasPermission('executor:module:query')")
     public CommonResult<PageResult<ModuleRespVO>> getModulePage(@Valid ModulePageReqVO pageReqVO) {
         PageResult<ModuleDO> pageResult = moduleService.getModulePage(pageReqVO);
@@ -80,7 +80,7 @@ public class ModuleController {
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出生产单模块 Excel")
+    @Operation(summary = "导出订单模块 Excel")
     @PreAuthorize("@ss.hasPermission('executor:module:export')")
     @OperateLog(type = EXPORT)
     public void exportModuleExcel(@Valid ModulePageReqVO pageReqVO,
@@ -88,7 +88,7 @@ public class ModuleController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<ModuleDO> list = moduleService.getModulePage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "生产单模块.xls", "数据", ModuleRespVO.class,
+        ExcelUtils.write(response, "订单模块.xls", "数据", ModuleRespVO.class,
                         BeanUtils.toBean(list, ModuleRespVO.class));
     }
 

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

@@ -9,13 +9,13 @@ import java.time.LocalDateTime;
 
 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 生产单模块分页 Request VO")
+@Schema(description = "管理后台 - 订单模块分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ModulePageReqVO extends PageParam {
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderId;
 
     @Schema(description = "模块名称", example = "张三")

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

@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 生产单模块 Response VO")
+@Schema(description = "管理后台 - 订单模块 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class ModuleRespVO {
@@ -17,8 +17,8 @@ public class ModuleRespVO {
     @ExcelProperty("模块 ID")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("生产单号")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("订单号")
     private Long orderNo;
 
     @Schema(description = "模块名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")

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

@@ -5,15 +5,15 @@ import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 
-@Schema(description = "管理后台 - 生产单模块新增/修改 Request VO")
+@Schema(description = "管理后台 - 订单模块新增/修改 Request VO")
 @Data
 public class ModuleSaveReqVO {
 
     @Schema(description = "模块 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17730")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号不能为空")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号不能为空")
     private Long orderNo;
 
     @Schema(description = "模块名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java

@@ -63,7 +63,7 @@ import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.ge
 import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*;
 
 
-@Tag(name = "管理后台 - 生产单管理")
+@Tag(name = "管理后台 - 订单管理")
 @RestController
 @RequestMapping("/executor/order")
 @Validated
@@ -117,23 +117,23 @@ public class OrderController {
 
 
     @PostMapping("/create")
-    @Operation(summary = "创建生产单")
+    @Operation(summary = "创建订单")
     @PreAuthorize("@ss.hasPermission('production:manager-list:create')")
     public CommonResult<Long> createOrder(@Valid @RequestBody OrderSaveReqVO createReqVO) {
         return success(orderService.createOrder(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新生产单")
+    @Operation(summary = "更新订单")
     @PreAuthorize("@ss.hasPermission('production:manager-list:edit')")
     public CommonResult<Boolean> updateOrder(@Valid @RequestBody OrderSaveReqVO updateReqVO) {
         orderService.updateOrder(updateReqVO);
         return success(true);
     }
 
-    //    做生产单是否作废判断
+    //    做订单是否作废判断
     @GetMapping("/get")
-    @Operation(summary = "获得（单个）生产单")
+    @Operation(summary = "获得（单个）订单")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('productManager:List')")
     public CommonResult<OrderRespVO> getOrder(@RequestParam("id") Long id) {
@@ -141,24 +141,24 @@ public class OrderController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得生产单分页")
+    @Operation(summary = "获得订单分页")
     @PreAuthorize("@ss.hasPermission('productManager:List')")
     public CommonResult<PageResult<OrderRespVO>> getOrderPage(@Valid OrderPageReqVO pageReqVO) {
         return success(BeanUtils.toBean(orderService.getOrderPage(pageReqVO), OrderRespVO.class));
     }
 
     @GetMapping("/webcad/page")
-    @Operation(summary = "获得生产单分页")
+    @Operation(summary = "获得订单分页")
     public CommonResult<PageResult<OrderRespVO>> webCadGetOrderPage(@Valid OrderPageReqVO pageReqVO) {
         return success(BeanUtils.toBean(orderService.getOrderPage(pageReqVO), OrderRespVO.class));
     }
 
-    //    不做生产单是否作废判断
+    //    不做订单是否作废判断
     @GetMapping("/printing")
     @Operation(summary = "打印/导出 数据文件")
     @Parameters({
             @Parameter(name = "type", description = "文件类型", required = true, example = "0"),
-            @Parameter(name = "orderId", description = "生产单号", required = true, example = "1813119086461190144")
+            @Parameter(name = "orderId", description = "订单号", required = true, example = "1813119086461190144")
     })
     @PreAuthorize("@ss.hasPermission('production:manager-list:export')")
     @OperateLog(type = EXPORT)
@@ -169,7 +169,7 @@ public class OrderController {
 
     @DeleteMapping("/delete")
     @Operation(summary = "作废")
-    @Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
+    @Parameter(name = "orderId", description = "订单id", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('production:manager-list:nullify')")
     public CommonResult<Boolean> deleteOrder(@RequestParam("orderId") Long orderId) {
         Integer index = orderService.updateOrderDel(orderId, OrderDeletedEnum.DELETED.getStatus());
@@ -181,7 +181,7 @@ public class OrderController {
 
     @PutMapping("/restore")
     @Operation(summary = "还原")
-    @Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
+    @Parameter(name = "orderId", description = "订单id", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('production:manager-list:backOrder')")
     public CommonResult<Boolean> restoreOrder(@RequestBody JSONObject jsonObject) {
         Long orderId = jsonObject.getLong("orderId");
@@ -193,7 +193,7 @@ public class OrderController {
     }
 
     @GetMapping("/get-import-template")
-    @Operation(summary = "获得导入生产单模板")
+    @Operation(summary = "获得导入订单模板")
     @Parameter(name = "value", description = "文件类型", required = true, example = "0")
     public void importTemplate(HttpServletResponse response, @RequestParam("value") @NotEmpty(message = "文件路径不能为空") String value) {
         orderService.exportTemplate(response, value);
@@ -223,10 +223,10 @@ public class OrderController {
         return success(orderService.getApiOrderList(orderList));
     }
 
-    //    api-生产单导入
+    //    api-订单导入
     @GetMapping("getApiData")
-    @Operation(summary = "生产单api数据导入新增")
-    @OperateLog(module="管理后台 - 生产单管理",name = "生产单api数据导入新增",type = IMPORT)
+    @Operation(summary = "订单api数据导入新增")
+    @OperateLog(module="管理后台 - 订单管理",name = "订单api数据导入新增",type = IMPORT)
     @Parameter(name = "orderNo", description = "原订单号", required = true, example = "20230809027818")
     @PreAuthorize("@ss.hasPermission('production:manager-list:create')")
     public CommonResult<String> getApiData(@RequestParam(value = "orderNo") String orderNo) throws InterruptedException {
@@ -264,12 +264,12 @@ public class OrderController {
     }
 
     @PostMapping("/importFile")
-    @Operation(summary = "生产单文件导入新增/导入板材")
+    @Operation(summary = "订单文件导入新增/导入板材")
     @Parameters({
             @Parameter(name = "file", description = "文件", required = true),
             @Parameter(name = "type", description = "文件类型", required = true),
             @Parameter(name = "index", description = "导入范围 0:全部，1:板材，默认为全部", required = false),
-            @Parameter(name = "id", description = "生产单id", required = false)
+            @Parameter(name = "id", description = "订单id", required = false)
     })
     @OperateLog(type = IMPORT)
     @PreAuthorize("@ss.hasPermission('production:manager-list:create')")
@@ -309,7 +309,7 @@ public class OrderController {
                         orderDO = orderService.getOrder(orderId);
                         if (orderDO == null) {
                             mapOrder = new HashMap<>();
-                            mapOrder.put(ProduceExcelConstants.ORDER_CUSTOM_ORDER_NO, "---< 生产单号不存在 >---");
+                            mapOrder.put(ProduceExcelConstants.ORDER_CUSTOM_ORDER_NO, "---< 订单号不存在 >---");
                             flag = false;
                         }
                     }
@@ -344,7 +344,7 @@ public class OrderController {
 
                     if (index == 0){
                         if (orderXmlVO != null) {
-                            XmlCheckVO xmlCheckVO = xmlUtil.changeDate(orderXmlVO, getUserOrganId()); // 生产单数据格式验证
+                            XmlCheckVO xmlCheckVO = xmlUtil.changeDate(orderXmlVO, getUserOrganId()); // 订单数据格式验证
                             orderDO = xmlCheckVO.getOrderDO();
                             orderDO.setId((Long) snowFlakeGenerator.nextId(null));
                             flag = xmlCheckVO.getFlag();
@@ -352,7 +352,7 @@ public class OrderController {
                     } else {
                         orderDO = orderService.getOrder(orderId);
                         if (orderDO == null) {
-                            orderXmlVO = new OrderXmlVO().setMemo("---< 生产单号不存在 >---");
+                            orderXmlVO = new OrderXmlVO().setMemo("---< 订单号不存在 >---");
                             flag = false;
                         }
                     }
@@ -362,12 +362,12 @@ public class OrderController {
                         orderXmlVO = new OrderXmlVO().setMemo("文件内容解析为空");
                         flag = false;
                     } else if (orderDO == null) {
-                        orderXmlVO = new OrderXmlVO().setMemo("生产单内容为空");
+                        orderXmlVO = new OrderXmlVO().setMemo("订单内容为空");
                         flag = false;
                     } else if (orderDO.getCustomOrderNo() != null && !orderService.customOrderNoIsExists(orderDO.getCustomOrderNo())) {
                         orderXmlVO.setOrderCode(orderXmlVO.getOrderCode() + "---< 自定义单号重复 >---");
                         flag = false;
-                    } else if (flag){ // 生产单的内容正确
+                    } else if (flag){ // 订单的内容正确
                         if (orderXmlVO.getMaterialXmlVO() == null || orderXmlVO.getMaterialXmlVO().getPlateXmlVOS() == null ||
                                 orderXmlVO.getMaterialXmlVO().getPlateXmlVOS().getPlateXmlVOList() == null ||
                                 orderXmlVO.getMaterialXmlVO().getPlateXmlVOS().getPlateXmlVOList().size() == 0) {
@@ -413,11 +413,11 @@ public class OrderController {
     }
 
     @PostMapping("/import")
-    @Operation(summary = "生产单导入新增")
+    @Operation(summary = "订单导入新增")
     @Parameters({
             @Parameter(name = "file", description = "文件", required = true),
             @Parameter(name = "type", description = "文件类型", required = true),
-            @Parameter(name = "id", description = "生产单id")
+            @Parameter(name = "id", description = "订单id")
     })
     @OperateLog(type = IMPORT)
     @PreAuthorize("@ss.hasPermission('production:manager-list:create')")
@@ -429,11 +429,11 @@ public class OrderController {
     }
 
 
-    //    生产单详情
+    //    订单详情
     @GetMapping("/get-room")
-    @Operation(summary = "生产单详情-房间和柜体id")
+    @Operation(summary = "订单详情-房间和柜体id")
     @Parameters({
-            @Parameter(name = "orderId", description = "生产单编号", required = true, example = "1024"),
+            @Parameter(name = "orderId", description = "订单编号", required = true, example = "1024"),
             @Parameter(name = "deleted", description = "是否删除", example = "false")
     })
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
@@ -454,9 +454,9 @@ public class OrderController {
     }
 
     @GetMapping("/get-module")
-    @Operation(summary = "生产单详情-数量信息")
+    @Operation(summary = "订单详情-数量信息")
     @Parameters({
-            @Parameter(name = "orderId", description = "生产单编号", required = true, example = "1024"),
+            @Parameter(name = "orderId", description = "订单编号", required = true, example = "1024"),
             @Parameter(name = "deleted", description = "是否删除", example = "false")
     })
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
@@ -469,7 +469,7 @@ public class OrderController {
     }
 
     @PostMapping("/get-platesDetailsPage")
-    @Operation(summary = "生产单详情-板件详细信息(分页)")
+    @Operation(summary = "订单详情-板件详细信息(分页)")
     @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPlatesDetailReqVO>> platesDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
@@ -483,7 +483,7 @@ public class OrderController {
     }
 
     @PostMapping("/get-partsDetailsPage")
-    @Operation(summary = "生产单详情-配件详细信息(分页)")
+    @Operation(summary = "订单详情-配件详细信息(分页)")
     @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPartsRespVO>> partsDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
@@ -503,7 +503,7 @@ public class OrderController {
 
 
     @PostMapping("/get-goodsDetailsPage")
-    @Operation(summary = "生产单详情-板材详细信息(分页)")
+    @Operation(summary = "订单详情-板材详细信息(分页)")
     @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderGoodsDetailRespVO>> goodsDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
@@ -517,7 +517,7 @@ public class OrderController {
     }
 
     @PostMapping("/get-componentDetailsPage")
-    @Operation(summary = "生产单详情-组件详细信息(分页)")
+    @Operation(summary = "订单详情-组件详细信息(分页)")
     @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPartsRespVO>> componentDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
@@ -554,7 +554,7 @@ public class OrderController {
 
     @DeleteMapping("/realDeleted")
     @Operation(summary = "作废中删除")
-    @Parameter(name = "orderId", description = "生产单编号", required = true, example = "1024")
+    @Parameter(name = "orderId", description = "订单编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('production:manager-list:nullify')")
     public CommonResult<Boolean> realDeleted(@RequestParam("orderId") Long orderId) {
         orderService.realDeletedOrder(orderId);
@@ -562,17 +562,17 @@ public class OrderController {
     }
 
     //    统计
-    //    生产单超期（工作台）
+    //    订单超期（工作台）
     @GetMapping("/getOrderOverdue")
-    @Operation(summary = "生产单超期 （工作台）")
+    @Operation(summary = "订单超期 （工作台）")
     @PreAuthorize("@ss.hasPermission('homePage:work:be-overdue')")
     public CommonResult<PageResult<OrderOverdueRespVO>> getOrderOverdue(@Valid PageParam pageParam) {
         return success(orderService.getOrderOverdue(pageParam));
     }
 
-    //    生产单到期告警 （工作台）
+    //    订单到期告警 （工作台）
     @GetMapping("/getOrderWarn")
-    @Operation(summary = "生产单到期告警 （工作台）")
+    @Operation(summary = "订单到期告警 （工作台）")
     @PreAuthorize("@ss.hasPermission('homePage:work:completed-today')")
     public CommonResult<PageResult<OrderOverdueRespVO>> getOrderNear(@Valid PageParam pageParam) {
         return success(orderService.getOrderNear(pageParam));
@@ -583,8 +583,8 @@ public class OrderController {
 
 
     @GetMapping("/getAllData")
-    @Operation(summary = "获取生产单的所有数据")
-    public CommonResult<OrderAllData> getOrderAllData(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId,
+    @Operation(summary = "获取订单的所有数据")
+    public CommonResult<OrderAllData> getOrderAllData(@Schema(description = "订单id") @RequestParam(required = false) Long orderId,
                                                             @Schema(description = "排单id") @RequestParam(required = false) Long planId) {
 
         return CommonResult.success(orderService.getOrderAllData(orderId,planId));

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderStatisticsController.java

@@ -21,7 +21,7 @@ import static com.cf.imes.framework.common.pojo.CommonResult.success;
  * @author Gqr
  * @since 2024/8/5 17:00
  */
-@Tag(name = "管理后台 - 生产单统计管理")
+@Tag(name = "管理后台 - 订单统计管理")
 @RestController
 @RequestMapping("/executor/order/statistics")
 public class OrderStatisticsController {
@@ -29,28 +29,28 @@ public class OrderStatisticsController {
     private OrderStatisticsService orderStatisticsService;
 
     @GetMapping("/total")
-    @Operation(summary = "生产单总数")
+    @Operation(summary = "订单总数")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')")
     public CommonResult<Integer> getOrderCount() {
         return success(orderStatisticsService.orderCount());
     }
 
     @GetMapping("/today/increase")
-    @Operation(summary = "今日新增生产单总数")
+    @Operation(summary = "今日新增订单总数")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')")
     public CommonResult<Integer> getOrderCountToday() {
         return success(orderStatisticsService.orderCountToday());
     }
 
     @GetMapping("/today/finish")
-    @Operation(summary = "今日生产单完成总数")
+    @Operation(summary = "今日订单完成总数")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')")
     public CommonResult<Integer> getOrderCountTodayFinish() {
         return success(orderStatisticsService.orderCountTodayFinish());
     }
 
     @GetMapping("/producing/total")
-    @Operation(summary = "生产中生产单总数")
+    @Operation(summary = "生产中订单总数")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')")
     public CommonResult<Integer> getOrderCountProduce() {
         return success(orderStatisticsService.orderCountProduce());
@@ -64,21 +64,21 @@ public class OrderStatisticsController {
     }
 
     @GetMapping("/orderStatus/group")
-    @Operation(summary = "生产单状态分组统计")
+    @Operation(summary = "订单状态分组统计")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:order-status')")
     public CommonResult<Map<String, Object>> getOrderStatusCount(@Valid OrderStatisticsReqVO reqVO) {
         return success(orderStatisticsService.getOrderStatusCount(reqVO));
     }
 
     @GetMapping("/orderAndPlanCount/group")
-    @Operation(summary = "生产单、排单单量分组统计")
+    @Operation(summary = "订单、排单单量分组统计")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:orderAndPlan-count')")
     public CommonResult<Map<String, Object>> getOrderAndPlanCountGroup(@Valid OrderStatisticsReqVO reqVO) {
         return success(orderStatisticsService.getOrderAndPlanCountGroup(reqVO));
     }
 
     @GetMapping("/orderAndPlanArea/group")
-    @Operation(summary = "生产单、排单平方数分组统计")
+    @Operation(summary = "订单、排单平方数分组统计")
     @PreAuthorize("@ss.hasPermission('homePage:analysis:orderAndPlan-square-num')")
     public CommonResult<Map<String, Object>> getOrderAndPlanAreaGroup(@Valid OrderStatisticsReqVO reqVO) {
         return success(orderStatisticsService.getOrderAndPlanAreaSumGroup(reqVO));

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

@@ -3,7 +3,7 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-@Schema(description = "管理后台 - api生产单获取列表")
+@Schema(description = "管理后台 - api订单获取列表")
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -17,7 +17,7 @@ import java.util.List;
 public class LabelOrderPackData {
 
 
-    @Schema(description = "生产单id")
+    @Schema(description = "订单id")
     private Long orderNo;
 
 

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

@@ -16,7 +16,7 @@ public class LabelOrderPartsData {
     private Long partsId;
 
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderNo;
 
 

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

@@ -40,7 +40,7 @@ public class LabelOrderPlateData {
     private String bodyName;
 
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderId;
 
 
@@ -128,7 +128,7 @@ public class LabelOrderPlateData {
     private String customOrderNo;
 
 
-    @Schema(description = "生产单日期")
+    @Schema(description = "订单日期")
     private LocalDateTime orderDate;
 
 

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

@@ -22,7 +22,7 @@ public class OrderAllData {
     private PlanDO plan;
 
 
-    @Schema(description = "生产单信息")
+    @Schema(description = "订单信息")
     private List<LabelOrderData> orderList;
 
 

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

@@ -14,7 +14,7 @@ import java.util.Set;
 @NoArgsConstructor
 public class OrderBodyPageRespVO extends PageParam {
 
-    @Schema(description = "生产单号", example = "1024")
+    @Schema(description = "订单号", example = "1024")
     private Long orderId;
 
     @Schema(description = "房间编号", example = "1024")

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

@@ -23,7 +23,7 @@ import java.util.Set;
 @NoArgsConstructor
 public class OrderCadViewPlatePageReqVO extends PageParam {
 
-    @Schema(description = "生产单号", example = "1024")
+    @Schema(description = "订单号", example = "1024")
     @NotNull(message = "{order.cadview.plate.page.orderid.not.null}",groups = {OrderCadViewPageGroup.class})
     private Long orderId;
 

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

@@ -5,7 +5,7 @@ import lombok.*;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "分析页 - 生产单单量")
+@Schema(description = "分析页 - 订单单量")
 @Data
 @Builder
 @AllArgsConstructor
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class OrderCountProducePeriodRespVO {
 
-    @Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单日期", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime orderDate;
 
     @Schema(description = "订单数量")

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

@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 生产单板材表 order_parts_{N} Response VO")
+@Schema(description = "管理后台 - 订单板材表 order_parts_{N} Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderGoodsDetailRespVO {
@@ -13,7 +13,7 @@ public class OrderGoodsDetailRespVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
     @Schema(description = "客户的商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

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

@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 
-@Schema(description = "大板，小板，生产单ID合集")
+@Schema(description = "大板，小板，订单ID合集")
 @Data
 public class OrderGoodsPlateIds {
 
@@ -14,7 +14,7 @@ public class OrderGoodsPlateIds {
     private Long id;
 
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
 

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

@@ -56,7 +56,7 @@ public class OrderGoodsPlateRespVO implements Comparable<OrderGoodsPlateRespVO>
     @Schema(description = "面积")
     private BigDecimal orderArea;
 
-    @Schema(description = "生产单日期")
+    @Schema(description = "订单日期")
     private String orderDate;
 
     @Override

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

@@ -5,14 +5,14 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * 板材生产单关系表
+ * 板材订单关系表
  */
-@Schema(description = "管理后台 - 板材生产单关系表 order Response VO")
+@Schema(description = "管理后台 - 板材订单关系表 order Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderGoodsRespVO {
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230414026120")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230414026120")
     private Long orderId;
 
     @Schema(description = "房间Id", requiredMode = Schema.RequiredMode.REQUIRED)

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

@@ -8,7 +8,7 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 生产单异步导入 reqVO
+ * 订单异步导入 reqVO
  *
  * @author Gqr
  * @since 2025/1/8 17:05
@@ -21,7 +21,7 @@ public class OrderImportAsyncReqVO implements Serializable {
     private static final long serialVersionUID = -1237291692917676281L;
 
     /**
-     * 生产单id
+     * 订单id
      */
     Long orderId;
 

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

@@ -8,16 +8,16 @@ import java.util.List;
 import java.util.Map;
 
 
-@Schema(description = "管理后台 - 生产单导入 Response VO")
+@Schema(description = "管理后台 - 订单导入 Response VO")
 @Data
 @Builder
 public class OrderImportRespVO {
-    @Schema(description = "创建成功的生产单名数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建成功的订单名数组", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> createOrder;
 
-    @Schema(description = "更新成功的生产单名数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "更新成功的订单名数组", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> updateOrder;
 
-    @Schema(description = "导入失败的生产单集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "导入失败的订单集合，key 为订单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, String> failureOrder;
 }

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @author Gqr
  * @since 2026/1/27 15:52
  */
-@Schema(description = "管理后台 - 生产单模块详情 Response VO")
+@Schema(description = "管理后台 - 订单模块详情 Response VO")
 @Data
 public class OrderModuleDetailRespVO {
     @Schema(description = "模块列表")

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

@@ -13,7 +13,7 @@ import java.util.Set;
 @NoArgsConstructor
 public class OrderModuleParameterRespVO {
 
-    @Schema(description = "生产单号", example = "1024")
+    @Schema(description = "订单号", example = "1024")
     private Long orderId;
 
     @Schema(description = "房间编号", example = "1024")

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

@@ -4,12 +4,12 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 生产单表 order Response VO")
+@Schema(description = "管理后台 - 订单表 order Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderModuleRespVO {
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230414026120")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230414026120")
     private Long orderId;
 
     @Schema(description = "房间Id", requiredMode = Schema.RequiredMode.REQUIRED)

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

@@ -7,7 +7,7 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 生产单逾期列表")
+@Schema(description = "管理后台 - 订单逾期列表")
 @Data
 @Builder
 @AllArgsConstructor
@@ -15,25 +15,25 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class OrderOverdueRespVO {
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long id;
 
     @Schema(description = "父单号")
     private Long parentNo;
 
-    @Schema(description = "源生产单号")
+    @Schema(description = "源订单号")
     private String apiOrderId;
 
-    @Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单日期", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime orderDate;
 
     @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime deliveryDate;
 
-    @Schema(description = "生产单类型，1主单 2子单", example = "1")
+    @Schema(description = "订单类型，1主单 2子单", example = "1")
     private Integer orderType;
 
-    @Schema(description = "生产单排序号")
+    @Schema(description = "订单排序号")
     private Integer orderSort;
 
     @Schema(description = "CAD数据类型，1CAD 2WebCAD 3Excel", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

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

@@ -12,7 +12,7 @@ import jakarta.validation.constraints.Pattern;
 
 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 生产单表 order_{N}分页 Request VO")
+@Schema(description = "管理后台 - 订单表 order_{N}分页 Request VO")
 @Data
 @ToString(callSuper = true)
 @Builder
@@ -20,18 +20,18 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @NoArgsConstructor
 public class OrderPageReqVO extends PageParam {
 
-    @Schema(description = "生产单号")
-    @Pattern(regexp = "^[0-9]*$",message = "生产单号应为数字")
+    @Schema(description = "订单号")
+    @Pattern(regexp = "^[0-9]*$",message = "订单号应为数字")
     @Length(max = 19,message = "排单号长度不能超过19位")
     private String id;
 
     @Schema(description = "父单号")
     private Long parentNo;
 
-    @Schema(description = "源生产单号")
+    @Schema(description = "源订单号")
     private String apiOrderId;
 
-    @Schema(description = "生产单日期")
+    @Schema(description = "订单日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] orderDate;
 
@@ -39,10 +39,10 @@ public class OrderPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] deliveryDate;
 
-    @Schema(description = "生产单类型，1主单 2子单", example = "1")
+    @Schema(description = "订单类型，1主单 2子单", example = "1")
     private Integer orderType;
 
-    @Schema(description = "生产单排序号")
+    @Schema(description = "订单排序号")
     private Integer orderSort;
 
     @Schema(description = "CAD数据类型，1CAD 2WebCAD 3Excel", example = "1")

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

@@ -7,7 +7,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 生产单板件 Response VO")
+@Schema(description = "管理后台 - 订单板件 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderPlatesDetailReqVO {
@@ -15,7 +15,7 @@ public class OrderPlatesDetailReqVO {
     @Schema(description = "板件 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32523")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11087")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11087")
     Long orderId;
 
     @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰")

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

@@ -4,12 +4,12 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 生产单表 order Response VO")
+@Schema(description = "管理后台 - 订单表 order Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderPlatesDetailRespVO {
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230414026120")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230414026120")
     private Long orderId;
 
     @Schema(description = "房间Id", requiredMode = Schema.RequiredMode.REQUIRED)

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

@@ -6,37 +6,37 @@ import lombok.*;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 生产单表 order_{N} Response VO")
+@Schema(description = "管理后台 - 订单表 order_{N} Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderRespVO {
 
-    @Schema(description = "生产单号，主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15091")
-    @ExcelProperty("生产单号，主键")
+    @Schema(description = "订单号，主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15091")
+    @ExcelProperty("订单号，主键")
     private Long id;
 
     @Schema(description = "父单号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("父单号")
     private Long parentNo;
 
-    @Schema(description = "源生产单号")
+    @Schema(description = "源订单号")
     @ExcelProperty("父单号")
     private String apiOrderId;
 
-    @Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("生产单日期")
+    @Schema(description = "订单日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("订单日期")
     private LocalDateTime orderDate;
 
     @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("交付日期")
     private LocalDateTime deliveryDate;
 
-    @Schema(description = "生产单类型，1主单 2子单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("生产单类型，1主单 2子单")
+    @Schema(description = "订单类型，1主单 2子单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("订单类型，1主单 2子单")
     private Integer orderType;
 
-    @Schema(description = "生产单排序号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("生产单排序号")
+    @Schema(description = "订单排序号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("订单排序号")
     private Integer orderSort;
 
     @Schema(description = "CAD数据类型，1CAD 2WebCAD 3Excel", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

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

@@ -10,7 +10,7 @@ import jakarta.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 生产单表 order_{N}新增/修改 Request VO")
+@Schema(description = "管理后台 - 订单表 order_{N}新增/修改 Request VO")
 @Data
 public class OrderSaveReqVO {
 
@@ -19,21 +19,21 @@ public class OrderSaveReqVO {
     @Schema(description = "父单号")
     private Long parentNo;
 
-    @Schema(description = "源生产单号")
+    @Schema(description = "源订单号")
     private String apiOrderId;
 
-    @Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单日期不能为空")
+    @Schema(description = "订单日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单日期不能为空")
     private LocalDateTime orderDate;
 
     @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "交付日期不能为空")
     private LocalDateTime deliveryDate;
 
-    @Schema(description = "生产单类型，1主单 2子单", example = "1")
+    @Schema(description = "订单类型，1主单 2子单", example = "1")
     private Integer orderType;
 
-    @Schema(description = "生产单排序号")
+    @Schema(description = "订单排序号")
     private Integer orderSort;
 
     @Schema(description = "数据类型，0文件导入 1API 2数据源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

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

@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
 
-@Schema(description = "管理后台 - 生产单平方数统计")
+@Schema(description = "管理后台 - 订单平方数统计")
 @Data
 @Builder
 @AllArgsConstructor
@@ -20,7 +20,7 @@ public class OrderStatisticsAreaRespVO implements Comparable<OrderStatisticsArea
     @Schema(description = "订单平方数")
     private BigDecimal areaSum;
 
-    @Schema(description = "生产单时间")
+    @Schema(description = "订单时间")
     private String date;
 
     @Override

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

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import org.jetbrains.annotations.NotNull;
 
-@Schema(description = "管理后台 - 生产单是否有效统计")
+@Schema(description = "管理后台 - 订单是否有效统计")
 @Data
 @Builder
 @AllArgsConstructor
@@ -18,7 +18,7 @@ public class OrderStatisticsIsLapseRespVO implements Comparable<OrderStatisticsI
     @Schema(description = "订单数量")
     private Integer orderCount;
 
-    @Schema(description = "生产单时间")
+    @Schema(description = "订单时间")
     private String date;
 
     @Schema(description = "是否删除")

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

@@ -8,7 +8,7 @@ import lombok.Data;
  * @author Gqr
  * @since 2024/8/5 17:10
  */
-@Schema(description = "管理后台 - 生产单统计 Request VO")
+@Schema(description = "管理后台 - 订单统计 Request VO")
 @Data
 public class OrderStatisticsReqVO extends CommonStatisticsReqVO {
     @Schema(description = "组织id")

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

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import org.jetbrains.annotations.NotNull;
 
-@Schema(description = "管理后台 - 生产单状态统计")
+@Schema(description = "管理后台 - 订单状态统计")
 @Data
 @Builder
 @AllArgsConstructor
@@ -17,7 +17,7 @@ public class OrderStatisticsStatusRespVO implements Comparable<OrderStatisticsSt
     @Schema(description = "订单数量")
     private Integer orderCount;
 
-    @Schema(description = "生产单时间")
+    @Schema(description = "订单时间")
     private String date;
 
     @Override

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/product/OrderBodyRespVO.java

@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 生产单柜体 Response VO")
+@Schema(description = "管理后台 - 订单柜体 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderBodyRespVO {
@@ -15,8 +15,8 @@ public class OrderBodyRespVO {
     @ExcelProperty("柜体 ID")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11075")
-    @ExcelProperty("生产单号")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11075")
+    @ExcelProperty("订单号")
     private Long orderId;
 
     @Schema(description = "房间ID,后端生成", requiredMode = Schema.RequiredMode.REQUIRED, example = "26936")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/product/OrderRoomBodyRespVO.java

@@ -4,7 +4,7 @@ package com.cf.imes.module.executor.controller.admin.order.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 生产单房间和柜体信息")
+@Schema(description = "管理后台 - 订单房间和柜体信息")
 @Data
 public class OrderRoomBodyRespVO {
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/OrderImportTaskController.java

@@ -18,7 +18,7 @@ import jakarta.validation.Valid;
  * @author Gqr
  * @since 2025/5/15 9:19
  */
-@Tag(name = "管理后台 - 生产单导入任务管理")
+@Tag(name = "管理后台 - 订单导入任务管理")
 @RestController
 @RequestMapping("/executor/order/task")
 public class OrderImportTaskController {
@@ -27,7 +27,7 @@ public class OrderImportTaskController {
     private OrderImportTaskService orderImportTaskService;
 
     @GetMapping("")
-    @Operation(summary = "生产单导入任务查询")
+    @Operation(summary = "订单导入任务查询")
     public CommonResult<PageResult<OrderImportTaskRespVO>> webCadOrderImport(@Valid OrderImportTaskPageReqVO reqVO) {
         return CommonResult.success(orderImportTaskService.getPage(reqVO));
     }

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

@@ -17,7 +17,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
  * @author Gqr
  * @since 2025/5/15 9:33
  */
-@Schema(description = "管理后台 - 生产单导入任务分页 Request VO")
+@Schema(description = "管理后台 - 订单导入任务分页 Request VO")
 @Data
 @ToString(callSuper = true)
 @Builder
@@ -25,7 +25,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @NoArgsConstructor
 public class OrderImportTaskPageReqVO extends PageParam {
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderId;
 
     @Schema(description = "创建时间")

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

@@ -9,13 +9,13 @@ import java.time.LocalDateTime;
  * @author Gqr
  * @since 2025/5/15 10:15
  */
-@Schema(description = "管理后台 - 生产单导入任务 Response VO")
+@Schema(description = "管理后台 - 订单导入任务 Response VO")
 @Data
 public class OrderImportTaskRespVO {
     @Schema(description = "任务号")
     private Long id;
 
-    @Schema(description = "关联生产单号")
+    @Schema(description = "关联订单号")
     private Long orderId;
 
     @Schema(description = "导入文件名")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/OrderPartsController.java

@@ -29,7 +29,7 @@ import com.cf.imes.module.executor.controller.admin.orderParts.vo.*;
 import com.cf.imes.module.executor.dal.dataobject.orderParts.OrderPartsDO;
 import com.cf.imes.module.executor.service.orderParts.OrderPartsService;
 
-@Tag(name = "管理后台 - 生产单配件表")
+@Tag(name = "管理后台 - 订单配件表")
 @RestController
 @RequestMapping("/executor/order-parts")
 @Validated
@@ -39,14 +39,14 @@ public class OrderPartsController {
     private OrderPartsService orderPartsService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建生产单配件")
+    @Operation(summary = "创建订单配件")
     @PreAuthorize("@ss.hasPermission('executor:order-parts:create')")
     public CommonResult<Long> createOrderParts(@Valid @RequestBody OrderPartsSaveReqVO createReqVO) {
         return success(orderPartsService.createOrderParts(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新生产单配件")
+    @Operation(summary = "更新订单配件")
     @PreAuthorize("@ss.hasPermission('executor:order-parts:update')")
     public CommonResult<Boolean> updateOrderParts(@Valid @RequestBody OrderPartsSaveReqVO updateReqVO) {
         orderPartsService.updateOrderParts(updateReqVO);
@@ -54,7 +54,7 @@ public class OrderPartsController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除生产单配件")
+    @Operation(summary = "删除订单配件")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('executor:order-parts:delete')")
     public CommonResult<Boolean> deleteOrderParts(@RequestParam("id") Long id) {
@@ -63,7 +63,7 @@ public class OrderPartsController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得生产单配件")
+    @Operation(summary = "获得订单配件")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('executor:order-parts:query')")
     public CommonResult<OrderPartsRespVO> getOrderParts(@RequestParam("id") Long id) {
@@ -72,7 +72,7 @@ public class OrderPartsController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得生产单配件分页")
+    @Operation(summary = "获得订单配件分页")
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPartsRespVO>> getOrderPartsPage(@Valid OrderPartsPageReqVO pageReqVO) {
         PageResult<OrderPartsDO> pageResult = orderPartsService.getOrderPartsPage(pageReqVO);
@@ -80,7 +80,7 @@ public class OrderPartsController {
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出生产单配件 Excel")
+    @Operation(summary = "导出订单配件 Excel")
     @PreAuthorize("@ss.hasPermission('executor:order-parts:export')")
     @OperateLog(type = EXPORT)
     public void exportOrderPartsExcel(@Valid OrderPartsPageReqVO pageReqVO,
@@ -88,20 +88,20 @@ public class OrderPartsController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<OrderPartsDO> list = orderPartsService.getOrderPartsPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "生产单配件表 order_parts_{N}.xls", "数据", OrderPartsRespVO.class,
+        ExcelUtils.write(response, "订单配件表 order_parts_{N}.xls", "数据", OrderPartsRespVO.class,
                         BeanUtils.toBean(list, OrderPartsRespVO.class));
     }
 
-//    批量查询有生产单号id、房间id，柜体id的板材
+//    批量查询有订单号id、房间id，柜体id的板材
     @GetMapping("getPartsByOrderId")
-    @Operation(summary = "批量查询有生产单号id、房间id，柜体id的板材")
+    @Operation(summary = "批量查询有订单号id、房间id，柜体id的板材")
     @PreAuthorize("@ss.hasPermission('executor:plate:getPlatesByOrderId')")
     public  CommonResult<PageResult<PartGoodsRespVO>> getPPartsByOrderId(@Valid PlateTermsPageReqVO pageVO) {
         return success(orderPartsService.getPartsPageByTerms(pageVO));
     }
 
     @GetMapping("/getWithRoomAndBody")
-    @Operation(summary = "获得房间柜体下的生产单配件")
+    @Operation(summary = "获得房间柜体下的订单配件")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('executor:order-parts:query')")
     public CommonResult<List<PartGoodsRespVO>> getWithRoomAndBody(@RequestParam("id") Long id) {

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

@@ -19,6 +19,6 @@ public class OrderPartsImportRespVO {
     @Schema(description = "更新成功的生产配件数组", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> updateOrderParts;
 
-    @Schema(description = "导入失败的生产配件集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "导入失败的生产配件集合，key 为订单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, String> failureOrderParts;
 }

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

@@ -9,13 +9,13 @@ import java.time.LocalDateTime;
 
 import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 生产单配件表 order_parts_{N}分页 Request VO")
+@Schema(description = "管理后台 - 订单配件表 order_parts_{N}分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class OrderPartsPageReqVO extends PageParam {
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderId;
 
     @Schema(description = "商品ID", example = "1195")

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

@@ -7,7 +7,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@Schema(description = "管理后台 - 生产单配件 备注信息")
+@Schema(description = "管理后台 - 订单配件 备注信息")
 @Data
 @Builder
 @AllArgsConstructor
@@ -17,10 +17,10 @@ public class OrderPartsRemark extends ESDocument {
     @Schema(description = "配件 ID")
     private Long partsId;
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long orderId;
 
-    @Schema(description = "生产单号")
+    @Schema(description = "订单号")
     private Long batchId;
 
     @Schema(description = "备注")

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

@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 生产单配件表 order_parts_{N} Response VO")
+@Schema(description = "管理后台 - 订单配件表 order_parts_{N} Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OrderPartsRespVO {
@@ -17,8 +17,8 @@ public class OrderPartsRespVO {
     @ExcelProperty("配件 ID")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("生产单号")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("订单号")
     private Long orderId;
 
     @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1195")

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

@@ -5,15 +5,15 @@ import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 
-@Schema(description = "管理后台 - 生产单配件表 order_parts_{N}新增/修改 Request VO")
+@Schema(description = "管理后台 - 订单配件表 order_parts_{N}新增/修改 Request VO")
 @Data
 public class OrderPartsSaveReqVO {
 
     @Schema(description = "配件 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29347")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产单号不能为空")
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单号不能为空")
     private Long orderId;
 
     @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1195")

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

@@ -30,7 +30,7 @@ public class PartGoodsRespVO {
     @Schema(description = "配件 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29347")
     private Long id;
 
-    @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long orderId;
 
     @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1195")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java

@@ -30,7 +30,7 @@ import static com.cf.imes.framework.common.pojo.CommonResult.success;
  * @author Gqr
  * @since 2026/1/28 9:27
  */
-@Tag(name = "管理后台 - 生产单部件管理")
+@Tag(name = "管理后台 - 订单部件管理")
 @RestController
 @RequestMapping("/executor/order/component")
 @Validated

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 生产单部件列表 order component Response VO")
+@Schema(description = "管理后台 - 订单部件列表 order component Response VO")
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class OrderComponentRespVO {

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

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
 
-@Schema(description = "管理后台 - 生产单部件板件详情 - 部件树 order component Response VO")
+@Schema(description = "管理后台 - 订单部件板件详情 - 部件树 order component Response VO")
 @Data
 public class OrderComponentTreeRespVO {
 

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

@@ -65,9 +65,9 @@ public class OptimizePlanController {
 
 
     @GetMapping("/getOrderSource")
-    @Operation(summary = "获取生产单源数据")
+    @Operation(summary = "获取订单源数据")
     @PreAuthorize("@ss.hasAnyPermissions('placeorder:optimize','production:manager-list:calculate','manage:order-plan:process-scheme','producePlan:order-plan:process-scheme','producePlan:optimize')")
-    public CommonResult<OrderSource> getOrderSource(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId,
+    public CommonResult<OrderSource> getOrderSource(@Schema(description = "订单id") @RequestParam(required = false) Long orderId,
                                                     @Schema(description = "排单id") @RequestParam(required = false) Long planId,
                                                     @Schema(description = "机台Id")  @RequestParam(required = false) Long machineId
     ) {
@@ -139,8 +139,8 @@ public class OptimizePlanController {
 
 
     @GetMapping("/getPlateModel")
-    @Operation(summary = "查询当前生产单的板材造型信息")
-    @Parameter(name = "orderId", description = "生产单Id", required = true)
+    @Operation(summary = "查询当前订单的板材造型信息")
+    @Parameter(name = "orderId", description = "订单Id", required = true)
 //    @PreAuthorize("@ss.hasAnyPermissions('manage:pack:query','manage:pack:pre-pack')")
     public CommonResult<List<OrderModelDO>> getPlateModel (@Valid @RequestParam("orderId") Long orderId) {
 

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

@@ -83,7 +83,7 @@ public class PlanController {
     }
 
     @GetMapping("getOrderByPlan")
-    @Operation(summary = "根据排单获取生产单分页")
+    @Operation(summary = "根据排单获取订单分页")
     @PreAuthorize("@ss.hasAnyPermissions('placeorder:query','placeorder:priority','producePlan:query')")
     public CommonResult<PageResult<OrderRespVO>> getOrderByPlanId(@Valid PlanOrderPageReqVO pageReqVO) {
         return success(planService.getOrderByPlanId(pageReqVO));
@@ -121,7 +121,7 @@ public class PlanController {
 
 
     @GetMapping("getNotPlanOrderListPage")
-    @Operation(summary = "获取未排单的生产单分页列表")
+    @Operation(summary = "获取未排单的订单分页列表")
     @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
     public CommonResult<PageResult<OrderRespVOCopy>> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) {
         return success(planService.getOrderPage(pageReqVO));
@@ -176,10 +176,10 @@ public class PlanController {
 
 
     @GetMapping("getOrderRoomBodyList")
-    @Operation(summary = "获取未排单的生产单的柜体和房间名称")
-    @Parameter(name = "orderIds", description = "生产单ID", required = true)
+    @Operation(summary = "获取未排单的订单的柜体和房间名称")
+    @Parameter(name = "orderIds", description = "订单ID", required = true)
     @PreAuthorize("@ss.hasPermission('unplannedOrders:query')")
-    public CommonResult<List<OrderRoomBodyList>> getOrderRoomBody(@Valid @NotEmpty(message = "生产单ID不能为空") @RequestParam List<Long> orderIds) {
+    public CommonResult<List<OrderRoomBodyList>> getOrderRoomBody(@Valid @NotEmpty(message = "订单ID不能为空") @RequestParam 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/bo/OrderIds.java

@@ -14,7 +14,7 @@ public class OrderIds {
     private Long id;
 
 
-    @Schema(description = "生产单ID")
+    @Schema(description = "订单ID")
     private Long orderId;
 
 

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

@@ -10,7 +10,7 @@ import java.util.List;
 public class OrderRoomBodyList {
 
 
-    @Schema(description = "生产单ID")
+    @Schema(description = "订单ID")
     private Long orderId;
 
 

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

@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * @author Beal
- * 生产单源数据对象
+ * 订单源数据对象
  */
 @Data
 @Builder
@@ -46,7 +46,7 @@ public class OrderSource {
     private PlanDO plan;
 
 
-    @Schema(description = "生产单列表")
+    @Schema(description = "订单列表")
     private List<OrderDO> orderList;
 
 
@@ -62,15 +62,15 @@ public class OrderSource {
     private List<OrderModelDO> plateModels;
 
 
-    @Schema(description = "生产单配件信息")
+    @Schema(description = "订单配件信息")
     private List<PrintOrderPartsRespVO> orderPartsRespVOS;
 
 
-    @Schema(description = "生产单配件的备注信息")
+    @Schema(description = "订单配件的备注信息")
     private List<OrderPartsRemark> orderPartsRemarks;
 
 
-    @Schema(description = "生产单包裹信息")
+    @Schema(description = "订单包裹信息")
     private List<PrintOrderPackReqVO> orderPackReqVOS;
 
 

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

@@ -11,10 +11,10 @@ import java.math.BigDecimal;
 public class ProcessStepAreaIds {
 
 
-    // 生产单工序步骤ID
+    // 订单工序步骤ID
     private Long processStepId;
 
-    // 生产单工序步骤对应的板件面积
+    // 订单工序步骤对应的板件面积
     private BigDecimal area;
 
 }