diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderPlateCutStatusEnum.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderPlateCutStatusEnum.java index 5ac1bfee2..084f6873f 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderPlateCutStatusEnum.java +++ b/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 diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/PlanTypeEnum.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/PlanTypeEnum.java index b9824ed2b..bfb03a3f4 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/PlanTypeEnum.java +++ b/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; diff --git a/cf-framework/cf-spring-boot-starter-mq/src/main/java/com/cf/imes/framework/mq/rabbitmq/constant/RabbitMqConstants.java b/cf-framework/cf-spring-boot-starter-mq/src/main/java/com/cf/imes/framework/mq/rabbitmq/constant/RabbitMqConstants.java index 4b511d947..f1f3e4bc7 100644 --- a/cf-framework/cf-spring-boot-starter-mq/src/main/java/com/cf/imes/framework/mq/rabbitmq/constant/RabbitMqConstants.java +++ b/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"; } diff --git a/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/constants/RedisKeyConstants.java b/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/constants/RedisKeyConstants.java index 5107c089b..d0ba1caa9 100644 --- a/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/constants/RedisKeyConstants.java +++ b/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"; diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/customplateno/OrderCustomPlateNoApi.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/customplateno/OrderCustomPlateNoApi.java index 1393cd50a..8058a61b0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/customplateno/OrderCustomPlateNoApi.java +++ b/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 resetOrderSeq(@RequestBody CustomPlateNoRuleDTO ruleDTO); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApi.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApi.java index 81a2da878..bbf879878 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApi.java +++ b/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 getOrderProcessByProcessGroupId(@RequestParam("processGroupId") Long id); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/OrderComponentApi.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/OrderComponentApi.java index 6647bc48a..254c579d3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/OrderComponentApi.java +++ b/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> getOrderComponentList(@RequestBody OrderComponentListReqDTO dto); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListReqDTO.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListReqDTO.java index c4e21045b..2c9b2cc6d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListReqDTO.java +++ b/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 orderIds; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListRespDTO.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListRespDTO.java index 0695de4f7..d1dfdba65 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/ordercomponent/dto/OrderComponentListRespDTO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApi.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApi.java index e628beed7..5a9c67616 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApi.java +++ b/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 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); diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/dto/PlanDTO.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/dto/PlanDTO.java index eafb4a7a7..668c9e38e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/dto/PlanDTO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java index 9fdf20c8b..eb628b3d6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java +++ b/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 ============ diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportConstants.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportConstants.java index 4c4b7f9a2..f39ecf847 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportConstants.java +++ b/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 diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportStatusEnum.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportStatusEnum.java index 339116ef0..0a47d2c73 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportStatusEnum.java +++ b/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 diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTaskStatusEnum.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTaskStatusEnum.java index 9cdf46240..c16d3e978 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTaskStatusEnum.java +++ b/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 diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTmpDataTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTmpDataTypeEnum.java index 3e8f2c847..b570d7300 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTmpDataTypeEnum.java +++ b/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 diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTypeEnum.java index 1ee48f06d..34ab8a99c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderImportTypeEnum.java +++ b/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 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/plan/vo/OrderGroupRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/plan/vo/OrderGroupRespVO.java index d3d9568f3..316eb7a9a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/plan/vo/OrderGroupRespVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/GoodsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/GoodsController.java index 974b6351c..3ad23b03d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/GoodsController.java +++ b/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 createGoods(@Valid @RequestBody List createReqVOS) { return success(goodsService.createCorrespondsGoods(createReqVOS)); } @PutMapping("/update") - @Operation(summary = "修改对应生产单商品") + @Operation(summary = "修改对应订单商品") @PreAuthorize("@ss.hasPermission('executor:goods:update')") public CommonResult 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 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 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> getGoodsPage(@Valid GoodsPageReqVO pageReqVO) { PageResult pageResult = goodsService.getGoodsPage(pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsPageReqVO.java index 558e05694..215dd7d5e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsPageReqVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsRespVO.java index ecea752ee..952de4e81 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsSaveReqVO.java index 01b121ee6..82cc89bfe 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/goods/vo/GoodsSaveReqVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java index ecb40734e..0cd1b609b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java +++ b/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> 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> getOrdersPlateList(@Valid @RequestParam("orderIds") List 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> selectPack(@Valid @RequestParam("orderId") Long orderId) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/prePack/PrePackReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/prePack/PrePackReqVO.java index 31baf517a..7f503fcc5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/prePack/PrePackReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/DeleteOtherPartsReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/DeleteOtherPartsReqVO.java index 26f3ab0de..07cfa9634 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/DeleteOtherPartsReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackReqVO.java index fec2d03f0..778c878c5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackRespVO.java index 7b787863c..30723f3df 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPackRespVO.java +++ b/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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsReqVO.java index 40991cbc2..3f1dfe329 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPlateDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPlateDetailsRespVO.java index 6398b9265..7367d50da 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPlateDetailsRespVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OtherPackReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OtherPackReqVO.java index a85b87d16..60c3160e4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OtherPackReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackPageReqVO.java index 60c0320bc..d15db4a93 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackPageReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackReqVO.java index 2efad7501..3807afb46 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java index b063d0a12..74fb4b8f2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java +++ b/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 plateIdList; - @Schema(description = "生产单对应的包裹ID集") + @Schema(description = "订单对应的包裹ID集") private List packIdList; -// @Schema(description = "生产单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED) +// @Schema(description = "订单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED) // List plateDetailsRespVO; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackageDetailsReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackageDetailsReqVO.java index a2532139d..a9a123652 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackageDetailsReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java index 86f6e22b5..9a161ddcc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java +++ b/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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PrintOrderPackReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PrintOrderPackReqVO.java index a9df859a4..3ab573b5d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PrintOrderPackReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/RemainPlateManageController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/RemainPlateManageController.java index a95e98661..924cfa799 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/RemainPlateManageController.java +++ b/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 createRemainPlateMultiple(@Valid @RequestBody Set 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 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> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) { PageResult 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> getRemainPlatePageToAdd(@Valid RemainPlatePageReqVO pageReqVO) { PageResult 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 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)); } diff --git a/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 b/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 index 1c94a627b..ed34d32f7 100644 --- a/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 +++ b/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) diff --git a/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 b/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 index d64349b2e..6e0f7e60c 100644 --- a/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 +++ b/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 { diff --git a/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 b/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 index c162d282b..ce9c103f7 100644 --- a/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 +++ b/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 { diff --git a/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 b/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 index f44cd4b08..7220ec79c 100644 --- a/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 +++ b/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 { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/process/vo/ProcessPlateReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/process/vo/ProcessPlateReqVO.java index 21d7fb724..431140329 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/process/vo/ProcessPlateReqVO.java +++ b/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; diff --git a/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 b/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 index bd982749d..c99ec6f68 100644 --- a/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 +++ b/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) diff --git a/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 b/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 index 10188c599..662bf9ded 100644 --- a/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 +++ b/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) diff --git a/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 b/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 index b3f21d151..6a2fc0e32 100644 --- a/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 +++ b/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 { diff --git a/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 b/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 index 907ab4dc8..2be000d20 100644 --- a/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 +++ b/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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/ModuleController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/ModuleController.java index 521883586..9329132b5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/ModuleController.java +++ b/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 createModule(@Valid @RequestBody ModuleSaveReqVO createReqVO) { return success(moduleService.createModule(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新生产单模块") + @Operation(summary = "更新订单模块") @PreAuthorize("@ss.hasPermission('executor:module:update')") public CommonResult 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 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 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> getModulePage(@Valid ModulePageReqVO pageReqVO) { PageResult 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 list = moduleService.getModulePage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "生产单模块.xls", "数据", ModuleRespVO.class, + ExcelUtils.write(response, "订单模块.xls", "数据", ModuleRespVO.class, BeanUtils.toBean(list, ModuleRespVO.class)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModulePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModulePageReqVO.java index 7775e4f09..f2b5381d4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModulePageReqVO.java +++ b/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 = "张三") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModuleRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModuleRespVO.java index cd9037253..24d42518b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModuleRespVO.java +++ b/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 = "张三") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModuleSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModuleSaveReqVO.java index e38da1cb6..05216231b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/module/vo/ModuleSaveReqVO.java +++ b/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 = "张三") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index b7c8a98f4..baee40d58 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/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 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 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 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> getOrderPage(@Valid OrderPageReqVO pageReqVO) { return success(BeanUtils.toBean(orderService.getOrderPage(pageReqVO), OrderRespVO.class)); } @GetMapping("/webcad/page") - @Operation(summary = "获得生产单分页") + @Operation(summary = "获得订单分页") public CommonResult> 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 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 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 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> 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> 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> 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> 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 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> getOrderOverdue(@Valid PageParam pageParam) { return success(orderService.getOrderOverdue(pageParam)); } - // 生产单到期告警 （工作台） + // 订单到期告警 （工作台） @GetMapping("/getOrderWarn") - @Operation(summary = "生产单到期告警 （工作台）") + @Operation(summary = "订单到期告警 （工作台）") @PreAuthorize("@ss.hasPermission('homePage:work:completed-today')") public CommonResult> getOrderNear(@Valid PageParam pageParam) { return success(orderService.getOrderNear(pageParam)); @@ -583,8 +583,8 @@ public class OrderController { @GetMapping("/getAllData") - @Operation(summary = "获取生产单的所有数据") - public CommonResult getOrderAllData(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId, + @Operation(summary = "获取订单的所有数据") + public CommonResult getOrderAllData(@Schema(description = "订单id") @RequestParam(required = false) Long orderId, @Schema(description = "排单id") @RequestParam(required = false) Long planId) { return CommonResult.success(orderService.getOrderAllData(orderId,planId)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderStatisticsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderStatisticsController.java index f2d8b9549..660cd671c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderStatisticsController.java +++ b/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 getOrderCount() { return success(orderStatisticsService.orderCount()); } @GetMapping("/today/increase") - @Operation(summary = "今日新增生产单总数") + @Operation(summary = "今日新增订单总数") @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')") public CommonResult getOrderCountToday() { return success(orderStatisticsService.orderCountToday()); } @GetMapping("/today/finish") - @Operation(summary = "今日生产单完成总数") + @Operation(summary = "今日订单完成总数") @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')") public CommonResult getOrderCountTodayFinish() { return success(orderStatisticsService.orderCountTodayFinish()); } @GetMapping("/producing/total") - @Operation(summary = "生产中生产单总数") + @Operation(summary = "生产中订单总数") @PreAuthorize("@ss.hasPermission('homePage:analysis:order-statistic')") public CommonResult 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> 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> 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> getOrderAndPlanAreaGroup(@Valid OrderStatisticsReqVO reqVO) { return success(orderStatisticsService.getOrderAndPlanAreaSumGroup(reqVO)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/ApiOrderRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/ApiOrderRespVO.java index ad6909160..4bb7ea8d3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/ApiOrderRespVO.java +++ b/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 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPackData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPackData.java index 96cd960d4..c0f6dfb48 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPackData.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java index b688ea056..7a253b2d2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java index f88b382df..f60b34874 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderAllData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderAllData.java index de29d7eda..1a6ca47c1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderAllData.java +++ b/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 orderList; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyPageRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyPageRespVO.java index fe5cc0686..8ae2bdb24 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyPageRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java index 47d044619..ed858d3ae 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCountProducePeriodRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCountProducePeriodRespVO.java index 44d8736d6..c1989bda4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCountProducePeriodRespVO.java +++ b/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 = "订单数量") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsDetailRespVO.java index f8b176210..5a2f2ff9d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsDetailRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsPlateIds.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsPlateIds.java index ce5b3d6d0..ee7c268c9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsPlateIds.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsPlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsPlateRespVO.java index 27645b32f..5ca92bdec 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsPlateRespVO.java +++ b/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 @Schema(description = "面积") private BigDecimal orderArea; - @Schema(description = "生产单日期") + @Schema(description = "订单日期") private String orderDate; @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsRespVO.java index 6b11a79a7..667c3ad95 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderGoodsRespVO.java +++ b/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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportAsyncReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportAsyncReqVO.java index 8820fb9d3..421931baa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportAsyncReqVO.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportRespVO.java index cf6233fc8..953abb834 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportRespVO.java +++ b/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 createOrder; - @Schema(description = "更新成功的生产单名数组", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "更新成功的订单名数组", requiredMode = Schema.RequiredMode.REQUIRED) private List updateOrder; - @Schema(description = "导入失败的生产单集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "导入失败的订单集合，key 为订单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) private Map failureOrder; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleDetailRespVO.java index 191af47ec..507c784a8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleDetailRespVO.java +++ b/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 = "模块列表") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleParameterRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleParameterRespVO.java index 654d8f6e3..59f4787f0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleParameterRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleRespVO.java index de9dfb4c4..52890af85 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderModuleRespVO.java +++ b/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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderOverdueRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderOverdueRespVO.java index d3919cf22..c21701346 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderOverdueRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java index ac38fd376..d0d5a34a0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java index 04b748360..c578b4a17 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java +++ b/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 = "晨丰") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailRespVO.java index ef37c2803..92bb4d26b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailRespVO.java +++ b/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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java index 69aabf4ea..79d2f31ef 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java index fe2e9cf5b..bce3977bb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatisticsAreaRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatisticsAreaRespVO.java index 127e3b727..c17eebe5d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatisticsAreaRespVO.java +++ b/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> webCadOrderImport(@Valid OrderImportTaskPageReqVO reqVO) { return CommonResult.success(orderImportTaskService.getPage(reqVO)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/vo/OrderImportTaskPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/vo/OrderImportTaskPageReqVO.java index 6b382123b..903743005 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/vo/OrderImportTaskPageReqVO.java +++ b/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 = "创建时间") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/vo/OrderImportTaskRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/vo/OrderImportTaskRespVO.java index ec52d66f7..363e3ebb8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderImportTask/vo/OrderImportTaskRespVO.java +++ b/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 = "导入文件名") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/OrderPartsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/OrderPartsController.java index 08a990c86..44b35b416 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/OrderPartsController.java +++ b/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 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 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 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 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> getOrderPartsPage(@Valid OrderPartsPageReqVO pageReqVO) { PageResult 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 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> 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> getWithRoomAndBody(@RequestParam("id") Long id) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsImportRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsImportRespVO.java index ba3c069f0..c8a3e9348 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsImportRespVO.java +++ b/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 updateOrderParts; - @Schema(description = "导入失败的生产配件集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "导入失败的生产配件集合，key 为订单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) private Map failureOrderParts; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsPageReqVO.java index a005e7657..53293c639 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsPageReqVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsRemark.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsRemark.java index 7ae42d92d..52151e4ce 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsRemark.java +++ b/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 = "备注") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsRespVO.java index b1d17fab7..455ef00ca 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsSaveReqVO.java index 52378dba2..773fbd44d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/OrderPartsSaveReqVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/PartGoodsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/PartGoodsRespVO.java index 50ab34db7..d4b14cf36 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/vo/PartGoodsRespVO.java +++ b/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") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java index 6f2126b68..f060cfa24 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java +++ b/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 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java index 483b08acc..707521a7b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java +++ b/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 { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentTreeRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentTreeRespVO.java index 6e5fc7b35..b58440fd2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentTreeRespVO.java +++ b/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 { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index c6132ec9b..cf9c514ae 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/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 getOrderSource(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId, + public CommonResult 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> getPlateModel (@Valid @RequestParam("orderId") Long orderId) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index 56013823a..779ab769a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/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> 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> 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> getOrderRoomBody(@Valid @NotEmpty(message = "生产单ID不能为空") @RequestParam List orderIds) { + public CommonResult> getOrderRoomBody(@Valid @NotEmpty(message = "订单ID不能为空") @RequestParam List orderIds) { return success(planService.getOrderRoomBody(orderIds)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderIds.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderIds.java index 1deffa1f3..125005e52 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderIds.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderRoomBodyList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderRoomBodyList.java index 7e76d6f2d..6e70cd4f5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderRoomBodyList.java +++ b/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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java index c5b1fcdd8..10e100350 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java +++ b/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 orderList; @@ -62,15 +62,15 @@ public class OrderSource { private List plateModels; - @Schema(description = "生产单配件信息") + @Schema(description = "订单配件信息") private List orderPartsRespVOS; - @Schema(description = "生产单配件的备注信息") + @Schema(description = "订单配件的备注信息") private List orderPartsRemarks; - @Schema(description = "生产单包裹信息") + @Schema(description = "订单包裹信息") private List orderPackReqVOS; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepAreaIds.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepAreaIds.java index 53b4676f5..1d30b7b79 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepAreaIds.java +++ b/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; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepSalaryIds.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepSalaryIds.java index 7bd81845f..01010cdfe 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepSalaryIds.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessStepSalaryIds.java @@ -11,10 +11,10 @@ import java.math.BigDecimal; public class ProcessStepSalaryIds { - // 生产单工序步骤ID + // 订单工序步骤ID private Long processStepId; - // 生产单工序步骤工资金额 + // 订单工序步骤工资金额 private BigDecimal salary; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java index a779177f7..7cca2603c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java @@ -11,7 +11,7 @@ import java.util.List; @Data public class Material { - @Schema(description = "生产单id") + @Schema(description = "订单id") private String orderId; @Schema(description = "商品id") private Integer goodsId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/FilterDataPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/FilterDataPageReqVO.java index 6d70e6b09..f081f764d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/FilterDataPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/FilterDataPageReqVO.java @@ -20,7 +20,7 @@ public class FilterDataPageReqVO extends PageParam { private String config; - @Schema(description = "生产单号") + @Schema(description = "订单号") @Size(max = 20,message = "最多可同时查询 20 个") private List orderIds; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/NoPlanFilterPlateReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/NoPlanFilterPlateReqVO.java index f6c14e58f..619a4d7c6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/NoPlanFilterPlateReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/NoPlanFilterPlateReqVO.java @@ -16,8 +16,8 @@ import java.util.List; public class NoPlanFilterPlateReqVO { - @Schema(description = "生产单ID",requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "生产单ID不能为空") + @Schema(description = "订单ID",requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "订单ID不能为空") private List orderIds; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPackReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPackReqVO.java index 97b601ae3..758c22c23 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPackReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPackReqVO.java @@ -6,12 +6,12 @@ import lombok.Data; import java.util.List; -@Schema(description = "管理后台 - 生产单包裹信息") +@Schema(description = "管理后台 - 订单包裹信息") @Data public class PrintOrderPackReqVO { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPartsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPartsRespVO.java index ec96a4e68..41f5faef9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPartsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/PrintOrderPartsRespVO.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; -@Schema(description = "管理后台 - 标签对应的生产单配件信息") +@Schema(description = "管理后台 - 标签对应的订单配件信息") @Data public class PrintOrderPartsRespVO { @@ -35,7 +35,7 @@ public class PrintOrderPartsRespVO { private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/AddPlateReq.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/AddPlateReq.java index 4fddd44de..984b37d6e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/AddPlateReq.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/AddPlateReq.java @@ -27,8 +27,8 @@ public class AddPlateReq { @Valid @Data public static class Obj { - @NotNull(message = "生产单id不能空") - @Schema(description = "生产单id") + @NotNull(message = "订单id不能空") + @Schema(description = "订单id") private Long orderId; @NotNull(message = "板材id不能空") @Schema(description = "板材id") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/BranchingPlanSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/BranchingPlanSaveReqVO.java index 8a13c41af..270708577 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/BranchingPlanSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/BranchingPlanSaveReqVO.java @@ -21,7 +21,7 @@ public class BranchingPlanSaveReqVO { - @Schema(description = "生产单id与商品id 列表,修改排单时，只传入新增的那一部分",requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "订单id与商品id 列表,修改排单时，只传入新增的那一部分",requiredMode = Schema.RequiredMode.REQUIRED) @Valid private List itemList; @@ -29,16 +29,16 @@ public class BranchingPlanSaveReqVO { @Data public static class Item { - @Schema(description = "生产单的商品id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @Schema(description = "订单的商品id") + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private Long id; - @Schema(description = "生产单id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @Schema(description = "订单id") + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private Long orderId; @Schema(description = "板材库大板id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private String goodsId; @Schema(description = "余料板ID") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java index 885348951..8a18489a1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java @@ -13,8 +13,8 @@ import jakarta.validation.constraints.NotNull; @Data @Schema(description = "") public class GetSourceDataReq { - @Schema(description = "生产单id") - @NotNull(message = "生产单id不能空") + @Schema(description = "订单id") + @NotNull(message = "订单id不能空") private Long orderId; @Schema(description = "数据源id") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java index 3884b30ca..b09f427be 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GoodsReqVO.java @@ -12,7 +12,7 @@ import java.util.List; import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 生产单商品表") +@Schema(description = "管理后台 - 订单商品表") @Data @Setter public class GoodsReqVO { @@ -23,7 +23,7 @@ public class GoodsReqVO { @Schema(description = "余料板ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4109") private Long remainId; - @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") @@ -71,7 +71,7 @@ public class GoodsReqVO { @Schema(description = "大板对应的小板平方数") private BigDecimal plateArea; - @Schema(description = "生产单商品列表") + @Schema(description = "订单商品列表") private List goodsReqVOS; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanGoodsListPageVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanGoodsListPageVO.java index faf6d8af5..6d2a09d48 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanGoodsListPageVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanGoodsListPageVO.java @@ -11,7 +11,7 @@ import jakarta.validation.constraints.NotNull; */ @Data public class NotPlanGoodsListPageVO extends PageParam { - @Schema(description = "生产单id") - @NotNull(message = "生产单id不能空") + @Schema(description = "订单id") + @NotNull(message = "订单id不能空") private Long orderId; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanOrderPlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanOrderPlateRespVO.java index 06814347a..0c3b69d09 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanOrderPlateRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/NotPlanOrderPlateRespVO.java @@ -11,17 +11,17 @@ import java.util.List; @Data public class NotPlanOrderPlateRespVO { -// @Schema(description = "生产单id") +// @Schema(description = "订单id") // private List orderId; // -// @Schema(description = "生产单的大板ID-大板分类ID") +// @Schema(description = "订单的大板ID-大板分类ID") // private List id; // // @Schema(description = "商品id-板材库对应的ID") // private Long goodsId; - @Schema(description = "生产单和大板的信息") + @Schema(description = "订单和大板的信息") private List orderIdList; @Schema(description = "商品ID-板材库对应的大板ID") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index f087d6740..bb50ad9e5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -29,7 +29,7 @@ public class OptimizeParamRespVO { private String planNo; @Schema(description = "排序优先级") private Integer sort; - @Schema(description = "排单类型：1 混单排单，2 生产单排单") + @Schema(description = "排单类型：1 混单排单，2 订单排单") private Integer type; @Schema(description = "排单状态 0 新单，1 板材已申请，2 开料中，3 已开料") private Integer status; @@ -38,7 +38,7 @@ public class OptimizeParamRespVO { @Schema(description = "计划时间") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private Date planTime; - @Schema(description = "生产单号") + @Schema(description = "订单号") private String orderNos; @Schema(description = "排单优化文件地址") private String placeDateFileUrl; @@ -51,7 +51,7 @@ public class OptimizeParamRespVO { @Schema(description = "生产时间") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private Date produceTime; - @Schema(description = "生产单列表") + @Schema(description = "订单列表") private List orderList; @Schema(description = "大板使用信息列表") private List materialList; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java index b0f6770c2..da14115c1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java @@ -14,7 +14,7 @@ import java.util.List; public class OrderGoodsResp { - @Schema(description = "生产单id") + @Schema(description = "订单id") private List orderIds; @Schema(description = "商品id-商品编号") private String goodsId; @@ -45,7 +45,7 @@ public class OrderGoodsResp { @Schema(description = "备注") private String remark; - @Schema(description = "生产单信息") + @Schema(description = "订单信息") private List orderList; @Schema(description = "随机数据-唯一标识") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java index 33c4b27c1..c649028d1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java @@ -21,9 +21,9 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @Data public class OrderPageReqVOCopy extends PageParam { - @Schema(description = "生产单id") - @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字") - @Length(max = 19,message = "生产单号长度不能超过19位") + @Schema(description = "订单id") + @Pattern(regexp = "^[0-9]*$",message = "订单号必须为数字") + @Length(max = 19,message = "订单号长度不能超过19位") private String orderId; @Schema(description = "自定义id") @@ -62,7 +62,7 @@ public class OrderPageReqVOCopy extends PageParam { @Schema(description = "门板") private Boolean isDoor; - @Schema(description = "生产单订单日期", example = "[2022-07-01 ,2022-07-01]") + @Schema(description = "订单订单日期", example = "[2022-07-01 ,2022-07-01]") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDate[] createTime; @@ -83,7 +83,7 @@ public class OrderPageReqVOCopy extends PageParam { private BigDecimal widthMaxRang; - @Schema(description = "商品ID-板材库对应的大板ID-由板材查询生产单时传") + @Schema(description = "商品ID-板材库对应的大板ID-由板材查询订单时传") // @Size(max = 20,message = "最多可同时查询20个板材") private List goodsIds; @@ -96,8 +96,8 @@ public class OrderPageReqVOCopy extends PageParam { @Schema(description = "柜体ID") private List bodyId; - @Schema(description = "生产单ids") -// @Size(max = 20,message = "最多可同时查询20个生产单") + @Schema(description = "订单ids") +// @Size(max = 20,message = "最多可同时查询20个订单") private List orderIds; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderResp.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderResp.java index 8438b0a76..f3f6b11d9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderResp.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderResp.java @@ -15,7 +15,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT */ @Data public class OrderResp { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "父id") private Long parentNo; @@ -40,9 +40,9 @@ public class OrderResp { @Schema(description = "交付日期") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private Date deliveryDate; - @Schema(description = "生产单类型，1主单 2子单") + @Schema(description = "订单类型，1主单 2子单") private Integer type; - @Schema(description = "生产单排序号") + @Schema(description = "订单排序号") private Integer sort; @Schema(description = "CAD数据类型，1CAD 2WebCAD 3Excel") private Integer dataType; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java index ad6dd1f9d..366ecb340 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java @@ -16,16 +16,16 @@ import static com.cf.imes.framework.common.util.date.DateUtils.*; /** * @author there - * 排单页面生产单VO + * 排单页面订单VO */ @Data @Builder @NoArgsConstructor @AllArgsConstructor public class OrderRespVOCopy { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; - @Schema(description = "生产单状态") + @Schema(description = "订单状态") private Integer status; @Schema(description = "自定义单号") private String defineId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOrderRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOrderRespVO.java index 60bd8a5c9..81e70e90b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOrderRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOrderRespVO.java @@ -7,21 +7,21 @@ import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 排单对应的生产单数据") +@Schema(description = "管理后台 - 排单对应的订单数据") @Data public class PlanOrderRespVO { - @Schema(description = "生产单号，主键") + @Schema(description = "订单号，主键") private Long id; @Schema(description = "排单ID") private Long planId; - @Schema(description = "生产单日期") - @NotNull(message = "生产单日期不能为空") + @Schema(description = "订单日期") + @NotNull(message = "订单日期不能为空") private LocalDateTime orderDate; @Schema(description = "交付日期") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java index b571ad9a2..9cd206dc0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanPageReqVO.java @@ -15,7 +15,7 @@ import java.util.List; 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) @@ -34,7 +34,7 @@ public class PlanPageReqVO extends PageParam { @Schema(description = "排序优先级") private Integer sort; - @Schema(description = "排单类型：1 混单排单，2 生产单排单") + @Schema(description = "排单类型：1 混单排单，2 订单排单") @PlanTypeValid private Integer type; @@ -53,13 +53,13 @@ public class PlanPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] planTime; - @Schema(description = "生产单号") - @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字") - @Length(max = 19,message = "生产单号长度不能超过19位") + @Schema(description = "订单号") + @Pattern(regexp = "^[0-9]*$",message = "订单号必须为数字") + @Length(max = 19,message = "订单号长度不能超过19位") private String orderNos; - @Schema(description = "生产单客户") + @Schema(description = "订单客户") @Length(max = 255, message = "客户数据过长，请重新输入") private String customer; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java index d304b40eb..4a0386263 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java @@ -8,7 +8,7 @@ import lombok.Data; import java.time.LocalDateTime; import java.util.List; -@Schema(description = "管理后台 - 生产单开料排单 Response VO") +@Schema(description = "管理后台 - 订单开料排单 Response VO") @Data @ExcelIgnoreUnannotated public class PlanRespVO { @@ -21,8 +21,8 @@ public class PlanRespVO { @ExcelProperty("排序优先级") private Long sort; - @Schema(description = "排单类型：1 混单排单，2 生产单排单", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("排单类型：1 混单排单，2 生产单排单") + @Schema(description = "排单类型：1 混单排单，2 订单排单", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("排单类型：1 混单排单，2 订单排单") private Integer type; @Schema(description = "排单状态：0 新单，1 板材已申请，2 开料中，3 已开料", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @@ -50,11 +50,11 @@ public class PlanRespVO { @ExcelProperty("计划时间") private LocalDateTime planTime; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("生产单号") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("订单号") private String orderNos; - @Schema(description = "排单对应的生产单的信息", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "排单对应的订单的信息", requiredMode = Schema.RequiredMode.REQUIRED) private List orderList; @Schema(description = "板材信息列表-大板信息", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java index 828857339..1dcfe7681 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java @@ -9,7 +9,7 @@ import lombok.Data; import jakarta.validation.constraints.Max; import java.util.List; -@Schema(description = "管理后台 - 生产单开料排单新增/修改 Request VO") +@Schema(description = "管理后台 - 订单开料排单新增/修改 Request VO") @Data public class PlanSaveReqVO { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java index 7d36e461b..186ccb637 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java @@ -9,7 +9,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.List; -@Schema(description = "管理后台 - 生产单板件 Response VO") +@Schema(description = "管理后台 - 订单板件 Response VO") @Data @JsonInclude(JsonInclude.Include.NON_NULL) public class PlateDetailRespVO { @@ -33,7 +33,7 @@ public class PlateDetailRespVO { private String bodyName; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java index c14c06fc1..f44742d2c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java @@ -21,7 +21,7 @@ import java.util.List; public class PlateInfoVO { - @Schema(description = "生产单和大板的信息") + @Schema(description = "订单和大板的信息") private List orderIdList; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java index 7dc39e75b..a9d360533 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; public class PlatePage { @Schema(description = "板材id") private Long plateId; - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "商品id") private String goodsId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateReqPageVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateReqPageVO.java index 2eda878c0..77fd7b1d2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateReqPageVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateReqPageVO.java @@ -9,7 +9,7 @@ import lombok.Data; */ @Data public class PlateReqPageVO extends PageParam { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; // @Schema(description = "商品id") // private String goodsId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java index 849f5d993..b779e038d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java @@ -14,7 +14,7 @@ public class PlateResList { private Long plateId; @Schema(description = "板材库大板id-大板的实际ID") private String goodsId; - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "大板的分类ID") private Long id; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java index b2da92339..88dcdd872 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java @@ -40,16 +40,16 @@ public class SavePlanPlateList { @Data public static class PlateItemList { - @Schema(description = "生产单id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @Schema(description = "订单id") + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private Long plateId; - @Schema(description = "生产单的商品id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @Schema(description = "订单的商品id") + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private Long id; - @Schema(description = "生产单id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @Schema(description = "订单id") + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private Long orderId; @@ -60,13 +60,13 @@ public class SavePlanPlateList { public static class GoodsItemList { - @Schema(description = "生产单的商品id") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @Schema(description = "订单的商品id") + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private Long id; @Schema(description = "板材库大板id-这个在新版还是需要的") - @NotNull(message = "生产单数据错误，请检查生产单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) + @NotNull(message = "订单数据错误，请检查订单数据或重新导入，排单创建失败",groups = {UpdateGroup.class, CreateGroup.class}) private String goodsId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index 1cd8bd915..ec68d20df 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -31,7 +31,7 @@ import java.util.Set; import static com.cf.imes.framework.common.pojo.CommonResult.success; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -@Tag(name = "管理后台 - 生产单板件") +@Tag(name = "管理后台 - 订单板件") @RestController @RequestMapping("/executor/plate") @Validated @@ -41,14 +41,14 @@ public class PlateController { private PlateService plateService; @PostMapping("/create") - @Operation(summary = "创建生产单板件") + @Operation(summary = "创建订单板件") @PreAuthorize("@ss.hasPermission('executor:plate:create')") public CommonResult createPlate(@Valid @RequestBody PlateSaveReqVO createReqVO) { return success(plateService.createPlate(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新生产单板件") + @Operation(summary = "更新订单板件") @PreAuthorize("@ss.hasPermission('executor:plate:update')") public CommonResult updatePlate(@Valid @RequestBody PlateSaveReqVO updateReqVO) { plateService.updatePlate(updateReqVO); @@ -56,7 +56,7 @@ public class PlateController { } @DeleteMapping("/delete") - @Operation(summary = "删除生产单板件") + @Operation(summary = "删除订单板件") @Parameter(name = "plateIds", description = "板材ID", required = true) @Parameter(name = "planId", description = "排单ID", required = true) @PreAuthorize("@ss.hasAnyPermissions('executor:plate:delete','placeorder:optimize')") @@ -78,7 +78,7 @@ public class PlateController { @GetMapping("/getPlatePage") - @Operation(summary = "获取未排单的生产单板件") + @Operation(summary = "获取未排单的订单板件") @PreAuthorize("@ss.hasAnyPermissions('manage:un-order-plan:insert-plate','manage:order-plan:insert-plate')") public CommonResult> getPlatePage(@Valid NoPlanPlatePageReqVO reqVO) { @@ -90,7 +90,7 @@ public class PlateController { @GetMapping("/export-excel") - @Operation(summary = "导出生产单板件 Excel") + @Operation(summary = "导出订单板件 Excel") @PreAuthorize("@ss.hasPermission('executor:plate:export')") @OperateLog(type = EXPORT) public void exportPlateExcel(@Valid PlatePageReqVO pageReqVO, @@ -98,7 +98,7 @@ public class PlateController { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = plateService.getPlatePage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "生产单板件.xls", "数据", PlateRespVO.class, + ExcelUtils.write(response, "订单板件.xls", "数据", PlateRespVO.class, BeanUtils.toBean(list, PlateRespVO.class)); } @@ -112,9 +112,9 @@ public class PlateController { return success(true); } -// 批量查询有生产单号id、房间id，柜体id的板材 +// 批量查询有订单号id、房间id，柜体id的板材 @GetMapping("getPlatesByOrderId") - @Operation(summary = "批量查询有生产单号id、房间id，柜体id的板材") + @Operation(summary = "批量查询有订单号id、房间id，柜体id的板材") @PreAuthorize("@ss.hasPermission('executor:plate:query')") public CommonResult> getPlatesByOrderId(@Valid PlateTermsPageReqVO pageVO) { return success(plateService.getPlatePageByTerms(pageVO)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/NoPlanPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/NoPlanPlatePageReqVO.java index 8ca231189..c57e65152 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/NoPlanPlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/NoPlanPlatePageReqVO.java @@ -20,9 +20,9 @@ import java.util.List; public class NoPlanPlatePageReqVO extends PageParam { - @Schema(description = "生产单id") - @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字") - @Length(max = 19,message = "生产单号长度不能超过19位") + @Schema(description = "订单id") + @Pattern(regexp = "^[0-9]*$",message = "订单号必须为数字") + @Length(max = 19,message = "订单号长度不能超过19位") private String orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java index 8a7420cd8..83f5f1003 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java @@ -55,9 +55,9 @@ public class OptimizationSavePlateReqVO { private Long planId; - @Schema(description = "生产单号") - @NotNull(message = "当前板材没有选择生产单，请选择") - @Max(value = 0x7fffffffffffffffL,message = "生产单数据错误，请重新进行新增") + @Schema(description = "订单号") + @NotNull(message = "当前板材没有选择订单，请选择") + @Max(value = 0x7fffffffffffffffL,message = "订单数据错误，请重新进行新增") private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderPlateIds.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderPlateIds.java index a57aeea0f..98e95d206 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderPlateIds.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderPlateIds.java @@ -15,7 +15,7 @@ public class OrderPlateIds { private Long id; - @Schema(description = "生产单ID") + @Schema(description = "订单ID") private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailRespVO.java index 00f13ec09..e19503542 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailRespVO.java @@ -4,7 +4,7 @@ package com.cf.imes.module.executor.controller.admin.plate.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -@Schema(description = "管理后台 - 生产单的大板-余料板等信息") +@Schema(description = "管理后台 - 订单的大板-余料板等信息") @Data public class PlateDetailRespVO { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsIdVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsIdVO.java index 2a8253ac5..b50a18aed 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsIdVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsIdVO.java @@ -4,7 +4,7 @@ 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 PlateGoodsIdVO { @@ -12,7 +12,7 @@ public class PlateGoodsIdVO { @Schema(description = "板件 ID", example = "32523") private Long id; - @Schema(description = "生产单号", example = "11087") + @Schema(description = "订单号", example = "11087") private Long orderId; @Schema(description = "商品 ID", example = "14195") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java index 2cef68210..6bb072014 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java @@ -37,7 +37,7 @@ public class PlateGoodsRespVO { @Schema(description = "板数量", example = "11087") private Integer count = 1; - @Schema(description = "生产单号", example = "11087") + @Schema(description = "订单号", example = "11087") private Long orderId; @Schema(description = "板名称", example = "晨丰") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateImportRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateImportRespVO.java index 4056c6800..be5dc6db5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateImportRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateImportRespVO.java @@ -17,6 +17,6 @@ public class PlateImportRespVO { @Schema(description = "更新成功的生产小板数组", requiredMode = Schema.RequiredMode.REQUIRED) private List updatePlates; - @Schema(description = "导入失败的生产小板集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "导入失败的生产小板集合，key 为订单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) private Map failurePlates; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlatePageReqVO.java index 55d7b72fa..606e2eca5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlatePageReqVO.java @@ -10,13 +10,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 PlatePageReqVO extends PageParam { - @Schema(description = "生产单号", example = "11087") + @Schema(description = "订单号", example = "11087") private Long orderId; @Schema(description = "板名称", example = "晨丰") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java index cf0955947..5e319b19f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author Beal */ -@Schema(description = "管理后台 - 生产单板件 Response VO") +@Schema(description = "管理后台 - 订单板件 Response VO") @Data @ExcelIgnoreUnannotated public class PlateRespVO extends PageParam { @@ -21,8 +21,8 @@ public class PlateRespVO extends PageParam { @ExcelProperty("板件 ID") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11087") - @ExcelProperty("生产单号") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11087") + @ExcelProperty("订单号") private Long orderId; @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰") @@ -206,7 +206,7 @@ public class PlateRespVO extends PageParam { private String roomName; - @Schema(description = "生产单明细ID") + @Schema(description = "订单明细ID") private Long itemId; @Schema(description = "加工组ID") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateSaveReqVO.java index fd5a13476..2c6952a08 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateSaveReqVO.java @@ -6,15 +6,15 @@ import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; -@Schema(description = "管理后台 - 生产单板件新增/修改 Request VO") +@Schema(description = "管理后台 - 订单板件新增/修改 Request VO") @Data public class PlateSaveReqVO { @Schema(description = "板件 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32523") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11087") - @NotNull(message = "生产单号不能为空") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11087") + @NotNull(message = "订单号不能为空") private Long orderId; @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateTermsPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateTermsPageReqVO.java index 2f10e5c74..28aaa52f9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateTermsPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateTermsPageReqVO.java @@ -12,8 +12,8 @@ import jakarta.validation.constraints.NotNull; */ @Data public class PlateTermsPageReqVO extends PageParam { - @Schema(description = "生产单Id") - @NotNull(message = "生产单不能为空") + @Schema(description = "订单Id") + @NotNull(message = "订单不能为空") private Long orderId; @Schema(description = "房间Id") private Long roomId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java index 8549c9d07..66f17bcd7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java @@ -18,7 +18,7 @@ import com.cf.imes.module.executor.controller.admin.process.vo.*; import com.cf.imes.module.executor.dal.dataobject.process.OrderProcessDO; import com.cf.imes.module.executor.service.process.OrderProcessService; -@Tag(name = "管理后台 - 生产单工序") +@Tag(name = "管理后台 - 订单工序") @RestController @RequestMapping("/executor/order-process") @Validated @@ -28,14 +28,14 @@ public class OrderProcessController { private OrderProcessService orderProcessService; @PostMapping("/create") - @Operation(summary = "创建生产单工序组") + @Operation(summary = "创建订单工序组") @PreAuthorize("@ss.hasPermission('production:manager-list:putInto')") public CommonResult createOrderProcess(@Valid @RequestBody OrderProcessSaveReqVO createReqVO) { return success(orderProcessService.createOrderProcess(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新生产单工序组") + @Operation(summary = "更新订单工序组") @PreAuthorize("@ss.hasPermission('executor:order-process:update')") public CommonResult updateOrderProcess(@Valid @RequestBody OrderProcessSaveReqVO updateReqVO) { orderProcessService.updateOrderProcess(updateReqVO); @@ -43,7 +43,7 @@ public class OrderProcessController { } @DeleteMapping("/delete") - @Operation(summary = "删除生产单工序组") + @Operation(summary = "删除订单工序组") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('executor:order-process:delete')") public CommonResult deleteOrderProcess(@RequestParam("id") Long id) { @@ -52,8 +52,8 @@ public class OrderProcessController { } @GetMapping("/get") - @Operation(summary = "获得生产单工序组") - @Parameter(name = "orderId", description = "生产单编号", required = true, example = "1024") + @Operation(summary = "获得订单工序组") + @Parameter(name = "orderId", description = "订单编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('executor:order-process:query')") public CommonResult getOrderProcess(@RequestParam("orderId") Long orderId) { OrderProcessDO orderProcess = orderProcessService.getOrderProcess(orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java index 338189327..2a16681d5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.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 OrderProcessPageReqVO extends PageParam { - @Schema(description = "生产单号") + @Schema(description = "订单号") private Long orderId; @Schema(description = "工序名", example = "张三") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java index e4d460a55..46f89d67f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.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 OrderProcessRespVO { @@ -17,8 +17,8 @@ public class OrderProcessRespVO { @ExcelProperty("工序 ID") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("生产单号") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("订单号") private Long orderId; @Schema(description = "工序名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java index ebaf6e3f5..2bf3713a3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java @@ -5,14 +5,14 @@ import lombok.*; import java.util.*; import jakarta.validation.constraints.*; -@Schema(description = "管理后台 - 生产单工序新增/修改 Request VO") +@Schema(description = "管理后台 - 订单工序新增/修改 Request VO") @Data public class OrderProcessSaveReqVO { private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号不能为空") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "订单号不能为空") private Long orderId; @Schema(description = "工序名", example = "张三") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/ProcessStepController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/ProcessStepController.java index 856d6d204..cd02c3826 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/ProcessStepController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/ProcessStepController.java @@ -29,7 +29,7 @@ import com.cf.imes.module.executor.controller.admin.processStep.vo.*; import com.cf.imes.module.executor.dal.dataobject.processStep.ProcessStepDO; import com.cf.imes.module.executor.service.processStep.ProcessStepService; -@Tag(name = "管理后台 - 生产单工序步骤") +@Tag(name = "管理后台 - 订单工序步骤") @RestController @RequestMapping("/executor/process-step") @Validated @@ -39,14 +39,14 @@ public class ProcessStepController { private ProcessStepService processStepService; @PostMapping("/create") - @Operation(summary = "创建生产单工序步骤") + @Operation(summary = "创建订单工序步骤") @PreAuthorize("@ss.hasPermission('executor:process-step:create')") public CommonResult createProcessStep(@Valid @RequestBody ProcessStepSaveReqVO createReqVO) { return success(processStepService.createProcessStep(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新生产单工序步骤") + @Operation(summary = "更新订单工序步骤") @PreAuthorize("@ss.hasPermission('executor:process-step:update')") public CommonResult updateProcessStep(@Valid @RequestBody ProcessStepSaveReqVO updateReqVO) { processStepService.updateProcessStep(updateReqVO); @@ -54,7 +54,7 @@ public class ProcessStepController { } @DeleteMapping("/delete") - @Operation(summary = "删除生产单工序步骤") + @Operation(summary = "删除订单工序步骤") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('executor:process-step:delete')") public CommonResult deleteProcessStep(@RequestParam("id") Long id) { @@ -63,7 +63,7 @@ public class ProcessStepController { } @GetMapping("/get") - @Operation(summary = "获得生产单工序步骤") + @Operation(summary = "获得订单工序步骤") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('executor:process-step:query')") public CommonResult getProcessStep(@RequestParam("id") Long id) { @@ -72,7 +72,7 @@ public class ProcessStepController { } @GetMapping("/page") - @Operation(summary = "获得生产单工序步骤分页") + @Operation(summary = "获得订单工序步骤分页") @PreAuthorize("@ss.hasPermission('executor:process-step:query')") public CommonResult> getProcessStepPage(@Valid ProcessStepPageReqVO pageReqVO) { PageResult pageResult = processStepService.getProcessStepPage(pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepPageReqVO.java index 97817163e..7392c2a98 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepPageReqVO.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 ProcessStepPageReqVO extends PageParam { - @Schema(description = "生产单号") + @Schema(description = "订单号") private Long orderId; @Schema(description = "完成时间") @@ -31,7 +31,7 @@ public class ProcessStepPageReqVO extends PageParam { @Schema(description = "计件工资") private Double pieceRate; - @Schema(description = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7生产单金额百分比", example = "1") + @Schema(description = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7订单金额百分比", example = "1") private Integer pieceType; @Schema(description = "排序优先级") @@ -43,7 +43,7 @@ public class ProcessStepPageReqVO extends PageParam { @Schema(description = "工序 ID", example = "20663") private Long processinfoId; - @Schema(description = "生产单工序 ID", example = "9384") + @Schema(description = "订单工序 ID", example = "9384") private Long orderProcessId; @Schema(description = "计划日期") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepRespVO.java index 1d6f08f09..e1efe82c4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepRespVO.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 ProcessStepRespVO { @@ -17,8 +17,8 @@ public class ProcessStepRespVO { @ExcelProperty("步骤 ID") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("生产单号") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("订单号") private Long orderId; @Schema(description = "完成时间", requiredMode = Schema.RequiredMode.REQUIRED) @@ -37,8 +37,8 @@ public class ProcessStepRespVO { @ExcelProperty("计件工资") private Double pieceRate; - @Schema(description = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7生产单金额百分比") + @Schema(description = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7订单金额百分比") private Integer pieceType; @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED) @@ -53,8 +53,8 @@ public class ProcessStepRespVO { @ExcelProperty("工序 ID") private Long processinfoId; - @Schema(description = "生产单工序 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9384") - @ExcelProperty("生产单工序 ID") + @Schema(description = "订单工序 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9384") + @ExcelProperty("订单工序 ID") private Long orderProcessId; @Schema(description = "计划日期", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepSaveReqVO.java index 9ecb30344..e237a2890 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/processStep/vo/ProcessStepSaveReqVO.java @@ -7,15 +7,15 @@ import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 生产单工序步骤新增/修改 Request VO") +@Schema(description = "管理后台 - 订单工序步骤新增/修改 Request VO") @Data public class ProcessStepSaveReqVO { @Schema(description = "步骤 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16284") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号不能为空") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "订单号不能为空") private Long orderId; @Schema(description = "完成时间", requiredMode = Schema.RequiredMode.REQUIRED) @@ -34,8 +34,8 @@ public class ProcessStepSaveReqVO { @NotNull(message = "计件工资不能为空") private Double pieceRate; - @Schema(description = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7生产单金额百分比不能为空") + @Schema(description = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7订单金额百分比不能为空") private Integer pieceType; @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED) @@ -50,8 +50,8 @@ public class ProcessStepSaveReqVO { @NotNull(message = "工序 ID不能为空") private Long processinfoId; - @Schema(description = "生产单工序 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9384") - @NotNull(message = "生产单工序 ID不能为空") + @Schema(description = "订单工序 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9384") + @NotNull(message = "订单工序 ID不能为空") private Long orderProcessId; @Schema(description = "计划日期", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/RawGoodsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/RawGoodsController.java index 47bf653e7..fac129118 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/RawGoodsController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/RawGoodsController.java @@ -25,7 +25,7 @@ import com.cf.imes.framework.excel.core.util.ExcelUtils; import com.cf.imes.module.executor.dal.dataobject.rawgoods.RawGoodsDO; import com.cf.imes.module.executor.service.rawgoods.RawGoodsService; -@Tag(name = "管理后台 - 生产单设计商品") +@Tag(name = "管理后台 - 订单设计商品") @RestController @RequestMapping("/executor/raw-goods") @Validated @@ -35,14 +35,14 @@ public class RawGoodsController { private RawGoodsService rawGoodsService; @PostMapping("/create") - @Operation(summary = "创建生产单原设计商品") + @Operation(summary = "创建订单原设计商品") @PreAuthorize("@ss.hasPermission('executor:raw-goods:create')") public CommonResult createRawGoods(@Valid @RequestBody RawGoodsSaveReqVO createReqVO) { return success(rawGoodsService.createRawGoods(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新生产单原设计商品") + @Operation(summary = "更新订单原设计商品") @PreAuthorize("@ss.hasPermission('executor:raw-goods:update')") public CommonResult updateRawGoods(@Valid @RequestBody RawGoodsSaveReqVO updateReqVO) { rawGoodsService.updateRawGoods(updateReqVO); @@ -50,7 +50,7 @@ public class RawGoodsController { } @DeleteMapping("/delete") - @Operation(summary = "删除生产单原设计商品") + @Operation(summary = "删除订单原设计商品") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('executor:raw-goods:delete')") public CommonResult deleteRawGoods(@RequestParam("id") Long id) { @@ -59,7 +59,7 @@ public class RawGoodsController { } @GetMapping("/get") - @Operation(summary = "获得生产单原设计商品") + @Operation(summary = "获得订单原设计商品") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('executor:raw-goods:query')") public CommonResult getRawGoods(@RequestParam("id") Long id) { @@ -68,7 +68,7 @@ public class RawGoodsController { } @GetMapping("/page") - @Operation(summary = "获得生产单原设计商品分页") + @Operation(summary = "获得订单原设计商品分页") @PreAuthorize("@ss.hasPermission('executor:raw-goods:query')") public CommonResult> getRawGoodsPage(@Valid RawGoodsPageReqVO pageReqVO) { PageResult pageResult = rawGoodsService.getRawGoodsPage(pageReqVO); @@ -76,8 +76,8 @@ public class RawGoodsController { } @GetMapping("/getByOrder") - @Operation(summary = "获得生产单原设计商品") - @Parameter(name = "orderId", description = "生产单号", required = true, example = "1776888013545013248") + @Operation(summary = "获得订单原设计商品") + @Parameter(name = "orderId", description = "订单号", required = true, example = "1776888013545013248") @PreAuthorize("@ss.hasPermission('executor:raw-goods:query')") public CommonResult> getRawGoodsByOrder(@RequestParam("orderId") Long orderId) { List rawGoods = rawGoodsService.getRawGoodsByOrder(orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsImportRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsImportRespVO.java index a6d3653d3..a1b8291ab 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsImportRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsImportRespVO.java @@ -17,6 +17,6 @@ public class RawGoodsImportRespVO { @Schema(description = "更新成功的生产板材数组", requiredMode = Schema.RequiredMode.REQUIRED) private List updateRawGoods; - @Schema(description = "导入失败的生产板材集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "导入失败的生产板材集合，key 为订单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) private Map failureRawGoods; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsPageReqVO.java index c1bc9075d..011d1d88e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsPageReqVO.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_raw_goods_{N}分页 Request VO") +@Schema(description = "管理后台 - 订单设计商品表 order_raw_goods_{N}分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class RawGoodsPageReqVO extends PageParam { - @Schema(description = "生产单号", example = "8905") + @Schema(description = "订单号", example = "8905") private Long orderId; @Schema(description = "设计端商品编码", example = "28930") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsRespVO.java index 43da8a906..3d280e2a8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsRespVO.java @@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; -@Schema(description = "管理后台 - 生产单设计商品表 order_raw_goods_{N} Response VO") +@Schema(description = "管理后台 - 订单设计商品表 order_raw_goods_{N} Response VO") @Data @ExcelIgnoreUnannotated public class RawGoodsRespVO { @@ -17,8 +17,8 @@ public class RawGoodsRespVO { @ExcelProperty("id") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8905") - @ExcelProperty("生产单号") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8905") + @ExcelProperty("订单号") private Long orderId; @Schema(description = "设计端商品编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "28930") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsSaveReqVO.java index ac36763ec..c4dfbe8f2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/rawgoods/vo/RawGoodsSaveReqVO.java @@ -5,15 +5,15 @@ import lombok.*; import java.util.*; import jakarta.validation.constraints.*; -@Schema(description = "管理后台 - 生产单设计商品表 order_raw_goods_{N}新增/修改 Request VO") +@Schema(description = "管理后台 - 订单设计商品表 order_raw_goods_{N}新增/修改 Request VO") @Data public class RawGoodsSaveReqVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3090") private Long id; - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8905") - @NotNull(message = "生产单号不能为空") + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8905") + @NotNull(message = "订单号不能为空") private Long orderId; @Schema(description = "设计端商品编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "28930") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/RemainPlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/RemainPlateController.java index 66124ad6a..8a70008f6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/RemainPlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/RemainPlateController.java @@ -28,7 +28,7 @@ import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*; import com.cf.imes.module.executor.controller.admin.remainplate.vo.*; import com.cf.imes.module.executor.service.remainplate.RemainPlateService; -@Tag(name = "管理后台 - 生产单余料板表") +@Tag(name = "管理后台 - 订单余料板表") @RestController @RequestMapping("/executor/remain-plate") @Validated @@ -38,14 +38,14 @@ public class RemainPlateController { private RemainPlateService remainPlateService; @PostMapping("/create") - @Operation(summary = "创建生产单余料板表}") + @Operation(summary = "创建订单余料板表}") @PreAuthorize("@ss.hasPermission('executor:remain-plate:create')") public CommonResult createRemainPlate(@Valid @RequestBody RemainPlateSaveReqVO createReqVO) { return success(remainPlateService.createRemainPlate(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新生产单余料板表") + @Operation(summary = "更新订单余料板表") @PreAuthorize("@ss.hasPermission('executor:remain-plate:update')") public CommonResult updateRemainPlate(@Valid @RequestBody RemainPlateSaveReqVO updateReqVO) { remainPlateService.updateRemainPlate(updateReqVO); @@ -53,7 +53,7 @@ public class RemainPlateController { } @DeleteMapping("/delete") - @Operation(summary = "删除生产单余料板表") + @Operation(summary = "删除订单余料板表") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('executor:remain-plate:delete')") public CommonResult deleteRemainPlate(@RequestParam("id") Long id) { @@ -62,7 +62,7 @@ public class RemainPlateController { } @GetMapping("/get") - @Operation(summary = "获得生产单余料板表") + @Operation(summary = "获得订单余料板表") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('executor:remain-plate:query')") public CommonResult getRemainPlate(@RequestParam("id") Long id) { @@ -71,7 +71,7 @@ public class RemainPlateController { } @GetMapping("/page") - @Operation(summary = "获得生产单余料板表 order_remain_plate分页") + @Operation(summary = "获得订单余料板表 order_remain_plate分页") @PreAuthorize("@ss.hasPermission('executor:remain-plate:query')") public CommonResult> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) { PageResult pageResult = remainPlateService.getRemainPlatePage(pageReqVO); @@ -79,7 +79,7 @@ public class RemainPlateController { } @GetMapping("/export-excel") - @Operation(summary = "导出生产单余料板表 Excel") + @Operation(summary = "导出订单余料板表 Excel") @PreAuthorize("@ss.hasPermission('executor:remain-plate:export')") @OperateLog(type = EXPORT) public void exportRemainPlateExcel(@Valid RemainPlatePageReqVO pageReqVO, @@ -87,7 +87,7 @@ public class RemainPlateController { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = remainPlateService.getRemainPlatePage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "生产单余料板表.xls", "数据", RemainPlateRespVO.class, + ExcelUtils.write(response, "订单余料板表.xls", "数据", RemainPlateRespVO.class, BeanUtils.toBean(list, RemainPlateRespVO.class)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlatePageReqVO.java index 9fea358f5..f1ca676d8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlatePageReqVO.java @@ -10,7 +10,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) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateRespVO.java index 1b32ccd2d..4a61fdd57 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateRespVO.java @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; -@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N} Response VO") +@Schema(description = "管理后台 - 订单余料板表 order_remain_plate_{N} Response VO") @Data @ExcelIgnoreUnannotated public class RemainPlateRespVO { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateSaveReqVO.java index de69fad2c..8dc7c96a6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/remainplate/vo/RemainPlateSaveReqVO.java @@ -6,7 +6,7 @@ import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; -@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N}新增/修改 Request VO") +@Schema(description = "管理后台 - 订单余料板表 order_remain_plate_{N}新增/修改 Request VO") @Data public class RemainPlateSaveReqVO { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/GoodsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/GoodsDO.java index 935562550..ac810dbfa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/GoodsDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/GoodsDO.java @@ -7,7 +7,7 @@ import lombok.*; import java.math.BigDecimal; /** - * 生产单商品 DO + * 订单商品 DO * * @author 晨丰科技 */ @@ -30,7 +30,7 @@ public class GoodsDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java index 956fefed2..8d12bc582 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java @@ -27,7 +27,7 @@ public class OptimizeBoardModelDO extends ESDocument { private Long planId; - @Schema(description = "生产单id") + @Schema(description = "订单id") @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) private List orderId; @@ -62,7 +62,7 @@ public class OptimizeBoardModelDO extends ESDocument { private List mixGoodsIds; - @Schema(description = "生产单已优化小板数量") + @Schema(description = "订单已优化小板数量") private Long placeBlockNumber; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/module/ModuleDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/module/ModuleDO.java index 21a31f367..dd0a8b3be 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/module/ModuleDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/module/ModuleDO.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单模块 DO + * 订单模块 DO * * @author 晨丰科技 */ @@ -32,7 +32,7 @@ public class ModuleDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/moduleitem/ModuleItemDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/moduleitem/ModuleItemDO.java index 5f899260a..a3136c78c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/moduleitem/ModuleItemDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/moduleitem/ModuleItemDO.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单模块明细 DO + * 订单模块明细 DO * * @author 晨丰科技 */ @@ -30,7 +30,7 @@ public class ModuleItemDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java index bd519570e..ebd990ed5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java @@ -8,7 +8,7 @@ import lombok.*; import java.time.LocalDateTime; /** - * 生产单表 order_{N} DO + * 订单表 order_{N} DO * * @author 晨丰科技 */ @@ -23,7 +23,7 @@ import java.time.LocalDateTime; public class OrderDO extends BaseDO { /** - * 生产单号，主键 + * 订单号，主键 */ @TableId private Long id; @@ -36,11 +36,11 @@ public class OrderDO extends BaseDO { */ private Long parentNo; /** - * 源生产单号 + * 源订单号 */ private String apiOrderId; /** - * 生产单日期 + * 订单日期 */ private LocalDateTime orderDate; /** @@ -48,15 +48,15 @@ public class OrderDO extends BaseDO { */ private LocalDateTime deliveryDate; /** - * 生产单的完成时间 + * 订单的完成时间 */ private LocalDateTime finishTime; /** - * 生产单类型，1主单 2子单 + * 订单类型，1主单 2子单 */ private Integer orderType; /** - * 生产单排序号 + * 订单排序号 */ private Integer orderSort; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java index 78c27cc37..38b04ad50 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单柜体 DO + * 订单柜体 DO * * @author 晨丰科技 */ @@ -29,7 +29,7 @@ public class OrderBodyDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java index e42519f72..976dd1ed1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java @@ -5,7 +5,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import lombok.*; /** - * 生产单加工组 DO + * 订单加工组 DO * * @author 晨丰科技 */ @@ -28,7 +28,7 @@ public class OrderGroupDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** @@ -36,7 +36,7 @@ public class OrderGroupDO extends BaseDO { */ private Long bodyId; /** - * 加工组类型id，依据同一生产单的同一房间的同一柜体的相同加工组类型，由服务端生成 + * 加工组类型id，依据同一订单的同一房间的同一柜体的相同加工组类型，由服务端生成 */ private Long groupTypeId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTaskDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTaskDO.java index 34af5d980..b0432f614 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTaskDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTaskDO.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; /** - * 生产单导入任务 + * 订单导入任务 * * @author Gqr * @since 2025/1/9 11:30 @@ -41,7 +41,7 @@ public class OrderImportTaskDO extends BaseDO { private Long organId; /** - * 生产单id + * 订单id */ private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTempDataDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTempDataDO.java index 62d2c5af8..da3bf32c6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTempDataDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderImport/OrderImportTempDataDO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; /** - * 生产单导入临时表 + * 订单导入临时表 * * @author Gqr * @since 2025/1/9 11:36 @@ -46,7 +46,7 @@ public class OrderImportTempDataDO { private Long taskId; /** - * 生产单id（补板用） + * 订单id（补板用） */ private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java index e2a262e44..60b34ef97 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderItemDO.java @@ -4,7 +4,7 @@ import lombok.*; import com.baomidou.mybatisplus.annotation.*; /** - * 生产单明细表 order_item DO + * 订单明细表 order_item DO * * @author 晨丰科技 */ @@ -24,7 +24,7 @@ public class OrderItemDO { private Long id; /** - * 生产单号 + * 订单号 */ private Long orderId; /** @@ -52,7 +52,7 @@ public class OrderItemDO { */ private Long groupId; /** - * 生产单板件id + * 订单板件id */ private Long plateId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderModuleExtra/OrderModuleExtraDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderModuleExtra/OrderModuleExtraDO.java index 6269bd96e..4425b30ba 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderModuleExtra/OrderModuleExtraDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderModuleExtra/OrderModuleExtraDO.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单模块扩充属性表 order_module_extra_N DO + * 订单模块扩充属性表 order_module_extra_N DO * * @author 晨丰科技 */ @@ -25,7 +25,7 @@ public class OrderModuleExtraDO{ @TableId private Long id; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java index 7f0efe4b1..8b9d09047 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单配件表 order_parts_{N} DO + * 订单配件表 order_parts_{N} DO * * @author 晨丰科技 */ @@ -27,7 +27,7 @@ public class OrderPartsDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelCompressDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelCompressDO.java index 83da95842..2d0df9aec 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelCompressDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelCompressDO.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; /** - * @author 生产单板材造型数据的压缩保存 + * @author 订单板材造型数据的压缩保存 */ @Data @Builder @@ -18,11 +18,11 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class OrderModelCompressDO extends ESDocument { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; - @Schema(description = "生产单造型的压缩数据") + @Schema(description = "订单造型的压缩数据") private String orderModelZip; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java index cace4ab22..d89eb2f20 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java @@ -16,7 +16,7 @@ import java.util.Map; /** * @author Beal - * 生产单 小板的轮廓数据对象 + * 订单 小板的轮廓数据对象 */ @Data @Builder @@ -25,7 +25,7 @@ import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) public class OrderModelDO extends ESDocument { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "小板id") private Long plateId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderPlateModel.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderPlateModel.java index 6c172ee60..c920f4360 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderPlateModel.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderPlateModel.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class OrderPlateModel extends ESDocument { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "大板分类ID") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPackageDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPackageDO.java index 87310592c..da57e335c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPackageDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPackageDO.java @@ -26,7 +26,7 @@ public class OrderPackageDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; - // 生产单号 + // 订单号 private Long orderId; // 包裹编号 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPrepackagedDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPrepackagedDO.java index bc4b35a21..5c656e5bb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPrepackagedDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/pack/OrderPrepackagedDO.java @@ -17,7 +17,7 @@ public class OrderPrepackagedDO { @TableId - // 生产单号-主键 + // 订单号-主键 private Long orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java index e716bf3cb..9ac08a45c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java @@ -7,7 +7,7 @@ import lombok.*; import java.time.LocalDateTime; /** - * 生产单开料排单 DO + * 订单开料排单 DO * * @author 晨丰科技 */ @@ -35,7 +35,7 @@ public class PlanDO extends BaseDO { */ private Long sort; /** - * 排单类型：1 混单排单，2 生产单排单 + * 排单类型：1 混单排单，2 订单排单 */ private Integer type; /** @@ -75,7 +75,7 @@ public class PlanDO extends BaseDO { */ private LocalDateTime planTime; /** - * 生产单号 + * 订单号 */ private String orderNos; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/planitem/PlanItemDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/planitem/PlanItemDO.java index 0b5c9a209..f8ebadbd3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/planitem/PlanItemDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/planitem/PlanItemDO.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.*; /** - * 生产单开料排单明细 DO + * 订单开料排单明细 DO * * @author 晨丰科技 */ @@ -23,7 +23,7 @@ public class PlanItemDO { @TableId private Long id; /** - * 生产单 ID + * 订单 ID */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java index 0e32efff2..84901971d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java @@ -7,7 +7,7 @@ import lombok.*; import java.math.BigDecimal; /** - * 生产单板件 DO + * 订单板件 DO * * @author 晨丰科技 */ @@ -30,7 +30,7 @@ public class PlateDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java index 0f80456e4..eb137ec2a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单工序 DO + * 订单工序 DO * * @author 晨丰科技 */ @@ -34,7 +34,7 @@ public class OrderProcessDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java index 2710e6f52..16f6009e6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; /** - * 生产单工序步骤 DO + * 订单工序步骤 DO * * @author 晨丰科技 */ @@ -35,7 +35,7 @@ public class ProcessStepDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** @@ -55,7 +55,7 @@ public class ProcessStepDO extends BaseDO { */ private Double pieceRate; /** - * 计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7生产单金额百分比 + * 计件工资类型，1数量，2长度，3平方，4宽，5高，6体积，7订单金额百分比 */ private Integer pieceType; /** @@ -71,7 +71,7 @@ public class ProcessStepDO extends BaseDO { */ private Long processinfoId; /** - * 生产单工序 ID + * 订单工序 ID */ private Long orderProcessId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStepItem/OrderProcessStepItemDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStepItem/OrderProcessStepItemDO.java index bfe12f0bb..e44e37fd8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStepItem/OrderProcessStepItemDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStepItem/OrderProcessStepItemDO.java @@ -27,7 +27,7 @@ public class OrderProcessStepItemDO { // 工序项目名 private String name; - // 生产单工序 id + // 订单工序 id private Long orderProcessId; // 工序状态 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java index ae9dc3b99..55d57ea33 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java @@ -5,7 +5,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import lombok.*; /** - * 生产单设计商品表 order_raw_goods_{N} DO + * 订单设计商品表 order_raw_goods_{N} DO * * @author 晨丰科技 */ @@ -28,7 +28,7 @@ public class RawGoodsDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/remainplaten/RemainPlateDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/remainplaten/RemainPlateDO.java index c1e22602c..ff81477dd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/remainplaten/RemainPlateDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/remainplaten/RemainPlateDO.java @@ -7,7 +7,7 @@ import lombok.*; import java.math.BigDecimal; /** - * 生产单余料板表 order_remain_plate_{N} DO + * 订单余料板表 order_remain_plate_{N} DO * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/BoardProdInfoDTO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/BoardProdInfoDTO.java index 4bb6c7e3e..a64422a67 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/BoardProdInfoDTO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/BoardProdInfoDTO.java @@ -21,12 +21,12 @@ import lombok.NoArgsConstructor; public class BoardProdInfoDTO { @Schema(description = "商品表") private RawGoodsDO rawGoodsDO; - @Schema(description = "生产单柜体表") + @Schema(description = "订单柜体表") private OrderBodyDO orderBodyDO; - @Schema(description = "生产单加工组表") + @Schema(description = "订单加工组表") private OrderGroupDO orderGroupDO; - @Schema(description = "生产单五金表") + @Schema(description = "订单五金表") private OrderPartsDO orderPartsDO; - @Schema(description = "生产单小板表") + @Schema(description = "订单小板表") private PlateDO plateDO; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/RawGoodsDTO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/RawGoodsDTO.java index d7fb5e0a8..19ec96cfc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/RawGoodsDTO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dto/RawGoodsDTO.java @@ -19,7 +19,7 @@ public class RawGoodsDTO { */ private Long id; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java index 16bbfff9c..6b167525b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java @@ -27,7 +27,7 @@ import java.util.Set; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; /** - * 生产单商品 Mapper + * 订单商品 Mapper * * @author 晨丰科技 */ @@ -102,7 +102,7 @@ public interface GoodsMapper extends BaseMapperX { - // 根据生产单删除 + // 根据订单删除 default int deleteByOrderId(Long orderId, Long organId) { return delete(new LambdaQueryWrapperX() .eq(GoodsDO::getOrganId, organId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/module/ModuleMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/module/ModuleMapper.java index 42e718637..d90efc238 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/module/ModuleMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/module/ModuleMapper.java @@ -12,7 +12,7 @@ import com.cf.imes.module.executor.controller.admin.module.vo.*; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; /** - * 生产单模块 Mapper + * 订单模块 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/moduleitem/ModuleItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/moduleitem/ModuleItemMapper.java index 42153faf9..e668bcc85 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/moduleitem/ModuleItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/moduleitem/ModuleItemMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.executor.dal.dataobject.moduleitem.ModuleItemDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单模块明细 Mapper + * 订单模块明细 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index f51465632..8e0a242bd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * 生产单表 order_{N} Mapper + * 订单表 order_{N} Mapper * * @author 晨丰科技 */ @@ -107,14 +107,14 @@ public interface OrderMapper extends BaseMapperX { Map selectDynamicSqlString(@Param("sqlStr") String sqlStr); - // 查找生产单 + // 查找订单 default List selectOrder(Long id, Long organId) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OrderDO::getId, id) .eqIfPresent(OrderDO::getOrganId, organId)); } - // 修改生产单状态 单个 + // 修改订单状态 单个 default int updateOrderStatus(Long id, Integer status, Long organId) { return update(new LambdaUpdateWrapper() .set(OrderDO::getStatus, status) @@ -123,14 +123,14 @@ public interface OrderMapper extends BaseMapperX { .eq(OrderDO::getOrganId, organId)); } - // 查询单个生产单 + // 查询单个订单 default OrderDO selectOrderOne(Long id, Long organId) { return selectOne(new LambdaQueryWrapper() .eq(OrderDO::getOrganId, organId) .eq(OrderDO::getId, id)); } - // 删除状态为条件，查询生产单 + // 删除状态为条件，查询订单 default OrderDO selectOrderOne(Long id, Long organId, Integer deleted) { return selectOne(new LambdaQueryWrapper() .eq(OrderDO::getId, id) @@ -138,7 +138,7 @@ public interface OrderMapper extends BaseMapperX { .eq(OrderDO::getDeleted, deleted)); } - // 批量查询生产单 + // 批量查询订单 default List selectOrderList(Collection ids, Long organId) { return selectList(new LambdaQueryWrapper() .in(OrderDO::getId, ids) @@ -158,14 +158,14 @@ public interface OrderMapper extends BaseMapperX { - // 生产单预警统计 + // 订单预警统计 IPage selectOrderNear(@Param("orderDate") LocalDate orderDate, @Param("organId") Long organId, @Param("page") IPage page); - // 生产单逾期统计 + // 订单逾期统计 IPage selectOrderOverdue(@Param("today") LocalDate today, @Param("organId") Long organId, @Param("page") IPage page); /** - * 生产单数量统计 + * 订单数量统计 */ default Integer selectOrderCount(Long organId) { return Math.toIntExact(selectCount(new LambdaQueryWrapperX() @@ -174,7 +174,7 @@ public interface OrderMapper extends BaseMapperX { } /** - * 今日新增生产单总数统计 + * 今日新增订单总数统计 */ default Integer selectOrderCountToday(Long organId) { return Math.toIntExact(selectCount(new LambdaQueryWrapperX() @@ -184,7 +184,7 @@ public interface OrderMapper extends BaseMapperX { } /** - * 今日完成生产单总数统计 + * 今日完成订单总数统计 */ default Integer selectOrderCountTodayFinish(Long organId) { return Math.toIntExact(selectCount(new LambdaQueryWrapperX() @@ -193,7 +193,7 @@ public interface OrderMapper extends BaseMapperX { } /** - * 生产中生产单总数 + * 生产中订单总数 */ default Integer selectOrderCountProduce(Long organId) { return Math.toIntExact(selectCount(new LambdaQueryWrapperX() @@ -209,19 +209,19 @@ public interface OrderMapper extends BaseMapperX { */ Integer selectOrderSquareProduce(@Param("organId") Long organId); - // 生产单单量 + // 订单单量 @OrganIgnore List selectOrderCountProducePeriod(@Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); - // 物理删除生产单 + // 物理删除订单 default int deleteOrder(Long id, Long organId) { return delete(new LambdaQueryWrapperX() .eq(OrderDO::getOrganId, organId) .eqIfPresent(OrderDO::getId, id)); } - // 查询修改时间距离当天日期为30的生产单 + // 查询修改时间距离当天日期为30的订单 default List selectOrderListByUpdateTime() { return selectList(new LambdaQueryWrapper() .eq(OrderDO::getDeleted, OrderDeletedEnum.DELETED.getStatus()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderStatisticsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderStatisticsMapper.java index 62c5a87cb..c45d1cf4b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderStatisticsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderStatisticsMapper.java @@ -24,14 +24,14 @@ import java.util.List; public interface OrderStatisticsMapper extends BaseMapperX { /** - * 生产单数量统计 + * 订单数量统计 */ default Integer selectOrderCount() { return Math.toIntExact(selectCount()); } /** - * 今日新增生产单总数统计 + * 今日新增订单总数统计 * */ default Integer selectOrderCountToday() { @@ -42,7 +42,7 @@ public interface OrderStatisticsMapper extends BaseMapperX { } /** - * 今日完成生产单总数统计 + * 今日完成订单总数统计 * */ default Integer selectOrderCountTodayFinish() { @@ -53,7 +53,7 @@ public interface OrderStatisticsMapper extends BaseMapperX { } /** - * 生产中生产单总数 + * 生产中订单总数 * */ default Integer selectOrderCountProduce() { @@ -71,7 +71,7 @@ public interface OrderStatisticsMapper extends BaseMapperX { Double selectOrderSquareProduce(); /** - * 生产单状态按时间分组统计数量 + * 订单状态按时间分组统计数量 * * @param reqVO * @return @@ -79,7 +79,7 @@ public interface OrderStatisticsMapper extends BaseMapperX { List selectOrderStatusCountGroupBy(@Param("req") OrderStatisticsReqVO reqVO); /** - * 生产单按时间分组统计数量 + * 订单按时间分组统计数量 * * @param reqVO * @return @@ -87,7 +87,7 @@ public interface OrderStatisticsMapper extends BaseMapperX { List selectOrderCountGroupByOrderDate(@Param("req") OrderStatisticsReqVO reqVO); /** - * 生产单按时间分组统计面积 + * 订单按时间分组统计面积 * * @param reqVO * @return diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java index 9d7084ae8..803810eb0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Set; /** - * 生产单柜体 Mapper + * 订单柜体 Mapper * * @author 晨丰科技 */ @@ -91,7 +91,7 @@ public interface OrderBodyMapper extends BaseMapperX { List selectRoomAndBody(@Param("orderIds") List orderIds, @Param("organId") Long organId); - // 生产单柜体记录数量 + // 订单柜体记录数量 default int selectCountByOrderId(Long orderId, Long organId, Integer deleted) { return Math.toIntExact(selectCount(new LambdaUpdateWrapper() .eq(OrderBodyDO::getOrderId, orderId) @@ -170,7 +170,7 @@ public interface OrderBodyMapper extends BaseMapperX { - // 根据生产单进行删除 + // 根据订单进行删除 default int deleteByOrderId(Long orderId, Long organId) { return delete(new LambdaQueryWrapperX() .eq(OrderBodyDO::getOrganId, organId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java index 75ea0a7bc..16b5b753a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * 生产单加工组 Mapper + * 订单加工组 Mapper * * @author 晨丰科技 */ @@ -28,7 +28,7 @@ public interface OrderGroupMapper extends BaseMapperX { int updatePlateNumById(@Param("orderId") Long orderId, @Param("plateNum") Double plateNum); - // 生产单中包含的加工组 + // 订单中包含的加工组 List getOrderGroupByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId); // 单个修改删除状态 @@ -112,7 +112,7 @@ public interface OrderGroupMapper extends BaseMapperX { .eq(OrderGroupDO::getOrganId, organId)); } - // 根据生产单id删除 + // 根据订单id删除 default int deleteByOrderId(Long orderId, Long organId) { return delete(new LambdaQueryWrapperX() .eq(OrderGroupDO::getOrganId, organId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTaskMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTaskMapper.java index 5acbfd3f1..fbdf545b7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTaskMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTaskMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.executor.dal.dataobject.orderImport.OrderImportTaskDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单导入任务 Mapper + * 订单导入任务 Mapper * * @author Gqr * @since 2025/1/9 11:42 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTempDataMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTempDataMapper.java index 917dcb0af..fc3e0a6fb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTempDataMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderImport/OrderImportTempDataMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.executor.dal.dataobject.orderImport.OrderImportTempDat import org.apache.ibatis.annotations.Mapper; /** - * 生产单导入临时表 Mapper + * 订单导入临时表 Mapper * * @author Gqr * @since 2025/1/9 11:42 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index a0ac6f840..9ae3a8a2f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Set; /** - * 生产单明细表 order_item Mapper + * 订单明细表 order_item Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java index 311d2cbc9..f3f3a953e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java @@ -22,7 +22,7 @@ import java.util.List; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; /** - * 生产单配件表 order_parts_{N} Mapper + * 订单配件表 order_parts_{N} Mapper * * @author 晨丰科技 */ @@ -83,7 +83,7 @@ public interface OrderPartsMapper extends BaseMapperX { int countPartsByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); - // 根据生产单删除 + // 根据订单删除 default int deleteByOrderId(Long orderId, Long organId) { return delete(new LambdaQueryWrapperX() .eq(OrderPartsDO::getOrganId, organId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java index c8af669be..7b4368743 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java @@ -72,7 +72,7 @@ public interface OrderPackageMapper extends BaseMapperX { List selectPackPieceCount(@Param("orderIds") List orderIds, @Param("organId") Long organId); - // 删除当前生产单下所有的包裹 + // 删除当前订单下所有的包裹 default void updateDelete(Long orderId,Long organId) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() .set(OrderPackageDO::getDeleted, true) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index 005399647..c56cbb825 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; /** - * 生产单开料排单 Mapper + * 订单开料排单 Mapper * * @author 晨丰科技 */ @@ -151,7 +151,7 @@ public interface PlanMapper extends BaseMapperX { List selectPlanOrderIds(@Param("planIds") List planIds, @Param("orderIds") Set orderIds, @Param("organId") Long organId); /** - * 查询排单+生产单下订单材质orderGoodsId + * 查询排单+订单下订单材质orderGoodsId * * @param planId * @param orderIds diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java index eb3b874e3..50a9cc50d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 生产单开料排单明细 Mapper + * 订单开料排单明细 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/OrderPlateStatisticsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/OrderPlateStatisticsMapper.java index 798872894..f417f5ddc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/OrderPlateStatisticsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/OrderPlateStatisticsMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 生产单板件统计Mapper + * 订单板件统计Mapper * * @author Gqr * @since 2024/8/7 17:06 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index 9a546d4db..e9db29e8c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -32,7 +32,7 @@ import java.util.Set; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; /** - * 生产单板件 Mapper + * 订单板件 Mapper * * @author 晨丰科技 */ @@ -143,7 +143,7 @@ public interface PlateMapper extends BaseMapperX { List selectDeletedPlate(@Param("orderId") Long orderId, @Param("bodyIds") Collection bodyIds,@Param("organId") Long organId); - // 根据生产单id删除 + // 根据订单id删除 default int deleteByOrderId(Long orderId, Long organId) { return delete(new LambdaQueryWrapperX() .eq(PlateDO::getOrganId, organId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/process/OrderProcessMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/process/OrderProcessMapper.java index 170b23767..185c49108 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/process/OrderProcessMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/process/OrderProcessMapper.java @@ -10,14 +10,14 @@ import org.apache.ibatis.annotations.Mapper; import java.util.Collection; /** - * 生产单工序 Mapper + * 订单工序 Mapper * * @author 晨丰科技 */ @Mapper public interface OrderProcessMapper extends BaseMapperX { - // 校验是否已经存在该生产单对应工序组 + // 校验是否已经存在该订单对应工序组 default Boolean getOrderProcess(Long orderId,Long organId) { return selectCount(new LambdaQueryWrapperX() .eq(OrderProcessDO::getOrderId, orderId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStep/ProcessStepMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStep/ProcessStepMapper.java index 189ba2814..547557c79 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStep/ProcessStepMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStep/ProcessStepMapper.java @@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Param; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; /** - * 生产单工序步骤 Mapper + * 订单工序步骤 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/rawgoods/RawGoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/rawgoods/RawGoodsMapper.java index a9128eb7c..6c8d66da3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/rawgoods/RawGoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/rawgoods/RawGoodsMapper.java @@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Mapper; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; /** - * 生产单设计商品表 order_raw_goods_{N} Mapper + * 订单设计商品表 order_raw_goods_{N} Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/EsIndexEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/EsIndexEnum.java index c39f61f8e..f5db739b9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/EsIndexEnum.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/EsIndexEnum.java @@ -14,11 +14,11 @@ import lombok.RequiredArgsConstructor; public enum EsIndexEnum { - ORDER_PLATE_MODEL("生产单板材造型", "imes_order_plate_model"), + ORDER_PLATE_MODEL("订单板材造型", "imes_order_plate_model"), ORDER_OPTIMIZE_PLATE_MODEL("排单优化数据", "imes_order_optimize_plate_model"), - ORDER_PARTS_REMARK_MODEL("生产单配件备注", "imes_order_parts_remark_model"), + ORDER_PARTS_REMARK_MODEL("订单配件备注", "imes_order_parts_remark_model"), PLAN_PROCESS_SCHEME_OPTIMIZE_MODEL("排单的加工方案组对应的优化信息", "imes_plan_process_scheme_optimize_model"), @@ -26,7 +26,7 @@ public enum EsIndexEnum { PLAN_PROCESS_SCHEME_CONFIG("排单的加工方案组对应的配置信息", "imes_plan_process_scheme_config_model"), - ORDER_PLATE_COMPRESS_MODEL("生产单板材造型的压缩数据","imes_order_plate_compress_model"); + ORDER_PLATE_COMPRESS_MODEL("订单板材造型的压缩数据","imes_order_plate_compress_model"); /** * 索引名称 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderItemType.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderItemType.java index 68cb9db86..8271f1834 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderItemType.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderItemType.java @@ -4,7 +4,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; /** - * 生产单明细类型 + * 订单明细类型 * * @author Gqr * @since 2024/6/7 14:50 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java index dc48ea63a..4e7331bd4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java @@ -15,9 +15,9 @@ public interface CustomPlateNoGenerateService { /** * 生成自定义板编号 * - * @param orderDO 生产单号 + * @param orderDO 订单号 * @param plateDOList 板件列表 - * @param newOrder 是否新单，否：向已有生产单导入新板 + * @param newOrder 是否新单，否：向已有订单导入新板 */ void generateCustomPlateNo(OrderDO orderDO, List plateDOList, boolean newOrder); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java index edb0d1e47..b2007bb66 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java @@ -87,13 +87,13 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe loopGenerateNo(orderId, plateDO, orgCustomPlateNoRuleVOList, generateConfig, i == 0); } - // 3、保存生产单序号json、设置生产单所用配置id + // 3、保存订单序号json、设置订单所用配置id OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); if (newOrder) { orderDO.setCustomPlatenoSeq(JSON.toJSONString(orderCustomPlateNoSeqVO)); orderDO.setCustomPlatenoConfigId(orgCustomPlateNoConfigId); } else { - // 已有生产单更新序号 + // 已有订单更新序号 orderMapper.update(new LambdaUpdateWrapper().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO)))); } // 机构下序号配置同步 @@ -144,10 +144,10 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe } /** - * 根据生产单id获取生成需要的配置 + * 根据订单id获取生成需要的配置 * * @param orderId - * @return 1、生产单下的序号 + * @return 1、订单下的序号 * 2、机构下的序号 * 3、机构下全局配置的规则 */ @@ -157,7 +157,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe // 机构下自定义板编号配置 SystemConfigRespDTO orgCustomPlateNoConfig = null; - // 生产单下序号 + // 订单下序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = new OrderCustomPlateNoSeqVO(); // 自定义板编号配置规则明细列表 List customPlateNoRuleVOS = List.of(); @@ -174,7 +174,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe OrderDO order = orderService.getOrder(orderId); if (ObjectUtil.isNotNull(order) && ObjectUtil.isNotNull(orgCustomPlateNoConfig)) { // 老单 - // 生产单上的自定义板编号配置id和当前最新的对比，不同用生产单号上的 + // 订单上的自定义板编号配置id和当前最新的对比，不同用订单号上的 Long orderCustomPlatenoConfigId = order.getCustomPlatenoConfigId(); if (ObjectUtil.isNotNull(orderCustomPlatenoConfigId) && ObjectUtil.notEqual(orgCustomPlateNoConfig.getId(), orderCustomPlatenoConfigId)) { CommonResult previousCustomPlateNoConfig = systemConfigApi.getById(orderCustomPlatenoConfigId); @@ -183,7 +183,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe } } - // 上一次的生产单内 自定义版编号序号 + // 上一次的订单内 自定义版编号序号 orderCustomPlateNoSeqVO = JSON.parseObject(order.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); } customPlateNoGenerateConfigVO.setOrderCustomPlateNoSeqVO(orderCustomPlateNoSeqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java index 4513aed43..6a0f0e963 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java @@ -15,7 +15,7 @@ public class CustomPlateNoGenerateConfigVO implements Serializable { private static final long serialVersionUID = -7383861104153624467L; /** - * 生产单下的之定义板编号序号内容 + * 订单下的之定义板编号序号内容 */ private OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/OrderCustomPlateNoSeqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/OrderCustomPlateNoSeqVO.java index cd3c1d93a..5ae892428 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/OrderCustomPlateNoSeqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/vo/OrderCustomPlateNoSeqVO.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.List; /** - * 生产单-自定义板编号序号（custom_plateno_seq）vo + * 订单-自定义板编号序号（custom_plateno_seq）vo * * @author Gqr * @since 2024/11/15 10:41 @@ -20,32 +20,32 @@ public class OrderCustomPlateNoSeqVO implements Serializable { private static final long serialVersionUID = 5841977329049878792L; /** - * 生产单序号 + * 订单序号 */ private Integer orderNoSeq; /** - * 生产单下房间序号 + * 订单下房间序号 */ private Integer roomNoSeq; /** - * 生产单下柜体序号 + * 订单下柜体序号 */ private Integer bodyNoSeq; /** - * 生产单下板件序号 + * 订单下板件序号 */ private Integer plateNoSeq; /** - * 生产单下房间列表 + * 订单下房间列表 */ private List rooms; /** - * 生产单下柜体列表 + * 订单下柜体列表 */ private List bodys; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java index bab521e9a..5bb4b6eba 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java @@ -87,13 +87,13 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); ResetModeEnum resetModeEnum = ResetModeEnum.getByMode(ruleDTO.getResetMode()); - // 根据复位模式更新生产单的序号 + // 根据复位模式更新订单的序号 for (OrderDO orderDO : orderDOS) { resetOrder(orderDO, resetModeEnum); } @@ -117,9 +117,9 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 按生产单复位模式下的板编号生成 + * 按订单复位模式下的板编号生成 * - * @param orderId 生产单号 + * @param orderId 订单号 * @param plateNoRule 当前规则配置 * @param generateConfig 生成规则配置 * @param plateDO 板件列表 @@ -128,40 +128,40 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS private CustomPlateNoGenerateConfigVO generateNoByOrderResetMode(Long orderId, CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO, boolean firstPlate) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // 机构下的自定义板编号序号 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); - // 生产单下柜体序号 + // 订单下柜体序号 Integer orderBodyNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getBodyNoSeq()).orElse(initValue); - // 生产单序号下的房间序号列表 + // 订单序号下的房间序号列表 List bodys = orderCustomPlateNoSeqVO.getBodys(); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 跨单复位到初始值 orderBodyNoSeq = initValue; } String bodyName = plateDO.getBodyName(); - // 根据柜体名获取生产单下序号json中第一层柜体列表的柜体序号 + // 根据柜体名获取订单下序号json中第一层柜体列表的柜体序号 OrderCustomPlateNoSeqBodyVO bodySeqVo = getBodySeqVOByBodyName(bodyName, bodys); // 获取当前柜体序号值 Integer bodyNoSeq = Optional.ofNullable(bodySeqVo).map(OrderCustomPlateNoSeqBodyVO::getBodyNoSeq).orElse(null); if (bodySeqVo == null) { - // 生产单序号下柜体为空，新建柜体，取生产单下柜体序号 + // 订单序号下柜体为空，新建柜体，取订单下柜体序号 bodySeqVo = OrderCustomPlateNoSeqBodyVO.builder() .bodyName(bodyName) .build(); bodys.add(bodySeqVo); // 累加步长 bodyNoSeq = orderBodyNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下柜体序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下柜体序号累加到多少了 orderCustomPlateNoSeqVO.setBodyNoSeq(bodyNoSeq); } else if (bodyNoSeq == null) { - // 柜体下序号为空，取生产单下房间序号 + // 柜体下序号为空，取订单下房间序号 // 累加步长 bodyNoSeq = orderBodyNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下柜体序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下柜体序号累加到多少了 orderCustomPlateNoSeqVO.setBodyNoSeq(bodyNoSeq); } @@ -185,12 +185,12 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS private CustomPlateNoGenerateConfigVO generateNoByRoomResetMode(CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); List rooms = orderCustomPlateNoSeqVO.getRooms(); String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的柜体序号 + // 根据房间名获取订单下序号json中的房间下的柜体序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getRoomSeqVOByRoomName(roomName, rooms); Integer roomBodyNoRoomSeq = Optional.ofNullable(roomSeqVo) .map(OrderCustomPlateNoSeqRoomVO::getBodyNoSeq) @@ -206,9 +206,9 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS rooms.add(roomSeqVo); } - // 如果是新的柜体vo，要把累加的值记录到生产单rooms下的柜体 + // 如果是新的柜体vo，要把累加的值记录到订单rooms下的柜体 String bodyName = plateDO.getBodyName(); - // 根据柜体名获取生产单下序号中rooms下柜体列表的柜体序号 + // 根据柜体名获取订单下序号中rooms下柜体列表的柜体序号 List roomBodys = roomSeqVo.getBodys(); OrderCustomPlateNoSeqBodyVO roomBodySeqVo = getBodySeqVOByBodyName(bodyName, roomBodys); // 获取当前房间下柜体的序号值 @@ -221,13 +221,13 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS roomBodys.add(roomBodySeqVo); // 累加步长 roomBodyNoSeq = roomBodyNoRoomSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间中柜体累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间中柜体累加到多少了 roomSeqVo.setBodyNoSeq(roomBodyNoSeq); } else if (roomBodyNoSeq == null) { // 房间下柜体序号为空，设置房间下全局柜体序号值 // 累加步长 roomBodyNoSeq = roomBodyNoRoomSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间中柜体累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间中柜体累加到多少了 roomSeqVo.setBodyNoSeq(roomBodyNoSeq); } @@ -241,7 +241,7 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 根据房间名从生产单序号json中获取房间序号 + * 根据房间名从订单序号json中获取房间序号 * * @param roomName * @param roomVOList @@ -252,7 +252,7 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 根据柜体名从生产单序号json中获取柜体序号 + * 根据柜体名从订单序号json中获取柜体序号 * * @param bodyName * @param bodyVOList diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/CustomPlateNoGenerateRuleService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/CustomPlateNoGenerateRuleService.java index 6199dd21f..cd6d8bca8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/CustomPlateNoGenerateRuleService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/CustomPlateNoGenerateRuleService.java @@ -23,7 +23,7 @@ public interface CustomPlateNoGenerateRuleService { /** * 生成编号 * - * @param orderId 生产单号 + * @param orderId 订单号 * @param plateNoRule 生成规则 * @param generateConfig 生成所需要的配置 * @param plateDO 板材列表 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java index db3d07861..e0cbd95de 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java @@ -27,7 +27,7 @@ import java.util.Optional; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.CUSTOM_PLATENO_GENERATE_ORDERNO_RULE_NOT_SUPPORT_RESETMODE; /** - * 生产单序号生成规则服务实现类 + * 订单序号生成规则服务实现类 * * @author Gqr * @since 2024/11/18 17:18 @@ -64,10 +64,10 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule public CustomPlateNoGenerateConfigVO generateNo(Long orderId, CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO, boolean firstPlate) { // 初始化配置 initConfig(generateConfig); - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); Integer orderNoSeq = orderCustomPlateNoSeqVO.getOrderNoSeq(); - // 当前导入已有序号的，生产单内生产单序号不会再变直接用 + // 当前导入已有序号的，订单内订单序号不会再变直接用 if (ObjectUtil.isNotNull(orderNoSeq)) { // 补零 String noPartAfterFill = this.fillZero(orderNoSeq, plateNoRule); @@ -78,7 +78,7 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); // 获取当前序号值 int currOrderNoSeq = Optional.ofNullable(orgCustomPlateNoSeqRespDTO.getOrderNoSeq()).orElse(plateNoRule.getInitValue() - plateNoRule.getIncrementStep()); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 根据复位模式计算序号 @@ -88,7 +88,7 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule String noPartAfterFill = this.fillZero(currOrderNoSeq, plateNoRule); plateDO.getCustomPlateNoBuilder().append(noPartAfterFill); - // 累加后的值同步到当前生产单序号和机构序号中 + // 累加后的值同步到当前订单序号和机构序号中 orderCustomPlateNoSeqVO.setOrderNoSeq(currOrderNoSeq); orgCustomPlateNoSeqRespDTO.setOrderNoSeq(currOrderNoSeq); return generateConfig; @@ -96,12 +96,12 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); - // 更新生产单的序号 + // 更新订单的序号 for (OrderDO orderDO : orderDOS) { OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = JSON.parseObject(orderDO.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); if (ObjectUtil.isNotNull(orderCustomPlateNoSeqVO)) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java index a5900aecf..752b9cca8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java @@ -88,13 +88,13 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); ResetModeEnum resetModeEnum = ResetModeEnum.getByMode(ruleDTO.getResetMode()); - // 根据复位模式更新生产单的序号 + // 根据复位模式更新订单的序号 for (OrderDO orderDO : orderDOS) { OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = JSON.parseObject(orderDO.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); if (ObjectUtil.isNotNull(orderCustomPlateNoSeqVO)) { @@ -111,7 +111,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 复位生产单下房间中的板件序号 + * 复位订单下房间中的板件序号 * * @param rooms */ @@ -124,7 +124,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 复位生产单下柜体中的板件序号 + * 复位订单下柜体中的板件序号 * * @param rooms */ @@ -169,7 +169,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 按生产单复位模式下的板编号生成 + * 按订单复位模式下的板编号生成 * * @param orderId * @param plateNoRule @@ -179,13 +179,13 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule private CustomPlateNoGenerateConfigVO generateNoByOrderResetMode(Long orderId, CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO, boolean firstPlate) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // 机构下的自定义板编号序号 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); - // 获取当前生产单下板件序号 + // 获取当前订单下板件序号 Integer orderPlateNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getPlateNoSeq()).orElse(initValue); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 跨单复位到初始值 @@ -194,7 +194,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule // 跨板件累加步长，补零 orderPlateNoSeq += incrementStep; plateDO.getCustomPlateNoBuilder().append(fillZero(orderPlateNoSeq, plateNoRule)); - // 累加后的值同步到当前生产单序号中 + // 累加后的值同步到当前订单序号中 orderCustomPlateNoSeqVO.setPlateNoSeq(orderPlateNoSeq); return generateConfig; } @@ -210,11 +210,11 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule private CustomPlateNoGenerateConfigVO generateNoByRoomResetMode(CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); List rooms = orderCustomPlateNoSeqVO.getRooms(); String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的加工组序号 + // 根据房间名获取订单下序号json中的房间下的加工组序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getSeqRoomByRoomName(roomName, rooms); // 为空初始化，加入列表 if (roomSeqVo == null) { @@ -228,7 +228,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule // 累加步长 Integer roomPlateNoSeq = Optional.ofNullable(roomSeqVo.getPlateNoSeq()) .orElse(initValue) + incrementStep; - // 累加后的值同步到当前生产单序号中 + // 累加后的值同步到当前订单序号中 roomSeqVo.setPlateNoSeq(roomPlateNoSeq); // 补零 plateDO.getCustomPlateNoBuilder().append(fillZero(roomPlateNoSeq, plateNoRule)); @@ -236,7 +236,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 根据房间名从生产单序号json中获取房间序号列表 + * 根据房间名从订单序号json中获取房间序号列表 * * @param roomName * @param roomVOList @@ -257,12 +257,12 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule private CustomPlateNoGenerateConfigVO generateNoByBodyResetMode(CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); List rooms = orderCustomPlateNoSeqVO.getRooms(); String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的加工组序号 + // 根据房间名获取订单下序号json中的房间下的加工组序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getSeqRoomByRoomName(roomName, rooms); if (ObjectUtil.isNull(roomSeqVo)) { // 房间为空，new房间 @@ -275,7 +275,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } String bodyName = plateDO.getBodyName(); - // 根据柜体名获取生产单下序号json中的房间下的加工组序号 + // 根据柜体名获取订单下序号json中的房间下的加工组序号 OrderCustomPlateNoSeqBodyVO bodySeqVO = getBodySeqByBodyName(bodyName, roomSeqVo); if (bodySeqVO == null) { @@ -289,7 +289,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule // 累加步长 // 获取柜体下的板件序号 Integer bodyPlateNoSeq = Optional.ofNullable(bodySeqVO.getPlateNoSeq()).orElse(initValue) + incrementStep; - // 累加后的值同步到当前生产单序号中 + // 累加后的值同步到当前订单序号中 bodySeqVO.setPlateNoSeq(bodyPlateNoSeq); // 补零 String noPartAfterFillZero = fillZero(bodyPlateNoSeq, plateNoRule); @@ -298,7 +298,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 根据房间名从生产单序号json中获取房间序号列表 + * 根据房间名从订单序号json中获取房间序号列表 * * @param bodyName * @param roomVO diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/ProcessGroupNoGenerateRuleServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/ProcessGroupNoGenerateRuleServiceImpl.java index 519a99965..08d0665a3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/ProcessGroupNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/ProcessGroupNoGenerateRuleServiceImpl.java @@ -76,9 +76,9 @@ // // // /** -// * 按生产单复位模式下的板编号生成 +// * 按订单复位模式下的板编号生成 // * -// * @param orderId 生产单号 +// * @param orderId 订单号 // * @param plateNoRule 当前规则配置 // * @param generateConfig 生成规则配置 // * @param plateDOList 板件列表 @@ -86,25 +86,25 @@ // */ // private CustomPlateNoGenerateConfigVO generateNoByOrderResetMode(Long orderId, CustomPlateNoRuleDTO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, List plateDOList) { // Integer initValue = plateNoRule.getInitValue() - plateNoRule.getIncrementStep(); -// // 生产单下的序号 +// // 订单下的序号 // OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // // 机构下的自定义板编号序号 // CustomPlateNoSeqRespDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); -// // 生产单下加工组序号 +// // 订单下加工组序号 // Integer orderProcessGroupNoSeq = null; // List processGroups = orderCustomPlateNoSeqVO.getProcessGroups(); // if (ObjectUtil.equal(orderId, orgCustomPlateNoSeqRespDTO.getLastOrderNo())) { -// // 当次导入和上次导入是同一个生产单 -// // 取之前的生产单下加工组序号，没有就用初始值 +// // 当次导入和上次导入是同一个订单 +// // 取之前的订单下加工组序号，没有就用初始值 // orderProcessGroupNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getProcessGroupNoSeq()).orElse(initValue); // } // // 基于加工组名分组 // Map> processGroupMap = plateDOList.stream().collect(Collectors.groupingBy(PlateDO::getProcessGroupName, Collectors.toList())); // for (Map.Entry> processGroupEntry : processGroupMap.entrySet()) { -// // 如果是新的加工组vo，要把累加的值记录到生产单 +// // 如果是新的加工组vo，要把累加的值记录到订单 // boolean needRecordToOrder = false; // String processGroupName = processGroupEntry.getKey(); -// // 根据加工组名获取生产单下序号json中第一层加工组列表的加工组序号 +// // 根据加工组名获取订单下序号json中第一层加工组列表的加工组序号 // OrderCustomPlateNoSeqProcessGroupVO processSeqVO = getProcessGroupSeqVOByProcessGroupName(processGroupName, processGroups); // // 获取当前加工组序号值 // Integer processGroupNoSeq = Optional.ofNullable(processSeqVO).map(OrderCustomPlateNoSeqProcessGroupVO::getProcessGroupNoSeq).orElse(initValue); @@ -129,7 +129,7 @@ // orderProcessGroupNoSeq = processGroupNoSeq; // } // } -// // 累加后的值同步到当前生产单序号中，生产单下加工组序号累加到多少了 +// // 累加后的值同步到当前订单序号中，订单下加工组序号累加到多少了 // orderCustomPlateNoSeqVO.setProcessGroupNoSeq(orderProcessGroupNoSeq); // return generateConfig; // } @@ -144,7 +144,7 @@ // */ // private CustomPlateNoGenerateConfigVO generateNoByRoomResetMode(CustomPlateNoRuleDTO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, List plateDOList) { // Integer initValue = plateNoRule.getInitValue() - plateNoRule.getIncrementStep(); -// // 生产单下的序号 +// // 订单下的序号 // OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // List rooms = orderCustomPlateNoSeqVO.getRooms(); // // 基于房间名分组 @@ -153,7 +153,7 @@ // for (Map.Entry> roomEntry : roomGroupMap.entrySet()) { // List roomPlateList = roomEntry.getValue(); // String roomName = roomEntry.getKey(); -// // 根据房间名获取生产单下序号json中的房间下的柜体序号 +// // 根据房间名获取订单下序号json中的房间下的柜体序号 // OrderCustomPlateNoSeqRoomVO roomSeqVo = getRoomSeqVOByRoomName(roomName, rooms); // Integer roomProcessGroupNoRoomSeq = Optional.ofNullable(roomSeqVo) // .map(OrderCustomPlateNoSeqRoomVO::getProcessGroupNoSeq) @@ -173,10 +173,10 @@ // Map> roomProcessGroupMap = roomPlateList.stream() // .collect(Collectors.groupingBy(PlateDO::getProcessGroupName, Collectors.toList())); // for (Map.Entry> roomPrcesssGroupEntry : roomProcessGroupMap.entrySet()) { -// // 如果是新的柜体vo，要把累加的值记录到生产单rooms下的柜体 +// // 如果是新的柜体vo，要把累加的值记录到订单rooms下的柜体 // boolean needRecordToOrder = false; // String processGroupName = roomPrcesssGroupEntry.getKey(); -// // 根据加工组名获取生产单下序号中rooms下加工组列表的加工组序号 +// // 根据加工组名获取订单下序号中rooms下加工组列表的加工组序号 // List roomProcessGroups = roomSeqVo.getProcessGroups(); // OrderCustomPlateNoSeqProcessGroupVO roomProcessGroupSeqVo = getProcessGroupSeqVOByProcessGroupName(processGroupName, roomProcessGroups); // // 获取当前房间下加工组的序号值 @@ -206,14 +206,14 @@ // roomProcessGroupNoRoomSeq = roomProcessGroupNoSeq; // } // } -// // 累加后的值同步到当前生产单序号中，生产单下房间中加工组累加到多少了 +// // 累加后的值同步到当前订单序号中，订单下房间中加工组累加到多少了 // roomSeqVo.setProcessGroupNoSeq(roomProcessGroupNoRoomSeq); // } // return generateConfig; // } // // /** -// * 根据房间名从生产单序号json中获取房间序号列表 +// * 根据房间名从订单序号json中获取房间序号列表 // * // * @param roomName // * @param roomVOList @@ -224,7 +224,7 @@ // } // // /** -// * 根据柜体名从生产单序号json中获取柜体序号列表 +// * 根据柜体名从订单序号json中获取柜体序号列表 // * // * @param processGroupName // * @param processGroupVOList diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java index 2fdd1cb2d..d1d78209a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java @@ -64,15 +64,15 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS Integer initValue = plateNoRule.getInitValue() - incrementStep; // 初始化配置 initConfig(generateConfig); - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // 机构下的自定义板编号序号 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); - // 生产单下房间序号 + // 订单下房间序号 Integer orderRoomNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getRoomNoSeq()).orElse(initValue); - // 生产单序号下的的房间序号列表 + // 订单序号下的的房间序号列表 List rooms = orderCustomPlateNoSeqVO.getRooms(); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 跨单复位到初始值 @@ -80,12 +80,12 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的柜体序号 + // 根据房间名获取订单下序号json中的房间下的柜体序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getRoomSeqVOByRoomName(roomName, rooms); // 获取当前房间序号值 Integer roomNoSeq = Optional.ofNullable(roomSeqVo).map(OrderCustomPlateNoSeqRoomVO::getRoomNoSeq).orElse(null); if (roomSeqVo == null) { - // 房间为空，新建房间，取生产单下房间序号 + // 房间为空，新建房间，取订单下房间序号 roomSeqVo = OrderCustomPlateNoSeqRoomVO.builder() .roomName(roomName) .bodys(new ArrayList<>()) @@ -93,13 +93,13 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS rooms.add(roomSeqVo); // 累加步长 roomNoSeq = orderRoomNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间序号累加到多少了 orderCustomPlateNoSeqVO.setRoomNoSeq(roomNoSeq); } else if (roomNoSeq == null) { - // 房间下序号为空，取生产单下房间序号 + // 房间下序号为空，取订单下房间序号 // 累加步长 roomNoSeq = orderRoomNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间序号累加到多少了 orderCustomPlateNoSeqVO.setRoomNoSeq(roomNoSeq); } @@ -114,12 +114,12 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); - // 更新生产单的序号 + // 更新订单的序号 for (OrderDO orderDO : orderDOS) { OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = JSON.parseObject(orderDO.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); if (ObjectUtil.isNotNull(orderCustomPlateNoSeqVO)) { @@ -130,7 +130,7 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 根据房间名从生产单序号json中获取房间序号列表 + * 根据房间名从订单序号json中获取房间序号列表 * * @param roomName * @param roomVOList diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsService.java index 0e7561233..431b63682 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsService.java @@ -8,14 +8,14 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.PageParam; /** - * 生产单商品 Service 接口 + * 订单商品 Service 接口 * * @author 晨丰科技 */ public interface GoodsService { /** - * 创建生产单商品 + * 创建订单商品 * * @param createReqVOS 创建信息 * @return 编号 @@ -23,32 +23,32 @@ public interface GoodsService { Boolean createCorrespondsGoods(@Valid List createReqVOS); /** - * 更新生产单商品 + * 更新订单商品 * * @param updateReqVO 更新信息 */ void updateGoods(@Valid GoodsSaveReqVO updateReqVO); /** - * 删除生产单商品 + * 删除订单商品 * * @param id 编号 */ void deleteGoods(Long id); /** - * 获得生产单商品 + * 获得订单商品 * * @param id 编号 - * @return 生产单商品 + * @return 订单商品 */ GoodsDO getGoods(Long id); /** - * 获得生产单商品分页 + * 获得订单商品分页 * * @param pageReqVO 分页查询 - * @return 生产单商品分页 + * @return 订单商品分页 */ PageResult getGoodsPage(GoodsPageReqVO pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsServiceImpl.java index c5a299e80..e98839e44 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/goods/GoodsServiceImpl.java @@ -26,7 +26,7 @@ import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; /** - * 生产单商品 Service 实现类 + * 订单商品 Service 实现类 * * @author 晨丰科技 */ @@ -53,7 +53,7 @@ public class GoodsServiceImpl implements GoodsService { @Transactional(rollbackFor = Exception.class) public Boolean createCorrespondsGoods(List createReqVOS) { List longs = new ArrayList<>(); - // 校验生产单是否存在 + // 校验订单是否存在 if (orderMapper.selectOne(OrderDO::getId, createReqVOS.get(0).getOrderId()) == null) { throw new ServiceException(GOODS_NOT_EXISTS); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java index 79b90d7ca..76aac7946 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java @@ -27,7 +27,7 @@ public interface PackService { - // 查询多个生产单对应的板材信息 + // 查询多个订单对应的板材信息 List getOrdersPlateList(List orderIds); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java index 40ded83ba..b06d4f2ad 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java @@ -152,7 +152,7 @@ public class PackServiceImpl implements PackService { } - // 查询多个生产单对应的板材信息 + // 查询多个订单对应的板材信息 @Override public List getOrdersPlateList(List orderIds) { @@ -306,12 +306,12 @@ public class PackServiceImpl implements PackService { orderPackageDO.setPackageNo(generatePackageNo()); orderPackageDO.setStatus((OrderPackageStatusEnum.PACKAGED.getStatus())); orderPackageMapper.insert(orderPackageDO); - // 生产单明细表新增包裹 ID + // 订单明细表新增包裹 ID if (reqVO.getAddPartsIdList() != null) { orderItemMapper.insertPartsId(orderPackageDO.getId(), reqVO.getAddPartsIdList(), reqVO.getOrderId(), getUserOrganId()); } - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 + // 判断当前订单的板材和配件是否已全部打包且当前订单的包裹已全部封包 if (validateOrderPack(reqVO.getOrderId())) { PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); @@ -340,11 +340,11 @@ public class PackServiceImpl implements PackService { if (reqVO.getDeletePartsIdList().size() == partsList.size() && !reqVO.getAddPlateIdList().isEmpty()) { - // 删除生产单明细表配件对应的包裹ID + // 删除订单明细表配件对应的包裹ID orderItemMapper.deletePartsList(reqVO.getDeletePartsIdList(), reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); - // 生产单明细表板材新增对应的包裹ID + // 订单明细表板材新增对应的包裹ID orderItemMapper.insertPackId(reqVO.getAddPlateIdList(), reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); @@ -370,7 +370,7 @@ public class PackServiceImpl implements PackService { orderPackageMapper.updateById(orderPackageDO); - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 + // 判断当前订单的板材和配件是否已全部打包且当前订单的包裹已全部封包 if (validateOrderPack(reqVO.getOrderId())) { PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); @@ -431,7 +431,7 @@ public class PackServiceImpl implements PackService { orderPackageDO.setStatus((OrderPackageStatusEnum.PACKAGED.getStatus())); orderPackageDO.setRemark(packageVO.getRemark()); orderPackageMapper.insert(orderPackageDO); - // 生产单明细表新增包裹 ID + // 订单明细表新增包裹 ID if (packageVO.getAddPlateIdList() != null) { orderItemMapper.insertPackId(packageVO.getAddPlateIdList(), orderPackageDO.getId(), packageVO.getOrderId(), getUserOrganId()); } @@ -463,11 +463,11 @@ public class PackServiceImpl implements PackService { if (packageVO.getDeletePlateIdList().size() == plateList.size() && !packageVO.getAddPartsIdList().isEmpty()) { - // 删除生产单明细表板件对应的包裹ID + // 删除订单明细表板件对应的包裹ID orderItemMapper.deletePackId(packageVO.getDeletePlateIdList(), packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); - // 生产单明细表配件新增对应的包裹ID + // 订单明细表配件新增对应的包裹ID orderItemMapper.insertParts(packageVO.getAddPartsIdList(), packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); @@ -494,10 +494,10 @@ public class PackServiceImpl implements PackService { orderPackageMapper.updateById(orderPackageDO); - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 + // 判断当前订单的板材和配件是否已全部打包且当前订单的包裹已全部封包 if (validateOrderPack(packageVO.getOrderId())) { - // 修改生产单的打包状态 + // 修改订单的打包状态 PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); p.updateOrderStatus(packageVO.getOrderId()); @@ -508,7 +508,7 @@ public class PackServiceImpl implements PackService { } - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 + // 判断当前订单的板材和配件是否已全部打包且当前订单的包裹已全部封包 public Boolean validateOrderPack(Long orderId) { List orderPackageDOS = orderPackageMapper.selectPackList(orderId, getUserOrganId()); @@ -526,14 +526,14 @@ public class PackServiceImpl implements PackService { } - // 修改当前生产单的工序状态和生产单的状态 + // 修改当前订单的工序状态和订单的状态 @Transactional(rollbackFor = Exception.class) public void updateOrderStatus(Long orderId) { OrderDO orderDO = ordersMapper.selectById(orderId); - // 修改生产单的打包状态为已打包 + // 修改订单的打包状态为已打包 orderDO.setPackaged(OrderPackageStatusEnum.PACKAGED.getStatus()); @@ -640,7 +640,7 @@ public class PackServiceImpl implements PackService { orderPartsMapper.insert(orderParts); - // 在包裹表中添加包裹编号和生产单号，修改包裹类型未其他配件类型 + // 在包裹表中添加包裹编号和订单号，修改包裹类型未其他配件类型 OrderPackageDO orderPackageDO = new OrderPackageDO(); orderPackageDO.setPackageNo(generatePackageNo()); orderPackageDO.setOrderId(reqVO.getOrderId()); @@ -650,7 +650,7 @@ public class PackServiceImpl implements PackService { orderPackageMapper.insert(orderPackageDO); - // 在生产单明细表中添加数据（生产单号，配件ID，包裹ID，部件数量） + // 在订单明细表中添加数据（订单号，配件ID，包裹ID，部件数量） OrderItemDO orderItemDO = new OrderItemDO(); orderItemDO.setOrderId(reqVO.getOrderId()); orderItemDO.setType(OrderItemTypeEnum.QUOTATIONACCESSORIES.getType()); @@ -659,7 +659,7 @@ public class PackServiceImpl implements PackService { orderItemDO.setNum(reqVO.getNum()); - // 在生产单明细表中新增数据 + // 在订单明细表中新增数据 orderItemMapper.insert(orderItemDO); // 查看新增的包裹信息 @@ -687,14 +687,14 @@ public class PackServiceImpl implements PackService { orderParts.setUnit(reqVO.getUnit()); orderPartsMapper.insert(orderParts); - // 在生产单明细表中添加数据（生产单号，配件ID，包裹ID，部件数量） + // 在订单明细表中添加数据（订单号，配件ID，包裹ID，部件数量） OrderItemDO orderItemDO = new OrderItemDO(); orderItemDO.setOrderId(reqVO.getOrderId()); orderItemDO.setPartsId(orderParts.getId()); orderItemDO.setPackageId(orderPackageDO.getId()); orderItemDO.setNum(reqVO.getNum()); - // 在生产单明细表中新增数据 + // 在订单明细表中新增数据 orderItemMapper.insert(orderItemDO); return BeanUtils.toBean(orderParts, OrderPartsRespVO.class); @@ -825,7 +825,7 @@ public class PackServiceImpl implements PackService { orderItemMapper.updateBatch(orderItemDOS); - // 查询配件是否为空，为空，修改生产单的状态为已打包 + // 查询配件是否为空，为空，修改订单的状态为已打包 List partsIds = orderItemMapper.selectOrderPackPartsIds(reqVO.getOrderId(), getUserOrganId()); if (partsIds.isEmpty()) { @@ -994,7 +994,7 @@ public class PackServiceImpl implements PackService { } - // 查询当前生产单已经打包的板材数量 + // 查询当前订单已经打包的板材数量 List plateNum = orderPackageMapper.selectPackPieceCount(orderIds, getUserOrganId()); for (PackRespVO packRespVO : plateNum) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageService.java index e80c5ff05..3caeb30f9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageService.java @@ -9,14 +9,14 @@ import jakarta.validation.Valid; import java.util.Set; /** - * 生产单余料板表 Service 接口 + * 订单余料板表 Service 接口 * * @author 晨丰科技 */ public interface RemainPlateManageService { /** - * 创建生产单余料板表 + * 创建订单余料板表 * * @param createReqVO 创建信息 * @return 编号 @@ -24,7 +24,7 @@ public interface RemainPlateManageService { Boolean createRemainPlate(@Valid RemainPlateSaveReqVO createReqVO); /** - * 创建生产单余料板表 + * 创建订单余料板表 * * @param createReqVOS 创建信息 多个 * @return 编号 @@ -42,7 +42,7 @@ public interface RemainPlateManageService { void updateRemainPlateStatus(Set ids, Integer status,Integer useType,Long planId); /** - * 更新生产单余料板表 + * 更新订单余料板表 * * @param ids 编号 * @param status 状态 @@ -57,25 +57,25 @@ public interface RemainPlateManageService { void updateRemainPlate(@Valid RemainPlateSaveReqVO updateReqVO); /** - * 删除生产单余料板表 + * 删除订单余料板表 * * @param ids 编号 */ void deleteRemainPlate(Set ids); /** - * 获得生产单余料板表 + * 获得订单余料板表 * * @param id 编号 - * @return 生产单余料板表 + * @return 订单余料板表 */ RemainPlateDO getRemainPlate(Long id); /** - * 获得生产单余料板表 + * 获得订单余料板表 * * @param pageReqVO 分页查询 - * @return 生产单余料板表 + * @return 订单余料板表 */ PageResult getRemainPlatePage(RemainPlatePageReqVO pageReqVO); @@ -83,7 +83,7 @@ public interface RemainPlateManageService { * 查询可添加余料板 * * @param pageReqVO 分页查询 - * @return 生产单余料板表 + * @return 订单余料板表 */ PageResult getRemainPlatePageToAdd(RemainPlatePageReqVO pageReqVO); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageServiceImpl.java index 36b4504ae..3a78bca1f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/remainplaten/RemainPlateManageServiceImpl.java @@ -29,7 +29,7 @@ import static com.cf.imes.module.system.enums.ErrorCodeConstants.REMAIN_PLATE_ST import static com.cf.imes.module.system.enums.ErrorCodeConstants.REMAIN_PLATE_USR_TYPE; /** - * 生产单余料板表 order_remain_plate_{N} Service 实现类 + * 订单余料板表 order_remain_plate_{N} Service 实现类 * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleService.java index 774e9d643..e63e4ccd2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleService.java @@ -8,14 +8,14 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.PageParam; /** - * 生产单模块 Service 接口 + * 订单模块 Service 接口 * * @author 晨丰科技 */ public interface ModuleService { /** - * 创建生产单模块 + * 创建订单模块 * * @param createReqVO 创建信息 * @return 编号 @@ -23,32 +23,32 @@ public interface ModuleService { Long createModule(@Valid ModuleSaveReqVO createReqVO); /** - * 更新生产单模块 + * 更新订单模块 * * @param updateReqVO 更新信息 */ void updateModule(@Valid ModuleSaveReqVO updateReqVO); /** - * 删除生产单模块 + * 删除订单模块 * * @param id 编号 */ void deleteModule(Long id); /** - * 获得生产单模块 + * 获得订单模块 * * @param id 编号 - * @return 生产单模块 + * @return 订单模块 */ ModuleDO getModule(Long id); /** - * 获得生产单模块分页 + * 获得订单模块分页 * * @param pageReqVO 分页查询 - * @return 生产单模块分页 + * @return 订单模块分页 */ PageResult getModulePage(ModulePageReqVO pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleServiceImpl.java index 8359fbeff..3ce3ee13a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/module/ModuleServiceImpl.java @@ -16,7 +16,7 @@ import com.cf.imes.module.executor.dal.mysql.module.ModuleMapper; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; /** - * 生产单模块 Service 实现类 + * 订单模块 Service 实现类 * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 46d6ae924..ff704f6b5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -164,7 +164,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { private static final String FIELD_PLAN_CONFIG_ID = "planConfigId"; private static final String FIELD_UPDATETIME = "updateTime"; - private static final String ES_ORDER_MODEL_DATA_ERROR = "生产单板材造型信息ES文档查询数据异常: "; + private static final String ES_ORDER_MODEL_DATA_ERROR = "订单板材造型信息ES文档查询数据异常: "; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -216,7 +216,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { PlanDO planDO = validatePlanExists(planId); - // 校验生产单信息和获取 orderId + // 校验订单信息和获取 orderId String orderNos = Optional.ofNullable(planDO.getOrderNos()).orElseThrow(() -> new ServiceException(ORDER_PLAN_ERROR)); List orderIds = new ArrayList<>(JSON.parseArray(orderNos).toJavaList(Long.class).stream().distinct().toList()); @@ -251,7 +251,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { Long goodsNum = updatePlanOptimizeData(remainBoardInfos, optimizeBoardModelDO, orderIds, goodsIds, goodsNo, cutedType); - // 根据开料状态修改排单和生产单的状态 + // 根据开料状态修改排单和订单的状态 OptimizePlanServiceImpl o = (OptimizePlanServiceImpl) AopContext.currentProxy(); o.updateOrderAndPlanByCutStatus(planDO,goodsNum,cutedType,orderIds,boardCount); @@ -312,15 +312,15 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { AssertUtils.notEmpty(orderModelDOS,ORDER_PLATE_MODEL_DATE_ERROR); - // 查询生产单对应的配件信息 + // 查询订单对应的配件信息 List printOrderPartsRespVOS = orderPartsMapper.selectPartList(Collections.singletonList(orderId), getUserOrganId()); - // 查询生产单对应的配件的ES信息 + // 查询订单对应的配件的ES信息 List orderPartsRemarks = esUtils.getEsDocument(FIELD_ORDER_ID, orderId, printOrderPartsRespVOS.size(), ORDER_PARTS_REMARK_MODEL.getIndex(), OrderPartsRemark.class); - // 查询生产单对应的包裹信息 + // 查询订单对应的包裹信息 List printOrderPackReqVOS = plateMapper.selectOrderPackList(orderId,getUserOrganId()); @@ -417,13 +417,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { } } - // 查询生产单对应的配件信息 + // 查询订单对应的配件信息 List printOrderPartsRespVOS = orderPartsMapper.selectPartList(orderIds, getUserOrganId()); - // 查询生产单对应的配件的ES信息 + // 查询订单对应的配件的ES信息 List orderPartsRemarks = esUtils.getEsDocument(FIELD_ORDER_ID, orderIds, printOrderPartsRespVOS.size(), ORDER_PARTS_REMARK_MODEL.getIndex(), OrderPartsRemark.class); - // 查询生产单对应的包裹信息 + // 查询订单对应的包裹信息 List printOrderPackReqVOS = plateMapper.selectPlanPackList(ids,getUserOrganId()); @@ -805,7 +805,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { } /** - * 分页获取生产单ids下的es.orderModels数据 + * 分页获取订单ids下的es.orderModels数据 * * @param orderIds * @return @@ -1292,7 +1292,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List plateNo = new ArrayList<>(); - // 创建一个列表存储 BlockPlaceInfo 对象,将优化的小板信息拿出，获取到小板编号，查询生产单，修改生产单的状态 + // 创建一个列表存储 BlockPlaceInfo 对象,将优化的小板信息拿出，获取到小板编号，查询订单，修改订单的状态 List outputList = new ArrayList<>(); @@ -1602,14 +1602,14 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List plateDOList = plateMapper.selectNoCutPlateByPlateId(orderIds, getUserOrganId()); - // 生产单的小板已全部开料 + // 订单的小板已全部开料 List orderIdList = plateDOList.stream().map(PlateDO::getOrderId).distinct().toList(); orderIds.removeAll(orderIdList); if(CollUtil.isNotEmpty(orderIds)){ - // 查询生产单的打包状态是否为已打包 + // 查询订单的打包状态是否为已打包 List orderDOS = orderMapper.selectOrderPackList(orderIds, getUserOrganId()); if (CollUtil.isNotEmpty(orderDOS)) { orderDOS.forEach(f -> { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java index 73b7c3c65..192a81a64 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java @@ -47,7 +47,7 @@ import static com.cf.imes.module.executor.enums.EsIndexEnum.*; /** * @author Beal - * 生产单入库处理器 + * 订单入库处理器 */ @Slf4j @Component @@ -97,7 +97,7 @@ public class OrderInputProcessor { /** - * 批量保存生产单小板五金数据 + * 批量保存订单小板五金数据 * * @param rawGoodsDOS * @param orderBodyDOS @@ -179,7 +179,7 @@ public class OrderInputProcessor { } /** - * 保存生产单造型数据 + * 保存订单造型数据 * * @param orderModelDOs */ @@ -203,7 +203,7 @@ public class OrderInputProcessor { /** - * 保存生产单配件备注数据 + * 保存订单配件备注数据 * * @param orderPartsRemarks */ @@ -223,7 +223,7 @@ public class OrderInputProcessor { } /** - * 生产单Id删除 + * 订单Id删除 */ public void deleteByOrderId(Long orderId, String index) { try { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index 2445f74fd..fc60d4e1e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -20,14 +20,14 @@ import java.util.Map; import java.util.Set; /** - * 生产单表 order_{N} Service 接口 + * 订单表 order_{N} Service 接口 * * @author 晨丰科技 */ public interface OrderService { /** - * 创建生产单表 order_{N} + * 创建订单表 order_{N} * * @param createReqVO 创建信息 * @return 编号 @@ -35,30 +35,30 @@ public interface OrderService { Long createOrder(@Valid OrderSaveReqVO createReqVO); /** - * 更新生产单表 order_{N} + * 更新订单表 order_{N} * * @param updateReqVO 更新信息 */ void updateOrder(@Valid OrderSaveReqVO updateReqVO); /** - * 获得生产单表 order_{N} + * 获得订单表 order_{N} * * @param id 编号 - * @return 生产单表 order_{N} + * @return 订单表 order_{N} */ OrderDO getOrder(Long id); /** - * 获得生产单表 order_{N}分页 + * 获得订单表 order_{N}分页 * * @param pageReqVO 分页查询 - * @return 生产单表 order_{N}分页 + * @return 订单表 order_{N}分页 */ PageResult getOrderPage(OrderPageReqVO pageReqVO); /** - * @param orderId: 生产单Id + * @param orderId: 订单Id * @return List */ List getOrderBody(Long orderId, Integer deleted); @@ -68,13 +68,13 @@ public interface OrderService { /** - * @param orderId: 生产单Id + * @param orderId: 订单Id * @return Map */ OrderModuleDetailRespVO getModule(Long orderId, Integer deleted); /** - * @param orderId: 生产单id + * @param orderId: 订单id * @param roomId: 房间id * @param bodyId: 柜体id * @return List @@ -83,7 +83,7 @@ public interface OrderService { PageResult getPlatesDetail(Long orderId, Set roomId, Set bodyId, Set groupId, String groupName, Integer pageNo, Integer pageSize, Integer deleted); /** - * @param orderId: 生产单id + * @param orderId: 订单id * @param roomId: 房间id * @param bodyId: 柜体id * @return List @@ -92,7 +92,7 @@ public interface OrderService { PageResult getPartsDetail(Long orderId, Set roomId, Set bodyId, Set groupId, String name, Integer pageNo, Integer pageSize, Integer deleted, Set types); /** - * @param orderId: 生产单id + * @param orderId: 订单id * @param roomId: 房间id * @param bodyId: 柜体id * @return List @@ -103,7 +103,7 @@ public interface OrderService { /** * 删除柜体/柜体还原 * - * @param orderId: 生产单id + * @param orderId: 订单id * @param roomId: 房间id * @param bodyId: 柜体id */ @@ -112,7 +112,7 @@ public interface OrderService { void updateRestoreBody(Long orderId, Set roomId, Long bodyId, Integer status); /** - * @param apiDataTypeVo：生产单号 + * @param apiDataTypeVo：订单号 * @return Boolean */ Long importApiData(ApiDataTypeVo apiDataTypeVo); @@ -152,18 +152,18 @@ public interface OrderService { /** - * 生产单超期告警分析统计 + * 订单超期告警分析统计 */ PageResult getOrderOverdue(PageParam pageParam); /** - * 生产单到期告警分析统计 + * 订单到期告警分析统计 */ PageResult getOrderNear(PageParam pageParam); /** - * 修改生产单是否删除 + * 修改订单是否删除 */ Integer updateOrderDel(Long orderId, Integer status); @@ -174,7 +174,7 @@ public interface OrderService { void realDeletedOrder(Long orderId); /** - * 生产单异步导入 + * 订单异步导入 * * @param importAsyncReqVO */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index a4e1ce651..a97b90d9b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -109,7 +109,7 @@ import static com.cf.imes.module.executor.enums.EsIndexEnum.*; import static com.cf.imes.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; /** - * 生产单表 order_{N} Service 实现类 + * 订单表 order_{N} Service 实现类 * * @author 晨丰科技 */ @@ -210,7 +210,7 @@ public class OrderServiceImpl implements OrderService { // 插入 OrderDO order = BeanUtils.toBean(createReqVO, OrderDO.class); order.setId((Long)identifierGenerator.nextId(null)); - // 默认api类型生产单 + // 默认api类型订单 if(ObjectUtil.isNull(order.getDataType())) { order.setDataType(DataTypeEnum.API_IMPORT.getStatus()); } @@ -221,13 +221,13 @@ public class OrderServiceImpl implements OrderService { @Override public void updateOrder(OrderSaveReqVO updateReqVO) { - // 校验存在, 生产单未删除 + // 校验存在, 订单未删除 validateOrderExists(updateReqVO.getId(), getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()); //校验手机号是否合法 validatePhoneNumber(updateReqVO.getPhoneNumber()); - //验证自定义单号是否存在, 生产单未删除 + //验证自定义单号是否存在, 订单未删除 validateCustomOrderNoExists(updateReqVO.getCustomOrderNo(), updateReqVO.getId()); // 发货日期校验 @@ -374,7 +374,7 @@ public class OrderServiceImpl implements OrderService { @Transactional(rollbackFor = Exception.class) public void updateDeleteBody(Long orderId, Set roomIds, Long bodyId, Integer status) { // 要删除传1,还原传0 - // 判断生产单的状态和生产单柜体对应的板材是否已经排单 + // 判断订单的状态和订单柜体对应的板材是否已经排单 validateOrderStatus(orderId, roomIds, bodyId, getUserOrganId()); List bodyIds = validateOrderBodyExists(orderId, bodyId, getUserOrganId(), roomIds, OrderDeletedEnum.NOT_DELETED.getStatus()); @@ -420,7 +420,7 @@ public class OrderServiceImpl implements OrderService { int bodyCount = orderBodyMapper.selectBodyCountByDeleted(orderId, getUserOrganId(), 0); - // 生产单柜体数量判断 + // 订单柜体数量判断 if ( bodyCount == 0 ) { orderMapper.updateOrderStatus(orderId, OrderStatusEnum.EMPTY.getStatus(), getUserOrganId()); } @@ -477,7 +477,7 @@ public class OrderServiceImpl implements OrderService { int bodyCount = orderBodyMapper.selectBodyCountByDeleted(orderId, getUserOrganId(), 0); - // 生产单柜体数量判断 + // 订单柜体数量判断 if ( bodyCount != 0 ) { orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), getUserOrganId()); } @@ -550,7 +550,7 @@ public class OrderServiceImpl implements OrderService { return order == null ? 0 : order.getId(); } - // 生产单插入 + // 订单插入 private void insertOrder(OrderDO orderDO, Integer index) { if (index == 0) { String nickName = Objects.requireNonNull(SecurityFrameworkUtils.getLoginUser()).getNickname(); @@ -654,7 +654,7 @@ public class OrderServiceImpl implements OrderService { @Override public Map getPrintDataMap(Long orderId, String type, HttpServletResponse response) { - // 查询生产单 + // 查询订单 OrderDO orderDO = orderMapper.selectOrderOne(orderId, OrganContextHolder.getOrganId()); if (orderDO == null) { throw new ServiceException(ORDER_NOT_EXISTS); @@ -738,7 +738,7 @@ public class OrderServiceImpl implements OrderService { public void realDeletedOrder(Long orderId) { validateOrderExists(orderId, getUserOrganId(), OrderDeletedEnum.DELETED.getStatus()); - // 作废 生产单表，body，group，goods，parts，plate，raw_goods， + // 作废 订单表，body，group，goods，parts，plate，raw_goods， rawGoodsMapper.deleteByOrderId(orderId, getUserOrganId()); goodsMapper.deleteByOrderId(orderId, getUserOrganId()); orderItemMapper.deleteByOrderId(orderId, getUserOrganId()); @@ -748,7 +748,7 @@ public class OrderServiceImpl implements OrderService { orderPartsMapper.deleteByOrderId(orderId, getUserOrganId()); plateMapper.deleteByOrderId(orderId, getUserOrganId()); - orderMapper.deleteOrder(orderId, getUserOrganId()); // 生产单删除 + orderMapper.deleteOrder(orderId, getUserOrganId()); // 订单删除 // 删除板材的造型数据 es orderInputProcessor.deleteByOrderId(orderId, ORDER_PLATE_MODEL.getIndex()); @@ -757,7 +757,7 @@ public class OrderServiceImpl implements OrderService { } - // 生产单是否存在判断 + // 订单是否存在判断 private void validateOrderExists(Long id, Long organId, Integer deleted) { OrderDO orderDO = orderMapper.selectOrderOne(id, organId, deleted); if (orderDO == null) { @@ -797,7 +797,7 @@ public class OrderServiceImpl implements OrderService { } } - // 验证自定义单号是否存在---不去除本单，一般用在新建生产单的时候用 + // 验证自定义单号是否存在---不去除本单，一般用在新建订单的时候用 private void validateCustomOrderNoExists(String customOrderNo) { if (customOrderNo != null) { if (!customOrderNo.isEmpty()) { @@ -1118,30 +1118,30 @@ public class OrderServiceImpl implements OrderService { switch (type) { case "配件明细1-模板.xlsx":// 配件明细 map.put("partsListDetail", orderPartsMapper.selectPartDetail(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
配件明细单
生产单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
房间名数据源柜体名表数据源
名称品牌厂家型号规格数量单位备注
数据源数据源数据源数据源数据源数据源数据源数据源
"); + map.put(tableKey, "SheetJS Table Export
配件明细单
订单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
房间名数据源柜体名表数据源
名称品牌厂家型号规格数量单位备注
数据源数据源数据源数据源数据源数据源数据源数据源
"); break; case "配件汇总1-模板.xlsx":// 配件汇总 map.put("partsSummary", orderPartsMapper.selectPartAll(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
配件汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
名称型号规格数量单位品牌备注
"); + map.put(tableKey, "SheetJS Table Export
配件汇总单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
名称型号规格数量单位品牌备注
"); break; case "板材明细-按房间-模板.xlsx": map.put("plateListDetail", plateMapper.selectPlateGoodsList(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名数据源柜体数据源列表条数表达式
板编号板名称材料颜色长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材明细单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名数据源柜体数据源列表条数表达式
板编号板名称材料颜色长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; case "板材明细-按板材-模板.xlsx": map.put("plateListDetail", plateMapper.selectPlateGoodsList(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板编号板名称长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材明细单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板编号板名称长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; case "板材汇总-按房间-模板.xlsx": map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名称数据源柜体数据源列表条数表达式
板名称材料颜色长宽厚度数量面积开门类型
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材汇总单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名称数据源柜体数据源列表条数表达式
板名称材料颜色长宽厚度数量面积开门类型
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; case "板材汇总-按板材-模板.xlsx": map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材汇总单
生产单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板名称长宽数量面积开门类型备注
数据源数据源数据源数据源数据源数据源数据源数据源数据源
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材汇总单
订单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板名称长宽数量面积开门类型备注
数据源数据源数据源数据源数据源数据源数据源数据源数据源
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; default: @@ -1160,30 +1160,30 @@ public class OrderServiceImpl implements OrderService { case "配件明细1-模板.xlsx":// 配件明细 // 以房间柜体为维度获取配件明细 map.put("partsListDetail", getOrderGoods(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
配件明细单
生产单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
房间名数据源柜体名表数据源
名称品牌厂家型号规格数量单位备注
数据源数据源数据源数据源数据源数据源数据源数据源
"); + map.put(tableKey, "SheetJS Table Export
配件明细单
订单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
房间名数据源柜体名表数据源
名称品牌厂家型号规格数量单位备注
数据源数据源数据源数据源数据源数据源数据源数据源
"); break; case "配件汇总1-模板.xlsx":// 配件汇总 map.put("partsSummary", orderPartsMapper.selectPartAll(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
配件汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
名称型号规格数量单位品牌备注
"); + map.put(tableKey, "SheetJS Table Export
配件汇总单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
名称型号规格数量单位品牌备注
"); break; case "板材明细-按房间-模板.xlsx": map.put("plateListDetail", getOrderBody(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名数据源柜体数据源列表条数表达式
板编号板名称材料颜色长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材明细单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名数据源柜体数据源列表条数表达式
板编号板名称材料颜色长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); // map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; case "板材明细-按板材-模板.xlsx": map.put("plateListDetail", getOrderPlate(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板编号板名称长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材明细单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板编号板名称长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); // map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; case "板材汇总-按房间-模板.xlsx": map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名称数据源柜体数据源列表条数表达式
板名称材料颜色长宽厚度数量面积开门类型
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材汇总单
订单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名称数据源柜体数据源列表条数表达式
板名称材料颜色长宽厚度数量面积开门类型
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; case "板材汇总-按板材-模板.xlsx": map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); - map.put(tableKey, "SheetJS Table Export
板材汇总单
生产单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板名称长宽数量面积开门类型备注
数据源数据源数据源数据源数据源数据源数据源数据源数据源
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); + map.put(tableKey, "SheetJS Table Export
板材汇总单
订单号:数据源自定义单号:数据源经销商:数据源订单日期:数据源
客户:数据源收货电话:数据源收货地址:数据源收货日期:数据源
备注:数据源
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板名称长宽数量面积开门类型备注
数据源数据源数据源数据源数据源数据源数据源数据源数据源
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); map.put(plateCountKey, plateMapper.countPlateByOrderId(orderDO.getId(), OrganContextHolder.getOrganId(), deleted)); break; default: @@ -1270,7 +1270,7 @@ public class OrderServiceImpl implements OrderService { return true; } - // 判断生产单状态是否符合(如果已开料，不允许删除) + // 判断订单状态是否符合(如果已开料，不允许删除) private void validateOrderStatus(Long orderId,Set roomIds, Long bodyId, Long organId) { // 校验存在 OrderDO orderDO = orderMapper.selectOrderOne(orderId, organId); @@ -1475,7 +1475,7 @@ public class OrderServiceImpl implements OrderService { public void orderImportAsync(OrderImportAsyncReqVO importAsyncReqVO, MultipartFile file) { // 根据导入类型和工厂（预留）获取处理类 OrderImportHandler orderImportHandler = orderImportHandlerFactory.getOrderImportHandler(importAsyncReqVO.getType(), null); - // 如果是补板校验生产单存在 + // 如果是补板校验订单存在 Long orderId = importAsyncReqVO.getOrderId(); if (ObjectUtil.isNotNull(orderId)) { Optional.ofNullable(getOrder(orderId)).orElseThrow(() -> new ServiceException(ORDER_IMPORT_ORDER_NOT_EXISTS, orderId)); @@ -1545,7 +1545,7 @@ public class OrderServiceImpl implements OrderService { AssertUtils.notEmpty(orderIds, ORDER_PLAN_DATA_ERROR); - // 生产单信息 + // 订单信息 List labelOrderData = orderMapper.selectLabelOrderData(orderIds, organId); List packIds = labelOrderPlateData.stream().map(LabelOrderPlateData::getPackageNo).distinct().toList(); @@ -1599,7 +1599,7 @@ public class OrderServiceImpl implements OrderService { // 补充小板缺少的信息 labelOrderPlateData.forEach(f->{ - // 补充缺少的生产单信息 + // 补充缺少的订单信息 f.setOrderDate(labelOrderData.stream().filter(o->o.getOrderNo().equals(f.getOrderId())).findFirst().orElse(new LabelOrderData()).getOrderDate()); f.setDeliveryDate(labelOrderData.stream().filter(o->o.getOrderNo().equals(f.getOrderId())).findFirst().orElse(new LabelOrderData()).getDeliveryDate()); f.setCustomOrderNo(labelOrderData.stream().filter(o->o.getOrderNo().equals(f.getOrderId())).findFirst().orElse(new LabelOrderData()).getCustomOrderNo()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsService.java index 7a7fb3341..61220f5e4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsService.java @@ -5,44 +5,44 @@ import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderStatisti import java.util.Map; /** - * 生产单统计 order_{N} Service 接口 + * 订单统计 order_{N} Service 接口 * * @author Gqr * @since 2024/8/5 16:57 */ public interface OrderStatisticsService { /** - * 生产单总数统计 + * 订单总数统计 */ Integer orderCount(); /** - * 今日新增生产单总数统计 + * 今日新增订单总数统计 */ Integer orderCountToday(); /** - * 今日生产单完成总数 + * 今日订单完成总数 */ Integer orderCountTodayFinish(); /** - * 今日生产单完成总数 + * 今日订单完成总数 */ Integer orderCountProduce(); /** - * 今日生产单完成总数 + * 今日订单完成总数 */ Double orderSquareProduce(); /** - * 生产单状态分组统计 + * 订单状态分组统计 */ Map getOrderStatusCount(OrderStatisticsReqVO reqVO); /** - * 生产单、排单单量分组统计 + * 订单、排单单量分组统计 * * @param reqVO * @return @@ -50,7 +50,7 @@ public interface OrderStatisticsService { Map getOrderAndPlanCountGroup(OrderStatisticsReqVO reqVO); /** - * 生产单、排单平方数分组统计 + * 订单、排单平方数分组统计 * * @param reqVO * @return diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java index 91d778bbd..8763f4d65 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java @@ -183,7 +183,7 @@ public class OrderStatisticsServiceImpl implements OrderStatisticsService { // 遍历时间跨度列表，匹配数量存入数组，没有补0存入数组 for (int i = 0; i < dateList.size(); i++) { String dateStr = dateList.get(i); - // 存入生产单数量 + // 存入订单数量 Integer orderCount = Optional.ofNullable(orderRespMap.get(dateStr)) .map(list -> list.stream().findFirst().orElse(new OrderStatisticsStatusRespVO())) .map(OrderStatisticsStatusRespVO::getOrderCount) @@ -199,7 +199,7 @@ public class OrderStatisticsServiceImpl implements OrderStatisticsService { } orderSeriesItem.put("data", orderCountArr); - orderSeriesItem.put("name", "生产单单量"); + orderSeriesItem.put("name", "订单单量"); planSeriesItem.put("data", planCountArr); planSeriesItem.put("name", "排单单量"); series.add(orderSeriesItem); @@ -237,7 +237,7 @@ public class OrderStatisticsServiceImpl implements OrderStatisticsService { for (int i = 0; i < dateList.size(); i++) { String dateStr = dateList.get(i); - // 存生产单面积 + // 存订单面积 List orderCountRespVOS = orderRespMap.get(dateStr); orderAreaArr[i] = orderCountRespVOS != null && !orderCountRespVOS.isEmpty() ? orderCountRespVOS.get(0).getAreaSum() : BigDecimal.ZERO; @@ -247,7 +247,7 @@ public class OrderStatisticsServiceImpl implements OrderStatisticsService { } orderSeriesItem.put("data", orderAreaArr); - orderSeriesItem.put("name", "生产单平方数"); + orderSeriesItem.put("name", "订单平方数"); planSeriesItem.put("data", planAreaArr); planSeriesItem.put("name", "排单平方数"); series.add(orderSeriesItem); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/intervalometer/OrderScheduledImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/intervalometer/OrderScheduledImpl.java index 9b553f198..8b6fb77a8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/intervalometer/OrderScheduledImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/intervalometer/OrderScheduledImpl.java @@ -23,7 +23,7 @@ import static com.cf.imes.module.executor.enums.EsIndexEnum.ORDER_PLATE_MODEL; /** - * 生产单定时处理器 + * 订单定时处理器 */ @Slf4j @Component @@ -65,7 +65,7 @@ public class OrderScheduledImpl { List orderDOList = orderMapper.selectOrderListByUpdateTime(); - // 作废 生产单表，body，group，goods，parts，plate，raw_goods，item + // 作废 订单表，body，group，goods，parts，plate，raw_goods，item rawGoodsMapper.deleteBatch(orderDOList); goodsMapper.deleteBatch(orderDOList); orderItemMapper.deleteBatch(orderDOList); @@ -75,7 +75,7 @@ public class OrderScheduledImpl { orderPartsMapper.deleteBatch(orderDOList); plateMapper.deleteBatch(orderDOList); - orderMapper.deleteBatchIds(orderDOList); // 生产单删除 + orderMapper.deleteBatchIds(orderDOList); // 订单删除 // 删除板材的造型数据 es orderInputProcessor.deleteByOrderId(orderDOList, ORDER_PLATE_MODEL.getIndex()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/OrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/OrderImportHandler.java index 021020ae0..8aff514c3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/OrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/OrderImportHandler.java @@ -4,7 +4,7 @@ import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderImportAs import org.springframework.web.multipart.MultipartFile; /** - * 生产单导入处理器抽象类 + * 订单导入处理器抽象类 * * @author Gqr * @since 2024/11/8 16:45 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/factory/OrderImportHandlerFactory.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/factory/OrderImportHandlerFactory.java index 54362f025..3f7fa23c6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/factory/OrderImportHandlerFactory.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/factory/OrderImportHandlerFactory.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Optional; /** - * 生产单导入处理器工厂类 + * 订单导入处理器工厂类 * * @author Gqr * @since 2024/11/28 16:21 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/AbstractApiOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/AbstractApiOrderImportHandler.java index 4905b32cf..6e92468f3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/AbstractApiOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/AbstractApiOrderImportHandler.java @@ -3,7 +3,7 @@ package com.cf.imes.module.executor.service.orderImport.handler.api; import com.cf.imes.module.executor.service.orderImport.OrderImportHandler; /** - * 生产单api导入处理器抽象类 + * 订单api导入处理器抽象类 * * @author Gqr * @since 2025/1/8 16:35 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/DefaultApiOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/DefaultApiOrderImportHandler.java index 260db3543..34cc175e1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/DefaultApiOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/api/DefaultApiOrderImportHandler.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; /** - * 默认api生产单导入处理器 + * 默认api订单导入处理器 * * @author Gqr * @since 2025/1/9 9:21 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/AbstractExcelOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/AbstractExcelOrderImportHandler.java index f57a0e3d9..190f929db 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/AbstractExcelOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/AbstractExcelOrderImportHandler.java @@ -3,7 +3,7 @@ package com.cf.imes.module.executor.service.orderImport.handler.excel; import com.cf.imes.module.executor.service.orderImport.OrderImportHandler; /** - * 生产单excel导入处理器抽象类 + * 订单excel导入处理器抽象类 * * @author Gqr * @since 2025/1/8 16:35 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/DefaultExcelOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/DefaultExcelOrderImportHandler.java index eb5a7e5bc..deaa4366a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/DefaultExcelOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/DefaultExcelOrderImportHandler.java @@ -31,7 +31,7 @@ import java.io.InputStream; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.ORDER_IMPORT_FILE_ANALYZE_ERROR; /** - * 默认excel生产单导入处理器 + * 默认excel订单导入处理器 * @author Gqr * @since 2025/1/9 9:21 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/AbstractJsonOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/AbstractJsonOrderImportHandler.java index 306956193..4213b2646 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/AbstractJsonOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/AbstractJsonOrderImportHandler.java @@ -4,7 +4,7 @@ package com.cf.imes.module.executor.service.orderImport.handler.json; import com.cf.imes.module.executor.service.orderImport.OrderImportHandler; /** - * 生产单json导入处理器抽象类 + * 订单json导入处理器抽象类 * * @author Gqr * @since 2025/1/8 16:35 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/DefaultJsonOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/DefaultJsonOrderImportHandler.java index 427393d58..3be7e7bd6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/DefaultJsonOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/json/DefaultJsonOrderImportHandler.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; /** - * 默认json生产单导入处理器 + * 默认json订单导入处理器 * * @author Gqr * @since 2025/1/9 9:21 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/xml/AbstractXmlOrderImportHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/xml/AbstractXmlOrderImportHandler.java index 12b758968..83e0c4315 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/xml/AbstractXmlOrderImportHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/xml/AbstractXmlOrderImportHandler.java @@ -3,7 +3,7 @@ package com.cf.imes.module.executor.service.orderImport.handler.xml; import com.cf.imes.module.executor.service.orderImport.OrderImportHandler; /** - * 生产单xml导入处理器抽象类 + * 订单xml导入处理器抽象类 * * @author Gqr * @since 2025/1/8 16:35 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsService.java index 2ba67de8d..5e646f76d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsService.java @@ -10,14 +10,14 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.PageParam; /** - * 生产单配件表 order_parts_{N} Service 接口 + * 订单配件表 order_parts_{N} Service 接口 * * @author 晨丰科技 */ public interface OrderPartsService { /** - * 创建生产单配件表 order_parts_{N} + * 创建订单配件表 order_parts_{N} * * @param createReqVO 创建信息 * @return 编号 @@ -25,40 +25,40 @@ public interface OrderPartsService { Long createOrderParts(@Valid OrderPartsSaveReqVO createReqVO); /** - * 更新生产单配件表 order_parts_{N} + * 更新订单配件表 order_parts_{N} * * @param updateReqVO 更新信息 */ void updateOrderParts(@Valid OrderPartsSaveReqVO updateReqVO); /** - * 删除生产单配件表 order_parts_{N} + * 删除订单配件表 order_parts_{N} * * @param id 编号 */ void deleteOrderParts(Long id); /** - * 获得生产单配件表 order_parts_{N} + * 获得订单配件表 order_parts_{N} * * @param id 编号 - * @return 生产单配件表 order_parts_{N} + * @return 订单配件表 order_parts_{N} */ OrderPartsDO getOrderParts(Long id); /** - * 获得生产单配件表 order_parts_{N}分页 + * 获得订单配件表 order_parts_{N}分页 * * @param pageReqVO 分页查询 - * @return 生产单配件表 order_parts_{N}分页 + * @return 订单配件表 order_parts_{N}分页 */ PageResult getOrderPartsPage(OrderPartsPageReqVO pageReqVO); /** * 批量导入配件 * - * @param importOrderParts 导入生产单配件列表 - * @param orderId 生产单号 + * @param importOrderParts 导入订单配件列表 + * @param orderId 订单号 * @return 导入结果 */ OrderPartsImportRespVO importOrderPartsList(List importOrderParts, Long orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsServiceImpl.java index 4bc88fa12..572eac448 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsServiceImpl.java @@ -28,7 +28,7 @@ import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.ge import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; /** - * 生产单配件表 order_parts_{N} Service 实现类 + * 订单配件表 order_parts_{N} Service 实现类 * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index a01a1058d..4065b7fbd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -519,7 +519,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { // 统计每个orders下的未排单面积，更新到orders中 OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId); - // 当前生产单下排单的板件数量 + // 当前订单下排单的板件数量 Integer num = orderPlateNumAndAreaDO.getNum(); int version = orderDO.getVersion(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java index 2fdcfcc8b..173be594e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java @@ -9,14 +9,14 @@ import jakarta.validation.Valid; import java.util.List; /** - * 生产单开料排单 Service 接口 + * 订单开料排单 Service 接口 * * @author 晨丰科技 */ public interface PlanService { /** - * 创建生产单开料排单 + * 创建订单开料排单 * * @param createReqVO 创建信息 * @return 编号 @@ -24,32 +24,32 @@ public interface PlanService { void createPlan(@Valid PlanSaveReqVO createReqVO); /** - * 更新生产单开料排单 + * 更新订单开料排单 * * @param updateReqVO 更新信息 */ void updatePlan(@Valid PlanSaveReqVO updateReqVO); /** - * 删除生产单开料排单 + * 删除订单开料排单 * * @param planIds 编号 */ void deletePlan(List planIds); /** - * 获得生产单开料排单 + * 获得订单开料排单 * * @param id 编号 - * @return 生产单开料排单 + * @return 订单开料排单 */ PlanRespVO getPlan(Long id); /** - * 获得生产单开料排单分页 + * 获得订单开料排单分页 * * @param pageReqVO 分页查询 - * @return 生产单开料排单分页 + * @return 订单开料排单分页 */ PageResult getPlanPage(PlanPageReqVO pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 851847d06..245e8fb48 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -79,7 +79,7 @@ import static com.cf.imes.module.executor.enums.EsIndexEnum.*; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** - * 生产单开料排单 Service 实现类 + * 订单开料排单 Service 实现类 * * @author 晨丰科技 */ @@ -317,7 +317,7 @@ public class PlanServiceImpl implements PlanService { // 删除排单对应的加工方案组的配置信息 esUtils.deleteEsDocument(FIELD_PLANID, planIds, PLAN_PROCESS_SCHEME_CONFIG.getIndex()); - // 去除生产单板材造型对应的排单ID + // 去除订单板材造型对应的排单ID // removePlateModelPlanId(orderIds,planIds,new ArrayList<>()); } @@ -444,7 +444,7 @@ public class PlanServiceImpl implements PlanService { List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLANID, planIds, 500, ORDER_OPTIMIZE_PLATE_MODEL.getIndex(), OptimizeBoardModelDO.class); - // 获取排单对应的生产单的信息 + // 获取排单对应的订单的信息 List planOrderRespVOS = orderMapper.selectPlanOrderList(planIds, getUserOrganId()); @@ -466,7 +466,7 @@ public class PlanServiceImpl implements PlanService { e.setOptimizePlateCount(getOptimizePlateCount(e.getId(), optimizeBoardModelDOS)); // 未优化小板数量 e.setUnOptimizePlateCount(e.getPlateNum() - e.getOptimizePlateCount()); - // 生产单信息 + // 订单信息 e.setOrderList(getOrderList(e.getId(), planOrderRespVOS)); }); @@ -515,7 +515,7 @@ public class PlanServiceImpl implements PlanService { List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLANID, planIds, planIds.size(), ORDER_OPTIMIZE_PLATE_MODEL.getIndex(), OptimizeBoardModelDO.class); - // 获取排单对应的生产单的信息 + // 获取排单对应的订单的信息 List planOrderRespVOS = orderMapper.selectPlanOrderList(planIds, getUserOrganId()); @@ -537,7 +537,7 @@ public class PlanServiceImpl implements PlanService { e.setOptimizePlateCount(getOptimizePlateCount(e.getId(), optimizeBoardModelDOS)); // 未优化小板数量 e.setUnOptimizePlateCount(e.getPlateNum() - e.getOptimizePlateCount()); - // 生产单信息 + // 订单信息 e.setOrderList(getOrderList(e.getId(), planOrderRespVOS)); }); @@ -1073,7 +1073,7 @@ public class PlanServiceImpl implements PlanService { .sum(); } - // 生产单信息 + // 订单信息 private List getOrderList(Long planId, List planOrderRespVos) { return planOrderRespVos.stream() .filter(f -> Objects.equals(f.getPlanId(), planId)) @@ -1349,7 +1349,7 @@ public class PlanServiceImpl implements PlanService { // 修改排单加工方案的优化状态 updateProcessSchemeStatus(insertPlanIds); - // 生产单板材造型信息增加排单ID + // 订单板材造型信息增加排单ID // insertPlateModelPlanId(orderIds,insertPlateIds,insertPlanIds.get(0)); } @@ -1988,7 +1988,7 @@ public class PlanServiceImpl implements PlanService { OrderDO orderDO = orderMapper.selectById(orderId); OrderPlanPlateNumAndAreaRespVO orderPlateNumAndAreaPlanInfo = orderMapper.selectPlannedPlateNumAndArea(orderId); - // 当前生产单下排单的板件数量 + // 当前订单下排单的板件数量 Integer num = orderPlateNumAndAreaPlanInfo.getNum(); int version = orderDO.getVersion(); @@ -1999,9 +1999,9 @@ public class PlanServiceImpl implements PlanService { .set(OrderDO::getPlannedPlateNum, num) .set(OrderDO::getVersion, version + 1); Integer orderDOStatus = orderDO.getStatus(); - // 更新生产单排单状态 + // 更新订单排单状态 if (ObjectUtil.notEqual(orderDOStatus, OrderStatusEnum.IN_PRODUCTION.getStatus()) && ObjectUtil.notEqual(orderDOStatus, OrderStatusEnum.SORTED.getStatus())) { - // 如果生产单下已经没有排单板件，更新生产单为新单 + // 如果订单下已经没有排单板件，更新订单为新单 if (num == 0) { updateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); } else { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java index 60ebeb8a2..650502ddc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java @@ -13,14 +13,14 @@ import java.util.List; import java.util.Set; /** - * 生产单板件 Service 接口 + * 订单板件 Service 接口 * * @author 晨丰科技 */ public interface PlateService { /** - * 创建生产单板件 + * 创建订单板件 * * @param createReqVO 创建信息 * @return 编号 @@ -28,14 +28,14 @@ public interface PlateService { Long createPlate(@Valid PlateSaveReqVO createReqVO); /** - * 更新生产单板件 + * 更新订单板件 * * @param updateReqVO 更新信息 */ void updatePlate(@Valid PlateSaveReqVO updateReqVO); /** - * 删除生产单板件 + * 删除订单板件 * * @param plateIds 编号 */ @@ -43,10 +43,10 @@ public interface PlateService { /** - * 获得生产单板件分页 + * 获得订单板件分页 * * @param pageReqVO 分页查询 - * @return 生产单板件分页 + * @return 订单板件分页 */ PageResult getPlatePage(PlatePageReqVO pageReqVO); @@ -58,8 +58,8 @@ public interface PlateService { /** * 批量导入小板 * - * @param importPlates 导入生产单板材列表 - * @param orderId 生产单Id + * @param importPlates 导入订单板材列表 + * @param orderId 订单Id * @return 导入结果 */ PlateImportRespVO importPlatesList(List importPlates, Long orderId); @@ -71,9 +71,9 @@ public interface PlateService { void deletePlates(Set ids); /** - * 获得生产单所有板材 + * 获得订单所有板材 * - * @param orderId 生产单id + * @param orderId 订单id * @return List */ List getPlatesByOrderId(Long orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 441dc25b7..be8080c4d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -67,7 +67,7 @@ import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import static com.cf.imes.module.executor.enums.EsIndexEnum.ORDER_PLATE_MODEL; /** - * 生产单板件 Service 实现类 + * 订单板件 Service 实现类 * * @author 晨丰科技 */ @@ -247,7 +247,7 @@ public class PlateServiceImpl implements PlateService { OrderDO orderDO = orderMapper.selectById(orderId); OrderPlanPlateNumAndAreaRespVO orderPlateNumAndAreaPlanInfo = orderMapper.selectPlannedPlateNumAndArea(orderId); - // 当前生产单下排单的板件数量 + // 当前订单下排单的板件数量 Integer num = orderPlateNumAndAreaPlanInfo.getNum(); int version = orderDO.getVersion(); @@ -258,9 +258,9 @@ public class PlateServiceImpl implements PlateService { .set(OrderDO::getPlannedPlateNum, num) .set(OrderDO::getVersion, version + 1); Integer orderDOStatus = orderDO.getStatus(); - // 更新生产单排单状态 + // 更新订单排单状态 if (ObjectUtil.notEqual(orderDOStatus, OrderStatusEnum.IN_PRODUCTION.getStatus()) && ObjectUtil.notEqual(orderDOStatus, OrderStatusEnum.SORTED.getStatus())) { - // 如果生产单下已经没有排单板件，更新生产单为新单 + // 如果订单下已经没有排单板件，更新订单为新单 if (num == 0) { updateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); } else { @@ -446,7 +446,7 @@ public class PlateServiceImpl implements PlateService { @Override public void updatePlateByRawGoodsId(List createReqVOS) { - // 根据生产单id和goods_id查到数据，再更新goods_id + // 根据订单id和goods_id查到数据，再更新goods_id createReqVOS.forEach(createReqVO -> { }); @@ -562,7 +562,7 @@ public class PlateServiceImpl implements PlateService { .build()); - // 生产单造型数据 + // 订单造型数据 orderPlateModelDOS.add(OrderModelDO.builder() .plateId(plateId) .orderId(orderId) @@ -573,7 +573,7 @@ public class PlateServiceImpl implements PlateService { .build()); - // 生产单明细表新增数据 + // 订单明细表新增数据 orderItemDOS.add(OrderItemDO.builder() .orderId(f.getOrderId()) .type(OrderItemType.BOARD.getCode()) @@ -587,7 +587,7 @@ public class PlateServiceImpl implements PlateService { .plateNo(plateIdAndNo) .build()); - // 累加生产单板数和面积 + // 累加订单板数和面积 orderPlanPlateNumAndAreaRespVOMap.putIfAbsent(orderId, new OrderPlanPlateNumAndAreaRespVO(0, BigDecimal.ZERO)); OrderPlanPlateNumAndAreaRespVO orderPlanPlateNumAndAreaRespVO = orderPlanPlateNumAndAreaRespVOMap.get(orderId); orderPlanPlateNumAndAreaRespVO.setArea(orderPlanPlateNumAndAreaRespVO.getArea().add(area)).setNum(orderPlanPlateNumAndAreaRespVO.getNum() + 1); @@ -622,7 +622,7 @@ public class PlateServiceImpl implements PlateService { orderItemMapper.insertBatch(orderItemDOS); - // 更新生产单和材质板数量和面积 + // 更新订单和材质板数量和面积 updateOrdersPlanPlateNumAndArea(orderPlanPlateNumAndAreaRespVOMap); updateOrderGoodsPlanPlateNumAndArea(orderGoodsPlanPlateNumAndAreaRespVOMap); @@ -632,7 +632,7 @@ public class PlateServiceImpl implements PlateService { } /** - * 更新生产单板件数量和面积 + * 更新订单板件数量和面积 * * @param orderPlanPlateNumAndAreaRespVOS */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessService.java index 0e200a4a1..e2b8e59e8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessService.java @@ -7,14 +7,14 @@ import com.cf.imes.module.executor.dal.dataobject.process.OrderProcessDO; import java.util.List; /** - * 生产单工序 Service 接口 + * 订单工序 Service 接口 * * @author 晨丰科技 */ public interface OrderProcessService { /** - * 创建生产单工序 + * 创建订单工序 * * @param createReqVO 创建信息 * @return 编号 @@ -22,32 +22,32 @@ public interface OrderProcessService { Long createOrderProcess(@Valid OrderProcessSaveReqVO createReqVO); /** - * 更新生产单工序 + * 更新订单工序 * * @param updateReqVO 更新信息 */ void updateOrderProcess(@Valid OrderProcessSaveReqVO updateReqVO); /** - * 删除生产单工序 + * 删除订单工序 * * @param id 编号 */ void deleteOrderProcess(Long id); /** - * 获得生产单工序 + * 获得订单工序 * - * @param orderId 生产单编号 - * @return 生产单工序 + * @param orderId 订单编号 + * @return 订单工序 */ OrderProcessDO getOrderProcess(Long orderId); /** - * 获得生产单中工序 + * 获得订单中工序 * * @param processGroupId 工序组Id - * @return 生产单工序 + * @return 订单工序 */ List getOrderProcessByProcessGroupId(Long processGroupId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java index 008eb2e82..29a5e5189 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java @@ -47,7 +47,7 @@ import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import static com.cf.imes.module.executor.enums.ProcessTypeEnum.TYPE_SEVEN; /** - * 生产单工序 Service 实现类 + * 订单工序 Service 实现类 * * @author 晨丰科技 */ @@ -86,14 +86,14 @@ public class OrderProcessServiceImpl implements OrderProcessService { private GoodsMapper goodsMapper; - // 生产单状态检测 + // 订单状态检测 private void checkOrderStatus(Long orderId, Long organId, Integer status) { OrderDO order = orderMapper.selectOrderOne(orderId, organId, status); -// 当生产不为删除时，校验生产单存在 +// 当生产不为删除时，校验订单存在 if (order == null) { throw new ServiceException(ORDER_NOT_EXISTS); }else { -// 校验生产单状态 +// 校验订单状态 if (order.getStatus() != OrderStatusEnum.NEW_ORDER.getStatus()) { throw new ServiceException(ORDER_STATUS_CONFLICT); } @@ -107,7 +107,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { } } - // 校验是否已经存在该生产单对应的工序组 + // 校验是否已经存在该订单对应的工序组 private void checkOrderProcessExists(Long orderId, Long organId) { if (orderProcessMapper.getOrderProcess(orderId, organId)) { throw new ServiceException(ORDER_PROCESS_EXISTS); @@ -122,7 +122,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { // 校验工序组存在 checkProcessGroup(createReqVO.getGroupId()); -// 校验是否已经存在该生产单对应的工序组 +// 校验是否已经存在该订单对应的工序组 checkOrderProcessExists(createReqVO.getOrderId(), OrganContextHolder.getOrganId()); // 插入 @@ -136,7 +136,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { List processStepDOS = new ArrayList<>(); List orderProcessStepItemDOS = new ArrayList<>(); - // 需要获取工序组的具体信息，以及工序组中工序的信息，然后将工序组中工序的信息插入到生产单工序步骤表中 + // 需要获取工序组的具体信息，以及工序组中工序的信息，然后将工序组中工序的信息插入到订单工序步骤表中 ProcessListReqDTO processListReqDTO = processGroupApi.getProcessGroupDetail(createReqVO.getGroupId()); AtomicInteger INDEX = new AtomicInteger(0); @@ -146,7 +146,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { .setStatus(false).setProcessinfoId(processRespDTO.getId()).setOrderProcessId(orderProcess.getId()).setFinishTime(null).setSort(INDEX.getAndIncrement());// 计划日期没有填写 processStepDOS.add(processStepDO); - // 生产单中是否存在加工组，若存在加工组，需要逐条加工组信息写入到生产单工序步骤表 + // 订单中是否存在加工组，若存在加工组，需要逐条加工组信息写入到订单工序步骤表 // if (processRespDTO.getType() == ProcessTypeEnum.TYPE_SEVEN.getStatus()) { // List orderGroupDOS = orderGroupMapper.getOrderGroupByOrderId(createReqVO.getOrderId(), OrganContextHolder.getOrganId()); // if (orderGroupDOS.size() != 0) { // 有加工组 @@ -197,7 +197,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { handleProcessType(processRespDTO, createReqVO, processStepDOId, orderProcessId, processListReqDTO, orderProcessStepItemDOS); }); INDEX.set(0); - // 修改生产单的状态 + // 修改订单的状态 orderMapper.updateOrderStatus(createReqVO.getOrderId(), OrderStatusEnum.SORTED.getStatus(), OrganContextHolder.getOrganId()); // 批量插入 orderProcessMapper.insert(orderProcess.setNextStepId(processListReqDTO.getLists().get(0).getId()).setStatus(false)); @@ -294,7 +294,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { } } - // 通过生产单Id和工序id查询是否存在 + // 通过订单Id和工序id查询是否存在 private OrderProcessDO validateOrderProcessExists(Long orderId, Long groupId) { return orderProcessMapper.selectOne("order_id", orderId, "group_id", groupId); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepService.java index 1c0afec72..941f9a42b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepService.java @@ -8,14 +8,14 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.PageParam; /** - * 生产单工序步骤 Service 接口 + * 订单工序步骤 Service 接口 * * @author 晨丰科技 */ public interface ProcessStepService { /** - * 创建生产单工序步骤 + * 创建订单工序步骤 * * @param createReqVO 创建信息 * @return 编号 @@ -23,32 +23,32 @@ public interface ProcessStepService { Long createProcessStep(@Valid ProcessStepSaveReqVO createReqVO); /** - * 更新生产单工序步骤 + * 更新订单工序步骤 * * @param updateReqVO 更新信息 */ void updateProcessStep(@Valid ProcessStepSaveReqVO updateReqVO); /** - * 删除生产单工序步骤 + * 删除订单工序步骤 * * @param id 编号 */ void deleteProcessStep(Long id); /** - * 获得生产单工序步骤 + * 获得订单工序步骤 * * @param id 编号 - * @return 生产单工序步骤 + * @return 订单工序步骤 */ ProcessStepDO getProcessStep(Long id); /** - * 获得生产单工序步骤分页 + * 获得订单工序步骤分页 * * @param pageReqVO 分页查询 - * @return 生产单工序步骤分页 + * @return 订单工序步骤分页 */ PageResult getProcessStepPage(ProcessStepPageReqVO pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepServiceImpl.java index 072b1498f..643a5ad92 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/processStep/ProcessStepServiceImpl.java @@ -13,7 +13,7 @@ import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.executor.dal.mysql.processStep.ProcessStepMapper; /** - * 生产单工序步骤 Service 实现类 + * 订单工序步骤 Service 实现类 * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsService.java index 056e87617..417afbf47 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsService.java @@ -10,14 +10,14 @@ import com.cf.imes.module.executor.dal.dataobject.rawgoods.RawGoodsDO; import com.cf.imes.framework.common.pojo.PageResult; /** - * 生产单设计商品表 order_raw_goods_{N} Service 接口 + * 订单设计商品表 order_raw_goods_{N} Service 接口 * * @author 晨丰科技 */ public interface RawGoodsService { /** - * 创建生产单设计商品表 order_raw_goods_{N} + * 创建订单设计商品表 order_raw_goods_{N} * * @param createReqVO 创建信息 * @return 编号 @@ -25,49 +25,49 @@ public interface RawGoodsService { Long createRawGoods(@Valid RawGoodsSaveReqVO createReqVO); /** - * 更新生产单设计商品表 order_raw_goods_{N} + * 更新订单设计商品表 order_raw_goods_{N} * * @param updateReqVO 更新信息 */ void updateRawGoods(@Valid RawGoodsSaveReqVO updateReqVO); /** - * 删除生产单设计商品表 order_raw_goods_{N} + * 删除订单设计商品表 order_raw_goods_{N} * * @param id 编号 */ void deleteRawGoods(Long id); /** - * 获得生产单设计商品表 order_raw_goods_{N} + * 获得订单设计商品表 order_raw_goods_{N} * * @param id 编号 - * @return 生产单设计商品表 order_raw_goods_{N} + * @return 订单设计商品表 order_raw_goods_{N} */ RawGoodsDO getRawGoods(Long id); /** - * 获得生产单设计商品表 order_raw_goods_{N}分页 + * 获得订单设计商品表 order_raw_goods_{N}分页 * * @param pageReqVO 分页查询 - * @return 生产单设计商品表 order_raw_goods_{N}分页 + * @return 订单设计商品表 order_raw_goods_{N}分页 */ PageResult getRawGoodsPage(RawGoodsPageReqVO pageReqVO); /** * 批量导入板材 * - * @param importRawGoods 导入生产单板材列表 - * @param orderId 生产单Id + * @param importRawGoods 导入订单板材列表 + * @param orderId 订单Id * @return 导入结果 */ RawGoodsImportRespVO importRawGoodsList(List importRawGoods, Long orderId); /** - * 获得生产单设计商品表 order_raw_goods_{N} + * 获得订单设计商品表 order_raw_goods_{N} * * @param orderId 编号 - * @return 生产单设计商品表 order_raw_goods_{N} + * @return 订单设计商品表 order_raw_goods_{N} */ List getRawGoodsByOrder(Long orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsServiceImpl.java index 4bd8001ff..5b5c89014 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/rawgoods/RawGoodsServiceImpl.java @@ -23,7 +23,7 @@ import static com.cf.imes.module.executor.enums.ErrorCodeConstants.RAW_GOODS_IMP import static com.cf.imes.module.executor.enums.ErrorCodeConstants.RAW_GOODS_NOT_EXISTS; /** - * 生产单设计商品表 order_raw_goods_{N} Service 实现类 + * 订单设计商品表 order_raw_goods_{N} Service 实现类 * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateService.java index 8cee21007..041a90c88 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateService.java @@ -8,14 +8,14 @@ import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.module.executor.dal.dataobject.remainplaten.RemainPlateDO; /** - * 生产单余料板表 order_remain_plate_{N} Service 接口 + * 订单余料板表 order_remain_plate_{N} Service 接口 * * @author 晨丰科技 */ public interface RemainPlateService { /** - * 创建生产单余料板表 order_remain_plate_{N} + * 创建订单余料板表 order_remain_plate_{N} * * @param createReqVO 创建信息 * @return 编号 @@ -23,32 +23,32 @@ public interface RemainPlateService { Long createRemainPlate(@Valid RemainPlateSaveReqVO createReqVO); /** - * 更新生产单余料板表 order_remain_plate_{N} + * 更新订单余料板表 order_remain_plate_{N} * * @param updateReqVO 更新信息 */ void updateRemainPlate(@Valid RemainPlateSaveReqVO updateReqVO); /** - * 删除生产单余料板表 order_remain_plate_{N} + * 删除订单余料板表 order_remain_plate_{N} * * @param id 编号 */ void deleteRemainPlate(Long id); /** - * 获得生产单余料板表 order_remain_plate_{N} + * 获得订单余料板表 order_remain_plate_{N} * * @param id 编号 - * @return 生产单余料板表 order_remain_plate_{N} + * @return 订单余料板表 order_remain_plate_{N} */ RemainPlateDO getRemainPlate(Long id); /** - * 获得生产单余料板表 order_remain_plate_{N}分页 + * 获得订单余料板表 order_remain_plate_{N}分页 * * @param pageReqVO 分页查询 - * @return 生产单余料板表 order_remain_plate_{N}分页 + * @return 订单余料板表 order_remain_plate_{N}分页 */ PageResult getRemainPlatePage(RemainPlatePageReqVO pageReqVO); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateServiceImpl.java index 3330c29aa..9e32d46b9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/remainplate/RemainPlateServiceImpl.java @@ -16,7 +16,7 @@ import com.cf.imes.framework.common.util.object.BeanUtils; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; /** - * 生产单余料板表 order_remain_plate_{N} Service 实现类 + * 订单余料板表 order_remain_plate_{N} Service 实现类 * * @author 晨丰科技 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IContourData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IContourData.java index 6ab19cdfd..8218f4251 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IContourData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IContourData.java @@ -18,7 +18,7 @@ import java.util.List; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 public class IContourData { @Schema(description = "点集(二维向量(x,y,z))") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IOriginModelingData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IOriginModelingData.java index 8a75fe1d3..c10d1d305 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IOriginModelingData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IOriginModelingData.java @@ -17,7 +17,7 @@ import java.util.List; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 @JsonInclude(JsonInclude.Include.NON_NULL) public class IOriginModelingData { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/OffSetList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/OffSetList.java index 19d3a4a7a..1350a354f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/OffSetList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/OffSetList.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 @JsonInclude(JsonInclude.Include.NON_NULL) public class OffSetList { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java index 1da19b173..75bab4602 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java @@ -20,7 +20,7 @@ import java.util.Map; public class PlateDetail{ // 组织id private Long organId; -// 生产单id +// 订单id private Long orderId; // 板名称 private String name; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointDetail.java index 57b9772c3..d15804678 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointDetail.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 @JsonInclude(JsonInclude.Include.NON_NULL) public class PointDetail { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointList.java index 3abe429ce..2a3ff40a7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointList.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 @JsonInclude(JsonInclude.Include.NON_NULL) public class PointList { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java index 48b21ecde..5b30f1983 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java @@ -41,7 +41,7 @@ public class EsUtils { private final ElasticsearchClient elasticsearchClient; - private static final String DOCUMENT_DELETE_ERROR = "ES文档删除失败：{},排单号/生产单号为：{}"; + private static final String DOCUMENT_DELETE_ERROR = "ES文档删除失败：{},排单号/订单号为：{}"; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataAchieve.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataAchieve.java index 133c20295..4a160b42a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataAchieve.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataAchieve.java @@ -65,7 +65,7 @@ public class ApiDataAchieve { public JSONObject getApiPlateProData(String token, String orderNo) { SSLUtils.ignoreSsl(); JSONObject jsonPlatesData = new JSONObject(); - jsonPlatesData.put(ORDER_NO_KEY, "N" + orderNo);//生产单号需要传入赋值 + jsonPlatesData.put(ORDER_NO_KEY, "N" + orderNo);//订单号需要传入赋值 jsonPlatesData.put("format", "json"); jsonPlatesData.put("version", "3"); JSONObject dataPlates = apiDataProduction.getApiOrderMessage(token, jsonPlatesData); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index ea4b49bba..e6ad1919f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -242,7 +242,7 @@ public class ApiTypeRealize { goodsDO.setPlateNum(goodsDO.getPlateNum() + 1); goodsDO.setArea(goodsDO.getArea() + v.getArea().doubleValue()); - // 累加生产单的板件数量和面积 + // 累加订单的板件数量和面积 orderDO.setPlateNum(orderDO.getPlateNum() + 1); orderDO.setArea(orderDO.getArea() + v.getArea().doubleValue()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java index a39e9dd36..bb2b240d7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java @@ -169,7 +169,7 @@ public class ProduceApiConstants { public static final String BG_REMARK_JSON = "RemarkJson"; // 备注(Json格式) public static final String BG_SPECIAL_REMARK = "SpecialRemark"; // 特殊备注(Json字符串) - // ========== getApiOrderList orderList 生产单列表模块 ========== + // ========== getApiOrderList orderList 订单列表模块 ========== public static final String OL_ORDER_NO = "order_no"; // 订单编号 public static final String OL_CUSTOM_ORDER_NO = "custom_order_no"; // 自定义单号 public static final String OL_STORE_NAME = "store_name"; // 门店名称 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java index ad772197f..372a685f5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java @@ -54,7 +54,7 @@ import static com.cf.imes.module.executor.enums.ErrorCodeConstants.ORDER_IMPORT_ import static com.cf.imes.module.executor.enums.ErrorCodeConstants.ORDER_IMPORT_PLATEGOODS_NOT_EXIST_VALID_ERROR; /** - * 默认生产单excel导入监听器 + * 默认订单excel导入监听器 * * @author Gqr * @since 2025/1/9 11:14 @@ -68,7 +68,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener private List cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT); /** - * 存放生产单orders信息 + * 存放订单orders信息 */ private OrderDO orderDO = OrderDO.builder().build(); @@ -138,7 +138,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener ReadRowHolder readRowHolder = context.readRowHolder(); rowIndex = readRowHolder.getRowIndex(); - // 生产单信息在1-5行间 + // 订单信息在1-5行间 boolean isOrderInfo = (rowIndex >= 0 && rowIndex <= 4); // 板材/配件数据从第8行开始 boolean isPlate = rowIndex > 6; @@ -149,10 +149,10 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener stopParsing = true; } - // 缓存生产单数据 - // 补板的时候不更新生产单数据也就不缓存excel上的基础信息 + // 缓存订单数据 + // 补板的时候不更新订单数据也就不缓存excel上的基础信息 if (!stopParsing && isOrderInfo && !addToExistsOrder) { - // 校验生产单数据 + // 校验订单数据 validOrderInfo(data, rowIndex); } @@ -173,7 +173,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener public void doAfterAllAnalysed(AnalysisContext context) { // 这里也要保存数据，确保最后遗留的数据也存储到数据库 saveData(); - // 保存生产单数据 + // 保存订单数据 saveOrderTempData(); log.info("所有数据解析完成！"); } @@ -188,7 +188,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener } /** - * 生产单数据保存临时表 + * 订单数据保存临时表 */ private void saveOrderTempData() { OrderImportTempDataDO orderInfoTempDataDO = OrderImportTempDataDO.builder() @@ -206,12 +206,12 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener orderInfoTempDataDO.setDetail(JsonUtils.zipString(JSON.toJSONString(orderDO))); } orderImportTempDataMapper.insert(orderInfoTempDataDO); - log.info("excel导入临时生产单数据保存成功！"); + log.info("excel导入临时订单数据保存成功！"); } /** - * 生产单信息校验 + * 订单信息校验 * * @param data 行数据 * @param rowIndex 行号 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java index 4dcfec6a7..c72d60625 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java @@ -112,7 +112,7 @@ public class ExcelCheckListUtil { return new ExcelCheckVO().setFlag(error.get()).setOrderDO(orderDO).setMapOder(orderMap); } - // order生产单校验电话号码 + // order订单校验电话号码 private void setPhone(String key, String errValue, Map orderMap, AtomicBoolean error) { if (!ToolUtil.validatePhoneNumber(orderMap.get(key))) { orderMap.put(key, orderMap.get(key) + errValue); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java index e8ebf4af6..56995c22b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java @@ -98,7 +98,7 @@ public class ExcelTypeRealize { )); goodsMap.forEach((goodKey, goodValue) -> { -// 板材信息合集，添加生产单id，添加生产单板材设计端商品编码，板材信息写入order_raw_goods +// 板材信息合集，添加订单id，添加订单板材设计端商品编码，板材信息写入order_raw_goods RawGoodsDO rawGoodsDO = setRawGoodsDO(goodValue.get(0)).setId((Long) snowFlakeGenerator.nextId(null)).setOrderId(orderId); rawGoodsDOS.add(rawGoodsDO); Long goodId = (Long) snowFlakeGenerator.nextId(null); @@ -114,7 +114,7 @@ public class ExcelTypeRealize { } }); } else { // 商品编码有的 -// 板材信息合集，添加生产单id，添加生产单板材设计端商品编码，板材信息写入order_raw_goods +// 板材信息合集，添加订单id，添加订单板材设计端商品编码，板材信息写入order_raw_goods RawGoodsDO rawGoodsDO = setRawGoodsDO(value.get(0)).setId((Long) snowFlakeGenerator.nextId(null)).setOrderId(orderId); rawGoodsDOS.add(rawGoodsDO); Long goodId = (Long) snowFlakeGenerator.nextId(null); @@ -131,7 +131,7 @@ public class ExcelTypeRealize { } }); - // 配件信息合集，添加生产单id，添加生产单配件设计端商品编码，配件信息写入order_parts + // 配件信息合集，添加订单id，添加订单配件设计端商品编码，配件信息写入order_parts Map> partsIdMap = checkMap.get(PARTS).stream().collect( Collectors.groupingBy( excelVO -> excelVO.getGoodsId() != null && !StringUtils.isEmpty(excelVO.getGoodsId())? excelVO.getGoodsId() : " ", @@ -188,7 +188,7 @@ public class ExcelTypeRealize { orderPartsRemarks.add(orderPartsRemark); }); } else { // 商品编码有的 -// 板材信息合集，添加生产单id，添加生产单板材设计端商品编码，板材信息写入order_raw_goods +// 板材信息合集，添加订单id，添加订单板材设计端商品编码，板材信息写入order_raw_goods Long partId = (Long) snowFlakeGenerator.nextId(null); OrderPlateImportExcelVO part = value.get(0); OrderPartsDO orderPartsDO = OrderPartsDO.builder().id(partId).orderId(orderId) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java index 8da5af2eb..836f5cc36 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java @@ -18,13 +18,13 @@ import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; /** - * 生产单 Excel 导入 VO + * 订单 Excel 导入 VO */ @Data @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 @JsonInclude(JsonInclude.Include.NON_NULL) public class OrderPlateImportExcelVO { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java index d406f2772..6fe05d4e1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java @@ -95,7 +95,7 @@ import static com.cf.imes.module.executor.enums.OrderImportConstants.NOT_ASSIGNE import static com.cf.imes.module.executor.enums.OrderImportConstants.NOT_ASSIGNED_CODE; /** - * 默认生产单xml解析处理器 + * 默认订单xml解析处理器 * * @author Gqr * @since 2025/2/18 16:31 @@ -104,7 +104,7 @@ import static com.cf.imes.module.executor.enums.OrderImportConstants.NOT_ASSIGNE public class DefaultOrderImportXmlParserHandler { /** - * 存放生产单orders信息 + * 存放订单orders信息 */ private OrderDO orderDO; /** @@ -377,7 +377,7 @@ public class DefaultOrderImportXmlParserHandler { } // 文件解析结束了保存一次，确保最后遗留的数据也存储到数据库 saveData(); - // 保存生产单数据 + // 保存订单数据 saveOrderTempData(); log.info("所有数据解析完成！"); } catch (Exception e) { @@ -433,7 +433,7 @@ public class DefaultOrderImportXmlParserHandler { } /** - * 解析xml中的生产单 + * 解析xml中的订单 * * @param attributes * @throws Exception @@ -442,7 +442,7 @@ public class DefaultOrderImportXmlParserHandler { // 从标签属性生成order对象 OrderXmlVO orderXmlVO = getJavaBeanFromXmlAttr(OrderXmlVO.class, attributes); if (ObjectUtil.isNull(orderXmlVO)) { - throw new ServiceException(ORDER_IMPORT_DETAIL_VALID_ERROR, "生产单内容为空"); + throw new ServiceException(ORDER_IMPORT_DETAIL_VALID_ERROR, "订单内容为空"); } // 校验属性 validOrderInfo(orderXmlVO); @@ -1606,7 +1606,7 @@ public class DefaultOrderImportXmlParserHandler { } /** - * 校验生产单信息 + * 校验订单信息 * * @param orderXmlVO */ @@ -1677,7 +1677,7 @@ public class DefaultOrderImportXmlParserHandler { } /** - * 生产单数据保存临时表 + * 订单数据保存临时表 */ private void saveOrderTempData() { OrderImportTempDataDO orderInfoTempDataDO = OrderImportTempDataDO.builder() @@ -1695,7 +1695,7 @@ public class DefaultOrderImportXmlParserHandler { orderInfoTempDataDO.setDetail(JsonUtils.zipString(JSON.toJSONString(orderDO))); } orderImportTempDataMapper.insert(orderInfoTempDataDO); - log.info("xml导入临时生产单数据保存成功！"); + log.info("xml导入临时订单数据保存成功！"); } /** @@ -1810,7 +1810,7 @@ public class DefaultOrderImportXmlParserHandler { } /** - * 生产单属性长度校验 + * 订单属性长度校验 * * @param key * @param val diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/OrderPartsAddVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/OrderPartsAddVO.java index 1377f6ffb..66ebb70c8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/OrderPartsAddVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/OrderPartsAddVO.java @@ -20,7 +20,7 @@ public class OrderPartsAddVO { */ private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XMLUtil.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XMLUtil.java index 87e19147a..e702673b6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XMLUtil.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XMLUtil.java @@ -133,7 +133,7 @@ public class XMLUtil { return error; } - // 生产单数据格式验证 + // 订单数据格式验证 public XmlCheckVO changeDate(OrderXmlVO orderXmlVO, Long organId) { boolean error = validatePhoneNumbers(orderXmlVO); @@ -187,7 +187,7 @@ public class XMLUtil { .build(); } - // 生产单信息验证 + // 订单信息验证 return new XmlCheckVO(error, orderXmlVO, orderDO); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml index e208ffdc9..c070e9246 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml @@ -139,8 +139,8 @@ chenfeng: admin-ui: url: http://dashboard.chenfeng.iocoder.cn # Admin 管理后台 UI 的地址 swagger: - title: 生产单执行 - description: 提供生产单执行所有功能 + title: 订单执行 + description: 提供订单执行所有功能 version: ${chenfeng.info.version} base-package: ${chenfeng.info.base-package} captcha: diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml index 39e754563..3528fbe97 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml @@ -171,8 +171,8 @@ chenfeng: admin-ui: url: http://dashboard.chenfeng.iocoder.cn # Admin 管理后台 UI 的地址 swagger: - title: 生产单执行 - description: 提供生产单执行所有功能 + title: 订单执行 + description: 提供订单执行所有功能 version: ${chenfeng.info.version} base-package: ${chenfeng.info.base-package} captcha: diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml.xml index 82957a6ed..45d975b4b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml.xml @@ -1613,4 +1613,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml2.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml2.xml index 9bce6bfb7..a8b4662da 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml2.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_xml2.xml @@ -1914,4 +1914,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/cf-module-prod-executor/pom.xml b/cf-module-prod-executor/pom.xml index acd9f09b6..73a2ad158 100644 --- a/cf-module-prod-executor/pom.xml +++ b/cf-module-prod-executor/pom.xml @@ -22,7 +22,7 @@ - executor 模块下，我们放生产单执行业务 + executor 模块下，我们放订单执行业务 \ No newline at end of file diff --git a/cf-module-prod-plan/cf-module-prod-plan-api/src/main/java/com/cf/imes/module/plan/enums/ErrorCodeConstants.java b/cf-module-prod-plan/cf-module-prod-plan-api/src/main/java/com/cf/imes/module/plan/enums/ErrorCodeConstants.java index f718d4fce..62c0d45ae 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-api/src/main/java/com/cf/imes/module/plan/enums/ErrorCodeConstants.java +++ b/cf-module-prod-plan/cf-module-prod-plan-api/src/main/java/com/cf/imes/module/plan/enums/ErrorCodeConstants.java @@ -7,7 +7,7 @@ import com.cf.imes.framework.common.exception.ErrorCode; * 生产计划服务错误码枚举 使用 1-005-000-000 段 */ public class ErrorCodeConstants { - // ========== 生产单导入 1_005_000 ========== + // ========== 订单导入 1_005_000 ========== public static final ErrorCode ORDER_IMPORT_PLATE_GOODS_NOT_EXISTS = new ErrorCode(1_005_000_000, "order.import.plate.goods.not_exists"); public static final ErrorCode ORDER_IMPORT_ORGANID_NOT_EXISTS = new ErrorCode(1_005_000_001, "order.import.organid.not_exists"); public static final ErrorCode ORDER_IMPORT_FAIL = new ErrorCode(1_005_000_002, "order.import.fail"); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/config/ChenfengRabbitMQPlanConfiguration.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/config/ChenfengRabbitMQPlanConfiguration.java index 1069c44aa..dd440c729 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/config/ChenfengRabbitMQPlanConfiguration.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/config/ChenfengRabbitMQPlanConfiguration.java @@ -57,7 +57,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单xml导入交换机声明 + * 订单xml导入交换机声明 * * @return */ @@ -67,7 +67,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单excel导入交换机、队列、绑定声明 + * 订单excel导入交换机、队列、绑定声明 * * @return */ @@ -77,7 +77,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单excel导入队列声明 + * 订单excel导入队列声明 * * @return */ @@ -92,7 +92,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单excel导入交换机声明 + * 订单excel导入交换机声明 * * @return */ @@ -102,7 +102,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单xml导入交换机、队列、绑定声明 + * 订单xml导入交换机、队列、绑定声明 * * @return */ @@ -112,7 +112,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单xml导入队列声明 + * 订单xml导入队列声明 * * @return */ @@ -127,7 +127,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单xml导入交换机声明 + * 订单xml导入交换机声明 * * @return */ @@ -137,7 +137,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单导入死信交换机声明 + * 订单导入死信交换机声明 * * @return */ @@ -147,7 +147,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单导入死信队列声明 + * 订单导入死信队列声明 * * @return */ @@ -157,7 +157,7 @@ public class ChenfengRabbitMQPlanConfiguration { } /** - * 生产单导入死信队列、交换机、绑定声明 + * 订单导入死信队列、交换机、绑定声明 * * @return */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/OrderImportController.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/OrderImportController.java index 6ddbb507c..03d3c1dcf 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/OrderImportController.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/OrderImportController.java @@ -23,7 +23,7 @@ import static com.cf.imes.module.plan.enums.ErrorCodeConstants.WEBCAD_ORDER_IMPO * @author Gqr * @since 2025/3/4 10:22 */ -@Tag(name = "管理后台 - 生产单导入管理") +@Tag(name = "管理后台 - 订单导入管理") @RestController @RequestMapping("/plan/order") public class OrderImportController { @@ -31,7 +31,7 @@ public class OrderImportController { private WebCadOrderImportService webCadOrderImportService; @PostMapping("/webcad/import") - @Operation(summary = "webcad拆单导入生产单") + @Operation(summary = "webcad拆单导入订单") @OperateLog(type = IMPORT) public CommonResult webCadOrderImport(@RequestParam("file") MultipartFile file) { Long organId = OrganContextHolder.getOrganId(); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderImportTempDataReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderImportTempDataReqVO.java index d0651a29b..a614c5e09 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderImportTempDataReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderImportTempDataReqVO.java @@ -8,7 +8,7 @@ import lombok.Data; * @author Gqr * @since 2025/1/15 16:59 */ -@Schema(description = "管理后台 - 生产单导入临时数据 Request VO") +@Schema(description = "管理后台 - 订单导入临时数据 Request VO") @Data @Builder public class OrderImportTempDataReqVO { diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderPlateImportExcelVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderPlateImportExcelVO.java index 2ad218e78..50fc0047a 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderPlateImportExcelVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/vo/OrderPlateImportExcelVO.java @@ -12,13 +12,13 @@ import lombok.experimental.Accessors; import jakarta.validation.constraints.NotNull; /** - * 生产单 Excel 导入 VO + * 订单 Excel 导入 VO */ @Data @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问题 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问题 @JsonInclude(JsonInclude.Include.NON_NULL) public class OrderPlateImportExcelVO { diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataOrderReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataOrderReqVO.java index 4e5dd4367..a3683784f 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataOrderReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataOrderReqVO.java @@ -11,14 +11,14 @@ import jakarta.validation.constraints.NotNull; * @author Gqr * @since 2025/3/3 17:40 */ -@Schema(description = "管理后台 - webcad生产单信息 - RequestVO") +@Schema(description = "管理后台 - webcad订单信息 - RequestVO") @Data public class WebCadDataOrderReqVO { /** - * 生产单号 + * 订单号 */ @JsonProperty(value = "OrderNo") - @NotNull(message = "生产单号不能为空") - @NotEmpty(message = "生产单号不能为空") + @NotNull(message = "订单号不能为空") + @NotEmpty(message = "订单号不能为空") private String OrderNo; } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/goods/GoodsDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/goods/GoodsDO.java index 4c199163c..dcdc9096d 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/goods/GoodsDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/goods/GoodsDO.java @@ -16,7 +16,7 @@ import lombok.ToString; import java.math.BigDecimal; /** - * 生产单商品 DO + * 订单商品 DO * * @author 晨丰科技 */ @@ -39,7 +39,7 @@ public class GoodsDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/order/OrderDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/order/OrderDO.java index eab5c3247..84a193a4e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/order/OrderDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/order/OrderDO.java @@ -17,7 +17,7 @@ import lombok.ToString; import java.time.LocalDateTime; /** - * 生产单表 order_{N} DO + * 订单表 order_{N} DO * * @author 晨丰科技 */ @@ -32,7 +32,7 @@ import java.time.LocalDateTime; public class OrderDO extends BaseDO { /** - * 生产单号，主键 + * 订单号，主键 */ @TableId private Long id; @@ -45,11 +45,11 @@ public class OrderDO extends BaseDO { */ private Long parentNo; /** - * 源生产单号 + * 源订单号 */ private String apiOrderId; /** - * 生产单日期 + * 订单日期 */ private LocalDateTime orderDate; /** @@ -57,15 +57,15 @@ public class OrderDO extends BaseDO { */ private LocalDateTime deliveryDate; /** - * 生产单的完成时间 + * 订单的完成时间 */ private LocalDateTime finishTime; /** - * 生产单类型，1主单 2子单 + * 订单类型，1主单 2子单 */ private Integer orderType; /** - * 生产单排序号 + * 订单排序号 */ private Integer orderSort; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderBody/OrderBodyDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderBody/OrderBodyDO.java index 1a616682b..f7687f523 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderBody/OrderBodyDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderBody/OrderBodyDO.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; /** - * 生产单柜体 DO + * 订单柜体 DO * * @author 晨丰科技 */ @@ -38,7 +38,7 @@ public class OrderBodyDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderGroup/OrderGroupDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderGroup/OrderGroupDO.java index 5dac7b856..6f82554f2 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderGroup/OrderGroupDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderGroup/OrderGroupDO.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; /** - * 生产单加工组 DO + * 订单加工组 DO * * @author 晨丰科技 */ @@ -37,7 +37,7 @@ public class OrderGroupDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** @@ -45,7 +45,7 @@ public class OrderGroupDO extends BaseDO { */ private Long bodyId; /** - * 加工组类型id，依据同一生产单的同一房间的同一柜体的相同加工组类型，由服务端生成 + * 加工组类型id，依据同一订单的同一房间的同一柜体的相同加工组类型，由服务端生成 */ private Long groupTypeId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTaskDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTaskDO.java index d4993bf91..6dc2b4101 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTaskDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTaskDO.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; /** - * 生产单导入任务 + * 订单导入任务 * * @author Gqr * @since 2025/1/9 11:30 @@ -41,7 +41,7 @@ public class OrderImportTaskDO extends BaseDO { private Long organId; /** - * 生产单id + * 订单id */ private Long orderId; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTempDataDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTempDataDO.java index 8e329affa..8f6349273 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTempDataDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderImport/OrderImportTempDataDO.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; /** - * 生产单导入临时表 + * 订单导入临时表 * * @author Gqr * @since 2025/1/9 11:36 @@ -47,7 +47,7 @@ public class OrderImportTempDataDO { private Long taskId; /** - * 生产单id（补板用） + * 订单id（补板用） */ private Long orderId; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderItem/OrderItemDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderItem/OrderItemDO.java index 71da55b31..0bdb54335 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderItem/OrderItemDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderItem/OrderItemDO.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; /** - * 生产单明细表 order_item DO + * 订单明细表 order_item DO * * @author 晨丰科技 */ @@ -31,7 +31,7 @@ public class OrderItemDO { private Long id; /** - * 生产单号 + * 订单号 */ private Long orderId; /** @@ -59,7 +59,7 @@ public class OrderItemDO { */ private Long groupId; /** - * 生产单板件id + * 订单板件id */ private Long plateId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderParts/OrderPartsDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderParts/OrderPartsDO.java index d2c956457..9c6e6a8f2 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderParts/OrderPartsDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/orderParts/OrderPartsDO.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * 生产单配件表 order_parts_{N} DO + * 订单配件表 order_parts_{N} DO * * @author 晨丰科技 */ @@ -64,7 +64,7 @@ public class OrderPartsDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java index 0da75a0b7..75d55c73e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java @@ -19,7 +19,7 @@ import java.util.Map; /** * @author Beal - * 生产单 小板的轮廓数据对象 + * 订单 小板的轮廓数据对象 */ @Data @Builder @@ -28,7 +28,7 @@ import java.util.Map; public class OrderModelDO extends ESDocument { /*@Schema(description = "组织id") private Long organId;*/ - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "小板id") private Long plateId; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderPlateModel.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderPlateModel.java index 24673ee41..5a0d2bf9d 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderPlateModel.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderPlateModel.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class OrderPlateModel extends ESDocument { - @Schema(description = "生产单id") + @Schema(description = "订单id") private Long orderId; @Schema(description = "大板分类ID") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java index 9f8c41510..65cdc7bb7 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java @@ -16,7 +16,7 @@ import lombok.ToString; import java.math.BigDecimal; /** - * 生产单板件 DO + * 订单板件 DO * * @author 晨丰科技 */ @@ -93,7 +93,7 @@ public class PlateDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/rawgoods/RawGoodsDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/rawgoods/RawGoodsDO.java index 63b0b966e..6110ad859 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/rawgoods/RawGoodsDO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/rawgoods/RawGoodsDO.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; /** - * 生产单设计商品表 order_raw_goods_{N} DO + * 订单设计商品表 order_raw_goods_{N} DO * * @author 晨丰科技 */ @@ -37,7 +37,7 @@ public class RawGoodsDO extends BaseDO { @TableField(fill = FieldFill.INSERT_UPDATE) private Long organId; /** - * 生产单号 + * 订单号 */ private Long orderId; /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IContourData.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IContourData.java index f569b4ef3..282e7e476 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IContourData.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IContourData.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 public class IContourData { @Schema(description = "点集(二维向量(x,y,z))") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IOriginModelingData.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IOriginModelingData.java index 36a56ebf9..89d266bd5 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IOriginModelingData.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/IOriginModelingData.java @@ -16,7 +16,7 @@ import java.util.List; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 public class IOriginModelingData { @Schema(description = "刀半径") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OffSetList.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OffSetList.java index 544b9cdca..a00f5db8e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OffSetList.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OffSetList.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 public class OffSetList { @Schema(description = "偏移刀路ID") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OrderPartsRemark.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OrderPartsRemark.java index 9c37b3d1c..756e4c3dd 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/OrderPartsRemark.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/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 = "备注") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PlateDetail.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PlateDetail.java index 0d2a7fb2d..d4efe6d29 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PlateDetail.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PlateDetail.java @@ -20,7 +20,7 @@ import java.util.Map; public class PlateDetail { // 组织id private Long organId; - // 生产单id + // 订单id private Long orderId; // 板名称 private String name; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointDetail.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointDetail.java index 579dc6469..f7b6ecea5 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointDetail.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointDetail.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 public class PointDetail { @Schema(description = "点id") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointList.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointList.java index e368e62b2..af813563c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointList.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PointList.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; @Builder @AllArgsConstructor @NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 +@Accessors(chain = false) // 设置 chain = false，避免订单导入有问 public class PointList { @Schema(description = "纹路Id") diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/goods/GoodsMapper.java index 5751deb70..1b8ccfa06 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/goods/GoodsMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.goods.GoodsDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单商品 Mapper + * 订单商品 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/order/OrderMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/order/OrderMapper.java index c1d91cd1a..4cc4e853c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/order/OrderMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.order.OrderDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单表 order_{N} Mapper + * 订单表 order_{N} Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderBody/OrderBodyMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderBody/OrderBodyMapper.java index e4cee8ccb..b2a962305 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderBody/OrderBodyMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderBody/OrderBodyMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.orderBody.OrderBodyDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单柜体 Mapper + * 订单柜体 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderGroup/OrderGroupMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderGroup/OrderGroupMapper.java index 8fe0f16eb..7f23c94b6 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderGroup/OrderGroupMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderGroup/OrderGroupMapper.java @@ -4,7 +4,7 @@ import com.cf.imes.framework.mybatis.core.injector.BaseBatchMapper; import com.cf.imes.module.plan.dal.dataobject.orderGroup.OrderGroupDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单加工组 Mapper + * 订单加工组 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTaskMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTaskMapper.java index d30cc409f..38ac05a24 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTaskMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTaskMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTaskDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单导入任务 Mapper + * 订单导入任务 Mapper * * @author Gqr * @since 2025/1/9 11:42 diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java index 5d996677f..38f96cf40 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 生产单导入临时表 Mapper + * 订单导入临时表 Mapper * * @author Gqr * @since 2025/1/9 11:42 diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderItem/OrderItemMapper.java index 3a348ae96..ce066e4d8 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderItem/OrderItemMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.orderItem.OrderItemDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单明细表 order_item Mapper + * 订单明细表 order_item Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderParts/OrderPartsMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderParts/OrderPartsMapper.java index c1a7c1d93..6dfb48027 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderParts/OrderPartsMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderParts/OrderPartsMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.orderParts.OrderPartsDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单配件表 order_parts_{N} Mapper + * 订单配件表 order_parts_{N} Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/plate/PlateMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/plate/PlateMapper.java index 586eec091..d6fa8e775 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/plate/PlateMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.plate.PlateDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单板件 Mapper + * 订单板件 Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/rawgoods/RawGoodsMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/rawgoods/RawGoodsMapper.java index 088fba921..eeaba5861 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/rawgoods/RawGoodsMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/rawgoods/RawGoodsMapper.java @@ -5,7 +5,7 @@ import com.cf.imes.module.plan.dal.dataobject.rawgoods.RawGoodsDO; import org.apache.ibatis.annotations.Mapper; /** - * 生产单设计商品表 order_raw_goods_{N} Mapper + * 订单设计商品表 order_raw_goods_{N} Mapper * * @author 晨丰科技 */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateService.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateService.java index 81b770d55..73bfb4772 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateService.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateService.java @@ -22,7 +22,7 @@ public interface CustomPlateNoGenerateService { /** * 生成自定义板编号 * - * @param orderId 生产单号 + * @param orderId 订单号 * @param plateDO 板件 * @param generateConfig 板编号生成配置 * @param isFirstPlate 是否导入的第一块 @@ -31,7 +31,7 @@ public interface CustomPlateNoGenerateService { void generateCustomPlateNo(Long orderId, PlateDO plateDO, CustomPlateNoGenerateConfigVO generateConfig, boolean isFirstPlate); /** - * 生成结束后，更新板编号配置到对应生产单 + * 生成结束后，更新板编号配置到对应订单 * * @param generateConfig * @param orderDO diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java index 834249c17..69dd8f717 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java @@ -86,14 +86,14 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe Long orderId = orderDO.getId(); Long orgCustomPlateNoConfigId = generateConfig.getOrgCustomPlateNoConfigId(); LocalDateTime now = LocalDateTime.now(); - // 3、保存生产单序号json、设置生产单所用配置id + // 3、保存订单序号json、设置订单所用配置id OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // todo 补板延续自定义版编号 // if (newOrder) { orderDO.setCustomPlatenoSeq(JSON.toJSONString(orderCustomPlateNoSeqVO)); orderDO.setCustomPlatenoConfigId(orgCustomPlateNoConfigId); // } else { -// // 已有生产单更新序号 +// // 已有订单更新序号 // orderMapper.update(new LambdaUpdateWrapper().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO)))); // } // 机构下序号配置同步 @@ -143,10 +143,10 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe } /** - * 根据生产单id获取生成需要的配置 + * 根据订单id获取生成需要的配置 * * @param orderId - * @return 1、生产单下的序号 + * @return 1、订单下的序号 * 2、机构下的序号 * 3、机构下全局配置的规则 */ @@ -156,7 +156,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe // 机构下自定义板编号配置 SystemConfigRespDTO orgCustomPlateNoConfig = null; - // 生产单下序号 + // 订单下序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = new OrderCustomPlateNoSeqVO(); // 自定义板编号配置规则明细列表 List customPlateNoRuleVOS = List.of(); @@ -173,7 +173,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe OrderDO order = orderMapper.selectOne(new LambdaQueryWrapper().eq(OrderDO::getId, orderId)); if (ObjectUtil.isNotNull(order) && ObjectUtil.isNotNull(orgCustomPlateNoConfig)) { // 老单 - // 生产单上的自定义板编号配置id和当前最新的对比，不同用生产单号上的 + // 订单上的自定义板编号配置id和当前最新的对比，不同用订单号上的 Long orderCustomPlatenoConfigId = order.getCustomPlatenoConfigId(); if (ObjectUtil.isNotNull(orderCustomPlatenoConfigId) && ObjectUtil.notEqual(orgCustomPlateNoConfig.getId(), orderCustomPlatenoConfigId)) { CommonResult previousCustomPlateNoConfig = systemConfigApi.getById(orderCustomPlatenoConfigId); @@ -182,7 +182,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe } } - // 上一次的生产单内 自定义版编号序号 + // 上一次的订单内 自定义版编号序号 orderCustomPlateNoSeqVO = JSON.parseObject(order.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); } customPlateNoGenerateConfigVO.setOrderCustomPlateNoSeqVO(orderCustomPlateNoSeqVO); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java index 91a1b5825..a5f5c25a8 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/CustomPlateNoGenerateConfigVO.java @@ -15,7 +15,7 @@ public class CustomPlateNoGenerateConfigVO implements Serializable { private static final long serialVersionUID = -7383861104153624467L; /** - * 生产单下的之定义板编号序号内容 + * 订单下的之定义板编号序号内容 */ private OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/OrderCustomPlateNoSeqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/OrderCustomPlateNoSeqVO.java index bcfd9dcee..8dddf504d 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/OrderCustomPlateNoSeqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/vo/OrderCustomPlateNoSeqVO.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.List; /** - * 生产单-自定义板编号序号（custom_plateno_seq）vo + * 订单-自定义板编号序号（custom_plateno_seq）vo * * @author Gqr * @since 2024/11/15 10:41 @@ -20,32 +20,32 @@ public class OrderCustomPlateNoSeqVO implements Serializable { private static final long serialVersionUID = 5841977329049878792L; /** - * 生产单序号 + * 订单序号 */ private Integer orderNoSeq; /** - * 生产单下房间序号 + * 订单下房间序号 */ private Integer roomNoSeq; /** - * 生产单下柜体序号 + * 订单下柜体序号 */ private Integer bodyNoSeq; /** - * 生产单下板件序号 + * 订单下板件序号 */ private Integer plateNoSeq; /** - * 生产单下房间列表 + * 订单下房间列表 */ private List rooms; /** - * 生产单下柜体列表 + * 订单下柜体列表 */ private List bodys; } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java index 19aeee26e..57a4f4009 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java @@ -87,13 +87,13 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); ResetModeEnum resetModeEnum = ResetModeEnum.getByMode(ruleDTO.getResetMode()); - // 根据复位模式更新生产单的序号 + // 根据复位模式更新订单的序号 for (OrderDO orderDO : orderDOS) { resetOrder(orderDO, resetModeEnum); } @@ -117,9 +117,9 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 按生产单复位模式下的板编号生成 + * 按订单复位模式下的板编号生成 * - * @param orderId 生产单号 + * @param orderId 订单号 * @param plateNoRule 当前规则配置 * @param generateConfig 生成规则配置 * @param plateDO 板件列表 @@ -128,40 +128,40 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS private CustomPlateNoGenerateConfigVO generateNoByOrderResetMode(Long orderId, CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO, boolean firstPlate) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // 机构下的自定义板编号序号 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); - // 生产单下柜体序号 + // 订单下柜体序号 Integer orderBodyNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getBodyNoSeq()).orElse(initValue); - // 生产单序号下的房间序号列表 + // 订单序号下的房间序号列表 List bodys = orderCustomPlateNoSeqVO.getBodys(); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 跨单复位到初始值 orderBodyNoSeq = initValue; } String bodyName = plateDO.getBodyName(); - // 根据柜体名获取生产单下序号json中第一层柜体列表的柜体序号 + // 根据柜体名获取订单下序号json中第一层柜体列表的柜体序号 OrderCustomPlateNoSeqBodyVO bodySeqVo = getBodySeqVOByBodyName(bodyName, bodys); // 获取当前柜体序号值 Integer bodyNoSeq = Optional.ofNullable(bodySeqVo).map(OrderCustomPlateNoSeqBodyVO::getBodyNoSeq).orElse(null); if (bodySeqVo == null) { - // 生产单序号下柜体为空，新建柜体，取生产单下柜体序号 + // 订单序号下柜体为空，新建柜体，取订单下柜体序号 bodySeqVo = OrderCustomPlateNoSeqBodyVO.builder() .bodyName(bodyName) .build(); bodys.add(bodySeqVo); // 累加步长 bodyNoSeq = orderBodyNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下柜体序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下柜体序号累加到多少了 orderCustomPlateNoSeqVO.setBodyNoSeq(bodyNoSeq); } else if (bodyNoSeq == null) { - // 柜体下序号为空，取生产单下房间序号 + // 柜体下序号为空，取订单下房间序号 // 累加步长 bodyNoSeq = orderBodyNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下柜体序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下柜体序号累加到多少了 orderCustomPlateNoSeqVO.setBodyNoSeq(bodyNoSeq); } @@ -185,12 +185,12 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS private CustomPlateNoGenerateConfigVO generateNoByRoomResetMode(CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); List rooms = orderCustomPlateNoSeqVO.getRooms(); String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的柜体序号 + // 根据房间名获取订单下序号json中的房间下的柜体序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getRoomSeqVOByRoomName(roomName, rooms); Integer roomBodyNoRoomSeq = Optional.ofNullable(roomSeqVo) .map(OrderCustomPlateNoSeqRoomVO::getBodyNoSeq) @@ -206,9 +206,9 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS rooms.add(roomSeqVo); } - // 如果是新的柜体vo，要把累加的值记录到生产单rooms下的柜体 + // 如果是新的柜体vo，要把累加的值记录到订单rooms下的柜体 String bodyName = plateDO.getBodyName(); - // 根据柜体名获取生产单下序号中rooms下柜体列表的柜体序号 + // 根据柜体名获取订单下序号中rooms下柜体列表的柜体序号 List roomBodys = roomSeqVo.getBodys(); OrderCustomPlateNoSeqBodyVO roomBodySeqVo = getBodySeqVOByBodyName(bodyName, roomBodys); // 获取当前房间下柜体的序号值 @@ -221,13 +221,13 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS roomBodys.add(roomBodySeqVo); // 累加步长 roomBodyNoSeq = roomBodyNoRoomSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间中柜体累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间中柜体累加到多少了 roomSeqVo.setBodyNoSeq(roomBodyNoSeq); } else if (roomBodyNoSeq == null) { // 房间下柜体序号为空，设置房间下全局柜体序号值 // 累加步长 roomBodyNoSeq = roomBodyNoRoomSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间中柜体累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间中柜体累加到多少了 roomSeqVo.setBodyNoSeq(roomBodyNoSeq); } @@ -241,7 +241,7 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 根据房间名从生产单序号json中获取房间序号 + * 根据房间名从订单序号json中获取房间序号 * * @param roomName * @param roomVOList @@ -252,7 +252,7 @@ public class BodyNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 根据柜体名从生产单序号json中获取柜体序号 + * 根据柜体名从订单序号json中获取柜体序号 * * @param bodyName * @param bodyVOList diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/CustomPlateNoGenerateRuleService.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/CustomPlateNoGenerateRuleService.java index 758b7398a..68d4fd18b 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/CustomPlateNoGenerateRuleService.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/CustomPlateNoGenerateRuleService.java @@ -23,7 +23,7 @@ public interface CustomPlateNoGenerateRuleService { /** * 生成编号 * - * @param orderId 生产单号 + * @param orderId 订单号 * @param plateNoRule 生成规则 * @param generateConfig 生成所需要的配置 * @param plateDO 板材列表 diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java index 4364558d2..43906c269 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java @@ -27,7 +27,7 @@ import java.util.Optional; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.CUSTOM_PLATENO_GENERATE_ORDERNO_RULE_NOT_SUPPORT_RESETMODE; /** - * 生产单序号生成规则服务实现类 + * 订单序号生成规则服务实现类 * * @author Gqr * @since 2024/11/18 17:18 @@ -64,10 +64,10 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule public CustomPlateNoGenerateConfigVO generateNo(Long orderId, CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO, boolean firstPlate) { // 初始化配置 initConfig(generateConfig); - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); Integer orderNoSeq = orderCustomPlateNoSeqVO.getOrderNoSeq(); - // 当前导入已有序号的，生产单内生产单序号不会再变直接用 + // 当前导入已有序号的，订单内订单序号不会再变直接用 if (ObjectUtil.isNotNull(orderNoSeq)) { // 补零 String noPartAfterFill = this.fillZero(orderNoSeq, plateNoRule); @@ -78,7 +78,7 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); // 获取当前序号值 int currOrderNoSeq = Optional.ofNullable(orgCustomPlateNoSeqRespDTO.getOrderNoSeq()).orElse(plateNoRule.getInitValue() - plateNoRule.getIncrementStep()); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 根据复位模式计算序号 @@ -88,7 +88,7 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule String noPartAfterFill = this.fillZero(currOrderNoSeq, plateNoRule); plateDO.getCustomPlateNoBuilder().append(noPartAfterFill); - // 累加后的值同步到当前生产单序号和机构序号中 + // 累加后的值同步到当前订单序号和机构序号中 orderCustomPlateNoSeqVO.setOrderNoSeq(currOrderNoSeq); orgCustomPlateNoSeqRespDTO.setOrderNoSeq(currOrderNoSeq); return generateConfig; @@ -96,12 +96,12 @@ public class OrderNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); - // 更新生产单的序号 + // 更新订单的序号 for (OrderDO orderDO : orderDOS) { OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = JSON.parseObject(orderDO.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); if (ObjectUtil.isNotNull(orderCustomPlateNoSeqVO)) { diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java index 45621ff5a..da67da273 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java @@ -88,13 +88,13 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); ResetModeEnum resetModeEnum = ResetModeEnum.getByMode(ruleDTO.getResetMode()); - // 根据复位模式更新生产单的序号 + // 根据复位模式更新订单的序号 for (OrderDO orderDO : orderDOS) { OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = JSON.parseObject(orderDO.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); if (ObjectUtil.isNotNull(orderCustomPlateNoSeqVO)) { @@ -111,7 +111,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 复位生产单下房间中的板件序号 + * 复位订单下房间中的板件序号 * * @param rooms */ @@ -124,7 +124,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 复位生产单下柜体中的板件序号 + * 复位订单下柜体中的板件序号 * * @param rooms */ @@ -169,7 +169,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 按生产单复位模式下的板编号生成 + * 按订单复位模式下的板编号生成 * * @param orderId * @param plateNoRule @@ -179,13 +179,13 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule private CustomPlateNoGenerateConfigVO generateNoByOrderResetMode(Long orderId, CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO, boolean firstPlate) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // 机构下的自定义板编号序号 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); - // 获取当前生产单下板件序号 + // 获取当前订单下板件序号 Integer orderPlateNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getPlateNoSeq()).orElse(initValue); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 跨单复位到初始值 @@ -194,7 +194,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule // 跨板件累加步长，补零 orderPlateNoSeq += incrementStep; plateDO.getCustomPlateNoBuilder().append(fillZero(orderPlateNoSeq, plateNoRule)); - // 累加后的值同步到当前生产单序号中 + // 累加后的值同步到当前订单序号中 orderCustomPlateNoSeqVO.setPlateNoSeq(orderPlateNoSeq); return generateConfig; } @@ -210,11 +210,11 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule private CustomPlateNoGenerateConfigVO generateNoByRoomResetMode(CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); List rooms = orderCustomPlateNoSeqVO.getRooms(); String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的加工组序号 + // 根据房间名获取订单下序号json中的房间下的加工组序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getSeqRoomByRoomName(roomName, rooms); // 为空初始化，加入列表 if (roomSeqVo == null) { @@ -228,7 +228,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule // 累加步长 Integer roomPlateNoSeq = Optional.ofNullable(roomSeqVo.getPlateNoSeq()) .orElse(initValue) + incrementStep; - // 累加后的值同步到当前生产单序号中 + // 累加后的值同步到当前订单序号中 roomSeqVo.setPlateNoSeq(roomPlateNoSeq); // 补零 plateDO.getCustomPlateNoBuilder().append(fillZero(roomPlateNoSeq, plateNoRule)); @@ -236,7 +236,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 根据房间名从生产单序号json中获取房间序号列表 + * 根据房间名从订单序号json中获取房间序号列表 * * @param roomName * @param roomVOList @@ -257,12 +257,12 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule private CustomPlateNoGenerateConfigVO generateNoByBodyResetMode(CustomPlateNoRuleVO plateNoRule, CustomPlateNoGenerateConfigVO generateConfig, PlateDO plateDO) { Integer incrementStep = plateNoRule.getIncrementStep(); Integer initValue = plateNoRule.getInitValue() - incrementStep; - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); List rooms = orderCustomPlateNoSeqVO.getRooms(); String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的加工组序号 + // 根据房间名获取订单下序号json中的房间下的加工组序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getSeqRoomByRoomName(roomName, rooms); if (ObjectUtil.isNull(roomSeqVo)) { // 房间为空，new房间 @@ -275,7 +275,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } String bodyName = plateDO.getBodyName(); - // 根据柜体名获取生产单下序号json中的房间下的加工组序号 + // 根据柜体名获取订单下序号json中的房间下的加工组序号 OrderCustomPlateNoSeqBodyVO bodySeqVO = getBodySeqByBodyName(bodyName, roomSeqVo); if (bodySeqVO == null) { @@ -289,7 +289,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule // 累加步长 // 获取柜体下的板件序号 Integer bodyPlateNoSeq = Optional.ofNullable(bodySeqVO.getPlateNoSeq()).orElse(initValue) + incrementStep; - // 累加后的值同步到当前生产单序号中 + // 累加后的值同步到当前订单序号中 bodySeqVO.setPlateNoSeq(bodyPlateNoSeq); // 补零 String noPartAfterFillZero = fillZero(bodyPlateNoSeq, plateNoRule); @@ -298,7 +298,7 @@ public class PlateNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRule } /** - * 根据房间名从生产单序号json中获取房间序号列表 + * 根据房间名从订单序号json中获取房间序号列表 * * @param bodyName * @param roomVO diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java index 23abca187..6d2fae213 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java @@ -64,15 +64,15 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS Integer initValue = plateNoRule.getInitValue() - incrementStep; // 初始化配置 initConfig(generateConfig); - // 生产单下的序号 + // 订单下的序号 OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO(); // 机构下的自定义板编号序号 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); - // 生产单下房间序号 + // 订单下房间序号 Integer orderRoomNoSeq = Optional.ofNullable(orderCustomPlateNoSeqVO.getRoomNoSeq()).orElse(initValue); - // 生产单序号下的的房间序号列表 + // 订单序号下的的房间序号列表 List rooms = orderCustomPlateNoSeqVO.getRooms(); - // 上次导入的生产单号 + // 上次导入的订单号 Long lastOrderNo = orgCustomPlateNoSeqRespDTO.getLastOrderNo(); if (firstPlate && (ObjectUtil.isNull(lastOrderNo) || ObjectUtil.notEqual(orderId, lastOrderNo))) { // 跨单复位到初始值 @@ -80,12 +80,12 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } String roomName = plateDO.getRoomName(); - // 根据房间名获取生产单下序号json中的房间下的柜体序号 + // 根据房间名获取订单下序号json中的房间下的柜体序号 OrderCustomPlateNoSeqRoomVO roomSeqVo = getRoomSeqVOByRoomName(roomName, rooms); // 获取当前房间序号值 Integer roomNoSeq = Optional.ofNullable(roomSeqVo).map(OrderCustomPlateNoSeqRoomVO::getRoomNoSeq).orElse(null); if (roomSeqVo == null) { - // 房间为空，新建房间，取生产单下房间序号 + // 房间为空，新建房间，取订单下房间序号 roomSeqVo = OrderCustomPlateNoSeqRoomVO.builder() .roomName(roomName) .bodys(new ArrayList<>()) @@ -93,13 +93,13 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS rooms.add(roomSeqVo); // 累加步长 roomNoSeq = orderRoomNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间序号累加到多少了 orderCustomPlateNoSeqVO.setRoomNoSeq(roomNoSeq); } else if (roomNoSeq == null) { - // 房间下序号为空，取生产单下房间序号 + // 房间下序号为空，取订单下房间序号 // 累加步长 roomNoSeq = orderRoomNoSeq + incrementStep; - // 累加后的值同步到当前生产单序号中，生产单下房间序号累加到多少了 + // 累加后的值同步到当前订单序号中，订单下房间序号累加到多少了 orderCustomPlateNoSeqVO.setRoomNoSeq(roomNoSeq); } @@ -114,12 +114,12 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 查询所有使用当前配置id的生产单列表 + // 查询所有使用当前配置id的订单列表 Long configId = ruleDTO.getConfigId(); List orderDOS = orderMapper.selectList( new LambdaQueryWrapper().eq(OrderDO::getCustomPlatenoConfigId, configId).eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())); - // 更新生产单的序号 + // 更新订单的序号 for (OrderDO orderDO : orderDOS) { OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = JSON.parseObject(orderDO.getCustomPlatenoSeq(), OrderCustomPlateNoSeqVO.class); if (ObjectUtil.isNotNull(orderCustomPlateNoSeqVO)) { @@ -130,7 +130,7 @@ public class RoomNoGenerateRuleServiceImpl implements CustomPlateNoGenerateRuleS } /** - * 根据房间名从生产单序号json中获取房间序号列表 + * 根据房间名从订单序号json中获取房间序号列表 * * @param roomName * @param roomVOList diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java index 4ed2f12d0..4ed002dc2 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java @@ -31,7 +31,7 @@ import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConsta /** * @author Beal - * 生产单入库处理器 + * 订单入库处理器 */ @Slf4j @Component @@ -65,7 +65,7 @@ public class OrderInputProcessor { } /** - * 保存生产单造型数据 + * 保存订单造型数据 * * @param orderModelDOs */ @@ -85,7 +85,7 @@ public class OrderInputProcessor { } /** - * 异步保存生产单造型数据 + * 异步保存订单造型数据 * * @param orderModelDOs */ @@ -100,9 +100,9 @@ public class OrderInputProcessor { } /** - * 按批次删除生产单OrderModels + * 按批次删除订单OrderModels * - * @param orderId 生产单id + * @param orderId 订单id * @param batchId 批次id * @param index */ @@ -140,7 +140,7 @@ public class OrderInputProcessor { } /** - * 保存生产单配件备注数据 + * 保存订单配件备注数据 * * @param orderPartsRemarks */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportService.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportService.java index 3cca13b90..1dced62dc 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportService.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportService.java @@ -3,7 +3,7 @@ package com.cf.imes.module.plan.service.orderImport; import org.springframework.web.multipart.MultipartFile; /** - * 生产单导入服务Service + * 订单导入服务Service * * @author Gqr * @since 2025/3/4 10:25 @@ -11,7 +11,7 @@ import org.springframework.web.multipart.MultipartFile; public interface WebCadOrderImportService { /** - * webcad生产单导入 + * webcad订单导入 * * @param file * @return true：同步导入、false：异步导入 diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java index 89b8917d2..870b86804 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java @@ -67,7 +67,7 @@ import static com.cf.imes.module.plan.enums.ErrorCodeConstants.WEBCAD_ORDER_IMPO import static com.cf.imes.module.plan.enums.ErrorCodeConstants.WEBCAD_ORDER_NOT_EXISTS_ERROR; /** - * 生产单导入服务Service实现类 + * 订单导入服务Service实现类 * * @author Gqr * @since 2025/3/4 10:27 @@ -225,12 +225,12 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService { } /** - * 解析生产单信息 + * 解析订单信息 * * @param orderNo */ private OrderDO analyzeOrder(String orderNo, Long organId) { - // 查询生产单信息 + // 查询订单信息 OrderDO orderDOFromOrderNo = orderMapper.selectOne(new LambdaUpdateWrapper() .eq(OrderDO::getId, NumberUtil.parseLong(orderNo)) .eq(OrderDO::getOrganId, organId) @@ -239,12 +239,12 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService { throw new ServiceException(WEBCAD_ORDER_NOT_EXISTS_ERROR, orderNo); } else { Integer status = orderDOFromOrderNo.getStatus(); - // 更新生产单来源为webcad + // 更新订单来源为webcad LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() .eq(OrderDO::getId, orderDOFromOrderNo.getId()) .eq(OrderDO::getOrganId, organId) .set(OrderDO::getDataType, DataTypeEnum.API_IMPORT.getStatus()); - // 如果导入生产单为空单，则更新为新单 + // 如果导入订单为空单，则更新为新单 if (OrderStatusEnum.EMPTY.getStatus().equals(status)) { lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultExcelOrderImportConsumer.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultExcelOrderImportConsumer.java index 92001ad7e..662bfa496 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultExcelOrderImportConsumer.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultExcelOrderImportConsumer.java @@ -57,7 +57,7 @@ import static com.cf.imes.module.plan.enums.ErrorCodeConstants.ORDER_IMPORT_FAIL import static com.cf.imes.module.plan.enums.ErrorCodeConstants.ORDER_IMPORT_ORGANID_NOT_EXISTS; /** - * 默认excel导入生产单消费者 + * 默认excel导入订单消费者 * * @author Gqr * @since 2025/1/6 11:18 @@ -129,7 +129,7 @@ public class DefaultExcelOrderImportConsumer { @DS("imes_prod") @Transactional(rollbackFor = Exception.class) public void orderImport(String message, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) throws Exception { - log.info("====================【生产单默认excel导入收到消息：{}】====================", message); + log.info("====================【订单默认excel导入收到消息：{}】====================", message); Long organId = null; Long taskId = Long.parseLong(message); boolean lockResult = true; @@ -156,16 +156,16 @@ public class DefaultExcelOrderImportConsumer { if (ObjectUtil.isNull(orderImportTaskDO)) { return; } - // 创建生产单 + // 创建订单 OrderDO orderDO = createOrder(taskId); // 创建工厂 - log.info("====================【生产单默认excel导入处理临时数据开始】===================="); + log.info("====================【订单默认excel导入处理临时数据开始】===================="); DefaultExcelOrderImportFactory defaultExcelOrderImportFactory = new DefaultExcelOrderImportFactory(taskId, orderDO, organId, orderImportTaskDO.getCreator(), snowFlakeGenerator, idWorker, orderImportTaskMapper, orderImportTempDataMapper, dictDataApi, orderMapper, goodsMapper, rawGoodsMapper, orderPartsMapper, orderBodyMapper, orderGroupMapper, plateMapper, orderItemMapper, plateGoodMapper, orderInputProcessor, partsMapper, customPlateNoGenerateService); // 解析临时表数据 defaultExcelOrderImportFactory.analyzeTempData(); - log.info("====================【生产单默认excel导入处理临时数据结束】===================="); + log.info("====================【订单默认excel导入处理临时数据结束】===================="); } catch (Exception e) { log.error(ORDER_IMPORT_FAIL.getMsg(), e); orderImportTaskService.updateImportTaskFail(orderImportTaskDO, e); @@ -179,7 +179,7 @@ public class DefaultExcelOrderImportConsumer { } /** - * 创建生产单 + * 创建订单 * * @param taskId * @return @@ -194,10 +194,10 @@ public class DefaultExcelOrderImportConsumer { // 不是新单不用创建 if (ObjectUtil.isNotNull(orderImportTempDataDO) && ObjectUtil.isNotNull(orderImportTempDataDO.getOrderId())) { Long existOrderId = orderImportTempDataDO.getOrderId(); - // 校验生产单id + // 校验订单id OrderDO orderDO = orderMapper.selectById(existOrderId); Optional.ofNullable(orderDO).orElseThrow(() -> new ServiceException(ORDER_IMPORT_ORDER_NOT_EXISTS, existOrderId)); - // 更新补板生产单属性 + // 更新补板订单属性 updateOrder(orderDO); return orderDO; } @@ -207,7 +207,7 @@ public class DefaultExcelOrderImportConsumer { Long orderId = (Long) snowFlakeGenerator.nextId(null); newOrder.setId(orderId); orderMapper.insert(newOrder); - // 生产单id更新到导入任务表 + // 订单id更新到导入任务表 orderImportTaskMapper.update(new LambdaUpdateWrapper() .eq(OrderImportTaskDO::getId, taskId) .set(OrderImportTaskDO::getOrderId, orderId)); @@ -215,7 +215,7 @@ public class DefaultExcelOrderImportConsumer { } /** - * 更新补板生产单的属性 + * 更新补板订单的属性 * * @param orderDO */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultXmlOrderImportConsumer.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultXmlOrderImportConsumer.java index 410c71ef2..bfa0a5f5e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultXmlOrderImportConsumer.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultXmlOrderImportConsumer.java @@ -57,7 +57,7 @@ import static com.cf.imes.module.plan.enums.ErrorCodeConstants.ORDER_IMPORT_FAIL import static com.cf.imes.module.plan.enums.ErrorCodeConstants.ORDER_IMPORT_ORGANID_NOT_EXISTS; /** - * 默认excel导入生产单消费者 + * 默认excel导入订单消费者 * * @author Gqr * @since 2025/2/19 16:22 @@ -126,7 +126,7 @@ public class DefaultXmlOrderImportConsumer { @DS("imes_prod") @Transactional(rollbackFor = Exception.class) public void orderImport(String message, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) throws Exception { - log.info("====================【生产单默认xml导入收到消息：{}】====================", message); + log.info("====================【订单默认xml导入收到消息：{}】====================", message); Long organId = null; Long taskId = Long.parseLong(message); boolean lockResult = true; @@ -153,16 +153,16 @@ public class DefaultXmlOrderImportConsumer { if (ObjectUtil.isNull(orderImportTaskDO)) { return; } - // 创建生产单 + // 创建订单 OrderDO orderDO = createOrder(taskId); - log.info("====================【生产单默认xml导入处理临时数据开始】===================="); + log.info("====================【订单默认xml导入处理临时数据开始】===================="); // 创建工厂 DefaultXmlOrderImportFactory defaultExcelOrderImportFactory = new DefaultXmlOrderImportFactory(taskId, orderDO, organId, orderImportTaskDO.getCreator(), snowFlakeGenerator, idWorker, orderImportTaskMapper, orderImportTempDataMapper, orderMapper, goodsMapper, rawGoodsMapper, orderPartsMapper, orderBodyMapper, orderGroupMapper, plateMapper, orderItemMapper, plateGoodMapper, orderInputProcessor, partsMapper, customPlateNoGenerateService); // 解析临时表数据 defaultExcelOrderImportFactory.analyzeTempData(); - log.info("====================【生产单默认xml导入处理临时数据结束】===================="); + log.info("====================【订单默认xml导入处理临时数据结束】===================="); } catch (Exception e) { log.error( ORDER_IMPORT_FAIL.getMsg(), e); orderImportTaskService.updateImportTaskFail(orderImportTaskDO, e); @@ -176,7 +176,7 @@ public class DefaultXmlOrderImportConsumer { } /** - * 创建生产单 + * 创建订单 * * @param taskId * @return @@ -191,10 +191,10 @@ public class DefaultXmlOrderImportConsumer { // 不是新单不用创建 if (ObjectUtil.isNotNull(orderImportTempDataDO) && ObjectUtil.isNotNull(orderImportTempDataDO.getOrderId())) { Long existOrderId = orderImportTempDataDO.getOrderId(); - // 校验生产单id + // 校验订单id OrderDO orderDO = orderMapper.selectById(existOrderId); Optional.ofNullable(orderDO).orElseThrow(() -> new ServiceException(ORDER_IMPORT_ORDER_NOT_EXISTS, existOrderId)); - // 更新补板生产单属性 + // 更新补板订单属性 updateOrder(orderDO); return orderDO; } @@ -204,7 +204,7 @@ public class DefaultXmlOrderImportConsumer { Long orderId = (Long) snowFlakeGenerator.nextId(null); newOrder.setId(orderId); orderMapper.insert(newOrder); - // 生产单id更新到导入任务表 + // 订单id更新到导入任务表 orderImportTaskMapper.update(new LambdaUpdateWrapper() .eq(OrderImportTaskDO::getId, taskId) .set(OrderImportTaskDO::getOrderId, orderId)); @@ -212,7 +212,7 @@ public class DefaultXmlOrderImportConsumer { } /** - * 更新补板生产单的属性 + * 更新补板订单的属性 * * @param orderDO */ diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/OrderImportDeadLetterConsumer.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/OrderImportDeadLetterConsumer.java index cf88fb783..77d78431d 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/OrderImportDeadLetterConsumer.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/OrderImportDeadLetterConsumer.java @@ -28,7 +28,7 @@ import static com.cf.imes.framework.mq.rabbitmq.constant.RabbitMqConstants.ORDER import static com.cf.imes.module.plan.enums.ErrorCodeConstants.WEBCAD_ORDER_IMPORT_PEEK_NOT_EXIST_ERROR; /** - * 生产单导入死信队列消费 + * 订单导入死信队列消费 * * @author Gqr * @since 2025/2/12 10:48 @@ -52,7 +52,7 @@ public class OrderImportDeadLetterConsumer { @Header(value = "peek", required = false) String peek, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag, @Header(value = "x-death", required = false) List> xDeath) throws IOException { - log.info("====================【生产单导入收到死信消息：{}】====================", message); + log.info("====================【订单导入收到死信消息：{}】====================", message); // 手动确认消息 channel.basicAck(deliveryTag, false); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java index 548445366..9461d5c38 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java @@ -74,7 +74,7 @@ import static com.cf.imes.module.plan.service.order.OrderInputProcessor.ORDER_PA import static com.cf.imes.module.plan.service.order.OrderInputProcessor.ORDER_PLATE_MODEL; /** - * 默认excel导入生产单工厂服务 + * 默认excel导入订单工厂服务 * * @author Gqr * @since 2025/2/11 16:03 @@ -216,27 +216,27 @@ public class DefaultExcelOrderImportFactory { // 获取自定义板编号配置 plateNoGenerateConfigVO = customPlateNoGenerateService.getPlateNoGenerateConfig(orderId); - log.info("====================【生产单默认xml导入处理商品开始】===================="); + log.info("====================【订单默认xml导入处理商品开始】===================="); // 解析商品数据 analyzeGoods(); - log.info("====================【生产单默认xml导入处理商品结束】===================="); + log.info("====================【订单默认xml导入处理商品结束】===================="); - log.info("====================【生产单默认xml导入处理配件商品开始】===================="); + log.info("====================【订单默认xml导入处理配件商品开始】===================="); // 解析配件数据 analyzePartsGoods(); - log.info("====================【生产单默认xml导入处理配件商品结束】===================="); + log.info("====================【订单默认xml导入处理配件商品结束】===================="); - log.info("====================【生产单默认xml导入处理小板/配件开始】===================="); + log.info("====================【订单默认xml导入处理小板/配件开始】===================="); // 解析小板/配件项 analyzeRooms(); - log.info("====================【生产单默认xml导入处理小板/配件结束】===================="); - // 所有自定义板编号生成完成后更新配置到生产单 + log.info("====================【订单默认xml导入处理小板/配件结束】===================="); + // 所有自定义板编号生成完成后更新配置到订单 customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO); // 删除临时数据 deleteTempData(); - // 更新生产单板件数量 + // 更新订单板件数量 updateOrderPlateNum(); // 完成所有流程后更新任务为导入成功 @@ -494,7 +494,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 每达到阈值就批量插入一次生产单造型数据和压缩数据 + * 每达到阈值就批量插入一次订单造型数据和压缩数据 * * @param isLast 是否最后一次插入，不是就需要清理list */ @@ -986,14 +986,14 @@ public class DefaultExcelOrderImportFactory { } /** - * 每达到阈值就批量插入一次生产单造型数据和压缩数据 + * 每达到阈值就批量插入一次订单造型数据和压缩数据 * * @param isLast 是否最后一次插入，不是就需要清理list */ private void orderModelsBatchInsertWithinThreshold(boolean isLast) { // 达到批量的阈值就做一次插入 if (CollUtil.isNotEmpty(orderModelDOS) && (orderModelDOS.size() >= BATCH_THRESHOLD_NUMBER || isLast)) { - // 保存生产单造型数据 + // 保存订单造型数据 orderInputProcessor.batchSaveModel(orderModelDOS); if (!isLast) { // 存储完成清理 list @@ -1065,7 +1065,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 创建生产单柜体orderBody + * 创建订单柜体orderBody * * @param roomName * @param roomId @@ -1099,7 +1099,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 创建生产单加工组orderGroup + * 创建订单加工组orderGroup * * @param bodyId * @param groupTypeName @@ -1136,7 +1136,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 创建生产单设计商品orderRawGoods + * 创建订单设计商品orderRawGoods * * @param goodsId * @param groupDO @@ -1168,7 +1168,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 创建生产单商品orderGoods + * 创建订单商品orderGoods * * @param groupDO * @return @@ -1208,7 +1208,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 创建生产单配件orderParts + * 创建订单配件orderParts * * @param goodsId * @param groupDO @@ -1386,7 +1386,7 @@ public class DefaultExcelOrderImportFactory { } /** - * 更新生产单的板件总数 + * 更新订单的板件总数 */ private void updateOrderPlateNum() { int version = orderDO.getVersion(); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java index 99ade1af6..1653fdfe9 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java @@ -110,7 +110,7 @@ import static com.cf.imes.module.plan.service.order.OrderInputProcessor.ORDER_PA import static com.cf.imes.module.plan.service.order.OrderInputProcessor.ORDER_PLATE_MODEL; /** - * 默认xml导入生产单工厂服务 + * 默认xml导入订单工厂服务 * * @author Gqr * @since 2025/2/19 16:26 @@ -260,40 +260,40 @@ public class DefaultXmlOrderImportFactory { // 获取自定义板编号配置 plateNoGenerateConfigVO = customPlateNoGenerateService.getPlateNoGenerateConfig(orderId); - log.info("====================【生产单默认xml导入处理柜体开始】===================="); + log.info("====================【订单默认xml导入处理柜体开始】===================="); // 解析柜体数据 analyzeBodyNoPaging(); - log.info("====================【生产单默认xml导入处理柜体结束】===================="); + log.info("====================【订单默认xml导入处理柜体结束】===================="); - log.info("====================【生产单默认xml导入处理加工组开始】===================="); + log.info("====================【订单默认xml导入处理加工组开始】===================="); // 解析加工组 analyzeGroupNoPaging(); - log.info("====================【生产单默认xml导入处理加工组结束】===================="); + log.info("====================【订单默认xml导入处理加工组结束】===================="); - log.info("====================【生产单默认xml导入处理商品开始】===================="); + log.info("====================【订单默认xml导入处理商品开始】===================="); // 解析商品数据 analyzeGoodsDetailNoPaging(); - log.info("====================【生产单默认xml导入处理商品结束】===================="); + log.info("====================【订单默认xml导入处理商品结束】===================="); - log.info("====================【生产单默认xml导入处理板件开始】===================="); + log.info("====================【订单默认xml导入处理板件开始】===================="); // 解析板件 analyzePlate(); - log.info("====================【生产单默认xml导入处理板件结束】===================="); + log.info("====================【订单默认xml导入处理板件结束】===================="); - log.info("====================【生产单默认xml导入处理配件开始】===================="); + log.info("====================【订单默认xml导入处理配件开始】===================="); // 解析配件 analyzeParts(); - log.info("====================【生产单默认xml导入处理配件结束】===================="); + log.info("====================【订单默认xml导入处理配件结束】===================="); - log.info("====================【生产单默认xml导入处理回显开始】===================="); + log.info("====================【订单默认xml导入处理回显开始】===================="); // 把缓存数据回显到业务表 writeBackToOrders(); - log.info("====================【生产单默认xml导入处理回显结束】===================="); + log.info("====================【订单默认xml导入处理回显结束】===================="); // 删除临时数据 deleteTempData(); - // 更新生产单板件数量 + // 更新订单板件数量 updateOrderPlateNum(); // 完成所有流程后更新任务为导入成功 @@ -681,7 +681,7 @@ public class DefaultXmlOrderImportFactory { // 批量插入造型数据 orderModelsBatchInsertWithinThreshold(true); - // 所有自定义板编号生成完成后更新配置到生产单 + // 所有自定义板编号生成完成后更新配置到订单 customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO); } @@ -1688,7 +1688,7 @@ public class DefaultXmlOrderImportFactory { } /** - * 创建生产单柜体orderBody + * 创建订单柜体orderBody * * @param groupDO * @return @@ -1747,7 +1747,7 @@ public class DefaultXmlOrderImportFactory { } /** - * 创建生产单加工组orderGroup + * 创建订单加工组orderGroup * * @param groupDO * @return @@ -1803,14 +1803,14 @@ public class DefaultXmlOrderImportFactory { } /** - * 每达到阈值就批量插入一次生产单造型数据和压缩数据 + * 每达到阈值就批量插入一次订单造型数据和压缩数据 * * @param isLast 是否最后一次插入，不是就需要清理list */ private void orderModelsBatchInsertWithinThreshold(boolean isLast) { // 达到批量的阈值就做一次插入 if (CollUtil.isNotEmpty(orderModelDOS) && (orderModelDOS.size() >= BATCH_THRESHOLD_NUMBER || isLast)) { - // 保存生产单造型数据 + // 保存订单造型数据 orderInputProcessor.batchSaveModel(orderModelDOS); if (!isLast) { // 存储完成清理 list @@ -1820,7 +1820,7 @@ public class DefaultXmlOrderImportFactory { } /** - * 每达到阈值就批量插入一次生产单造型数据和压缩数据 + * 每达到阈值就批量插入一次订单造型数据和压缩数据 * * @param isLast 是否最后一次插入，不是就需要清理list */ @@ -1943,7 +1943,7 @@ public class DefaultXmlOrderImportFactory { } /** - * 更新生产单的板件总数 + * 更新订单的板件总数 */ private void updateOrderPlateNum() { int version = orderDO.getVersion(); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index ddb5ea2ab..c45bad740 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -97,7 +97,7 @@ import static com.cf.imes.module.plan.enums.ErrorCodeConstants.WEBCAD_ORDER_NOT_ import static com.cf.imes.module.plan.service.order.OrderInputProcessor.ORDER_PLATE_MODEL; /** - * webcad异步导入生产单工厂服务 + * webcad异步导入订单工厂服务 * * @author Gqr * @since 2025/3/8 14:39 @@ -278,9 +278,9 @@ public class WebCadOrderImportAsyncFactory { private void processFieldData(String fieldName, JSONReader reader) { switch (fieldName) { case "OrderNo": - log.debug("====================【cad拆单解析生产单开始】===================="); + log.debug("====================【cad拆单解析订单开始】===================="); analyzeOrder(reader.readString()); - log.debug("====================【cad拆单解析生产单结束】===================="); + log.debug("====================【cad拆单解析订单结束】===================="); break; case "Materials": log.debug("====================【cad拆单解析板材开始】===================="); @@ -403,12 +403,12 @@ public class WebCadOrderImportAsyncFactory { } /** - * 解析生产单信息 + * 解析订单信息 * * @param orderNo */ private void analyzeOrder(String orderNo) { - // 查询生产单信息 + // 查询订单信息 OrderDO orderDOFromOrderNo = orderMapper.selectOne(new LambdaUpdateWrapper() .eq(OrderDO::getId, NumberUtil.parseLong(orderNo)) .eq(OrderDO::getOrganId, organId) @@ -417,10 +417,10 @@ public class WebCadOrderImportAsyncFactory { throw new ServiceException(WEBCAD_ORDER_NOT_EXISTS_ERROR, orderNo); } else { Integer status = orderDOFromOrderNo.getStatus(); - // 更新生产单来源为webcad + // 更新订单来源为webcad LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper().eq(OrderDO::getId, orderDOFromOrderNo.getId()) .set(OrderDO::getDataType, DataTypeEnum.API_IMPORT.getStatus()); - // 如果导入生产单为空单，则更新为新单 + // 如果导入订单为空单，则更新为新单 if (OrderStatusEnum.EMPTY.getStatus().equals(status)) { lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); } @@ -429,7 +429,7 @@ public class WebCadOrderImportAsyncFactory { orderDO = orderDOFromOrderNo; orderId = orderDOFromOrderNo.getId(); - // 解析已有生产单下板件数量，超过两万不再导入 + // 解析已有订单下板件数量，超过两万不再导入 Long existPlateCount = plateMapper.selectCount(new LambdaQueryWrapper() .eq(PlateDO::getOrderId, orderId) .eq(PlateDO::getOrganId, organId) @@ -471,7 +471,7 @@ public class WebCadOrderImportAsyncFactory { Long orderGoodsId; GoodsDO existOrderGoods = materialMap.get(plateGoodsGoodsId); if (ObjectUtil.isNull(existOrderGoods)) { - // 检查生产单下是否已经有板材下的order_goods，有不再创建 + // 检查订单下是否已经有板材下的order_goods，有不再创建 List existOrderGoodIds = goodsMapper.selectList(new LambdaQueryWrapper() .eq(GoodsDO::getGoodsId, plateGoodsGoodsId) .eq(GoodsDO::getOrderId, orderId) @@ -510,7 +510,7 @@ public class WebCadOrderImportAsyncFactory { rawGoodsDO.setUpdateTime(now); orderGoodsId = (Long) snowFlakeGenerator.nextId(null); - // 创建生产单商品 + // 创建订单商品 GoodsDO goodsDO = GoodsDO.builder() .id(orderGoodsId) .orderId(orderId) @@ -616,7 +616,7 @@ public class WebCadOrderImportAsyncFactory { } /** - * 解析生产单信息板材列表 + * 解析订单信息板材列表 * * @param reader */ @@ -2264,14 +2264,14 @@ public class WebCadOrderImportAsyncFactory { } /** - * 每达到阈值就批量插入一次生产单造型数据和压缩数据 + * 每达到阈值就批量插入一次订单造型数据和压缩数据 * * @param isLast 是否最后一次插入，不是就需要清理list */ private void orderModelsBatchInsertWithinThreshold(boolean isLast) { // 达到批量的阈值就做一次插入 if (CollUtil.isNotEmpty(orderModelDOS) && (orderModelDOS.size() >= BATCH_THRESHOLD_NUMBER || isLast)) { - // 保存生产单造型数据 + // 保存订单造型数据 orderInputProcessor.batchAsyncSaveModel(orderModelDOS); if (!isLast) { // 存储完成清理 list @@ -2444,7 +2444,7 @@ public class WebCadOrderImportAsyncFactory { } /** - * 更新生产单的板件总数 + * 更新订单的板件总数 */ private void updateOrderPlateNum() { int version = orderDO.getVersion(); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 2f20a20de..6f82c03aa 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -85,7 +85,7 @@ import static com.cf.imes.module.plan.enums.ErrorCodeConstants.WEBCAD_ORDER_IMPO import static com.cf.imes.module.plan.service.order.OrderInputProcessor.ORDER_PLATE_MODEL; /** - * webcad导入生产单工厂服务 + * webcad导入订单工厂服务 * * @author Gqr * @since 2025/3/8 14:39 @@ -281,10 +281,10 @@ public class WebCadOrderImportFactory { // 新增/更新order_goods insertOrUpdatePlateNumGoods(); - // 更新生产单板件数量 + // 更新订单板件数量 updateOrderPlateNum(); - // 所有自定义板编号生成完成后更新配置到生产单 + // 所有自定义板编号生成完成后更新配置到订单 customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO); if (plateNumReachThreshold) { @@ -342,12 +342,12 @@ public class WebCadOrderImportFactory { } /** - * 解析生产单信息 + * 解析订单信息 * * @param */ private void analyzePlateNum() { - // 解析已有生产单下板件数量，超过两万不再导入 + // 解析已有订单下板件数量，超过两万不再导入 Long existPlateCount = plateMapper.selectCount(new LambdaQueryWrapper() .eq(PlateDO::getOrderId, orderId) .eq(PlateDO::getOrganId, organId) @@ -383,7 +383,7 @@ public class WebCadOrderImportFactory { return; } - // 检查生产单下是否已经有goodsId下的order_goods，有不再创建 + // 检查订单下是否已经有goodsId下的order_goods，有不再创建 materialMap = goodsMapper.selectMaps( new QueryWrapper() .select("goods_id ,MIN(id) as id, plate_num, planned_plate_num, area, planned_plate_area, version") @@ -432,7 +432,7 @@ public class WebCadOrderImportFactory { .build(); Long orderGoodsId = (Long) snowFlakeGenerator.nextId(null); - // 创建生产单商品 + // 创建订单商品 GoodsDO goodsDO = GoodsDO.builder() .id(orderGoodsId) .orderId(orderId) @@ -587,7 +587,7 @@ public class WebCadOrderImportFactory { } /** - * 解析生产单信息板材列表 + * 解析订单信息板材列表 * * @param douleRoomTree */ @@ -601,7 +601,7 @@ public class WebCadOrderImportFactory { // 所有房间名 List roomNames = douleRoomTree.stream().map(WebCadDataDoubleRoomTreeReqVO::getName).collect(Collectors.toList()); - // 查询当前生产单的所有房间 + // 查询当前订单的所有房间 existRoomIdMap = orderBodyMapper.selectMaps( new QueryWrapper() .select("room_name,MIN(room_id) as room_id") @@ -1375,7 +1375,7 @@ public class WebCadOrderImportFactory { roomId = existRoomId; } else { // 可能有配件房间柜体不在板件的情况，再查一次 - // 查询当前生产单的所有房间 + // 查询当前订单的所有房间 List roomNames = parts.stream().map(WebCadDataDoubleRoomTreeReqVO::getName).collect(Collectors.toList()); Map existPartsRoomIdMap = orderBodyMapper.selectMaps( @@ -2080,14 +2080,14 @@ public class WebCadOrderImportFactory { } /** - * 每达到阈值就批量插入一次生产单造型数据和压缩数据 + * 每达到阈值就批量插入一次订单造型数据和压缩数据 * * @param isLast 是否最后一次插入，不是就需要清理list */ private void orderModelsBatchInsertWithinThreshold(boolean isLast) { // 达到批量的阈值就做一次插入 if (CollUtil.isNotEmpty(orderModelDOS) && (orderModelDOS.size() >= BATCH_THRESHOLD_NUMBER || isLast)) { - // 保存生产单造型数据 + // 保存订单造型数据 orderInputProcessor.batchAsyncSaveModel(orderModelDOS); if (!isLast) { // 存储完成清理 list @@ -2218,7 +2218,7 @@ public class WebCadOrderImportFactory { } /** - * 更新生产单的板件总数 + * 更新订单的板件总数 */ private void updateOrderPlateNum() { int version = orderDO.getVersion(); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/property/WebCadImportProperties.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/property/WebCadImportProperties.java index 8e4d95ce6..483fa3057 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/property/WebCadImportProperties.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/property/WebCadImportProperties.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = "chenfeng.plan.webcad.import") public class WebCadImportProperties { /** - * 单条生产单内拆单板件阈值 + * 单条订单内拆单板件阈值 */ private int cadImportPlateNumThreshold; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml index 4452be6c3..acf8ff46e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml @@ -139,8 +139,8 @@ chenfeng: admin-ui: url: http://dashboard.chenfeng.iocoder.cn # Admin 管理后台 UI 的地址 swagger: - title: 生产单计划 - description: 提供生产单计划的所有功能 + title: 订单计划 + description: 提供订单计划的所有功能 version: ${chenfeng.info.version} base-package: ${chenfeng.info.base-package} captcha: diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml index 27b977f71..f4bdd1880 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml @@ -160,8 +160,8 @@ chenfeng: admin-ui: url: http://dashboard.chenfeng.iocoder.cn # Admin 管理后台 UI 的地址 swagger: - title: 生产单计划 - description: 提供生产单计划的所有功能 + title: 订单计划 + description: 提供订单计划的所有功能 version: ${chenfeng.info.version} base-package: ${chenfeng.info.base-package} captcha: diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode.properties b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode.properties index 547774d67..2d538db15 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode.properties +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode.properties @@ -13,21 +13,21 @@ global.org.product.not.exist=账号登录异常，套餐信息不存在，请重 global.org.product.expired=组织产品套餐已过期，请续费后继续使用 global.not.login=账号未登录 -order.import.plate.goods.not_exists={}生产单商品板材数据不存在：{} +order.import.plate.goods.not_exists={}订单商品板材数据不存在：{} order.import.organid.not_exists=不存在组织id，导入终止 order.import.fail=导入失败 -webcad.order.not_exists=导入失败：生产单号{}不存在 +webcad.order.not_exists=导入失败：订单号{}不存在 webcad.order.import.organid.empty=导入失败：无法获取机构信息，请检查cadtoken是否配置正确 webcad.order.import.failed=导入失败：请检查拆单数据 webcad.order.import.plate.not_exist=导入失败：板材对应失败，板材库中不存在对应板材{} webcad.order.import.save_data.error=导入失败：数据保存异常，请检查拆单数据 webcad.order.import.org.sealedge.get.error=导入失败：获取组织封边对应配置异常，请检查服务 webcad.order.import.org.sealedge.analyze.error=导入失败：组织封边对应配置解析异常，请检查配置 -webcad.order.import.plate_num.check.error=导入失败：生产单{}下板件数量已达到{}片，无法继续导入 -webcad.order.import.plate_num.threshold.reach=部分导入成功，生产单{}下板件数量已达到{}片，本次拆单超出部分不计入生产单 +webcad.order.import.plate_num.check.error=导入失败：订单{}下板件数量已达到{}片，无法继续导入 +webcad.order.import.plate_num.threshold.reach=部分导入成功，订单{}下板件数量已达到{}片，本次拆单超出部分不计入订单 order.import.plate.goods.no_match=导入失败，板材库中无板材匹配，商品编码：{}，商品名称：{}，材质：{}，颜色：{}，厚度：{}，品牌：{} webcad.order.import.peek.not_exist=导入失败：数据源不存在，请检查消息可靠性 -webcad.order.import.order.update.concurrent=导入失败：生产单号{}板件数量已发生改变，请重新导入 +webcad.order.import.order.update.concurrent=导入失败：订单号{}板件数量已发生改变，请重新导入 webcad.order.import.goods.update.concurrent=导入失败：材质{}板件数量已发生改变，请重新导入 webcad.order.import.cad.view.file.id.empty.error=导入失败：请检查CAD图纸数据是否上传成功 \ No newline at end of file diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode_cht.properties b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode_cht.properties index 87d3df8d7..ceb6c9012 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode_cht.properties +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/message_errorcode_cht.properties @@ -13,21 +13,21 @@ global.org.product.not.exist=帳號登入異常，套餐資訊不存在，請重 global.org.product.expired=組織產品套餐已過期，請續費後繼續使用 global.not.login=賬號未登錄 -order.import.plate.goods.not_exists={}生產單商品板材資料不存在：{} +order.import.plate.goods.not_exists={}訂單商品板材資料不存在：{} order.import.organid.not_exists=不存在組織ID，匯入終止 order.import.fail=匯入失敗 -webcad.order.not_exists=匯入失敗：生產單號{}不存在 +webcad.order.not_exists=匯入失敗：訂單號{}不存在 webcad.order.import.organid.empty=匯入失敗：無法取得機構資訊，請檢查 cadtoken 是否設定正確 webcad.order.import.failed=匯入失敗：請檢查拆單資料 webcad.order.import.plate.not_exist=匯入失敗：板材對應失敗，板材庫中不存在對應板材{} webcad.order.import.save_data.error=匯入失敗：資料儲存異常，請檢查拆單資料 webcad.order.import.org.sealedge.get.error=匯入失敗：取得組織封邊對應設定異常，請檢查服務 webcad.order.import.org.sealedge.analyze.error=匯入失敗：組織封邊對應設定解析異常，請檢查設定 -webcad.order.import.plate_num.check.error=匯入失敗：生產單{}下板件數量已達 {} 片，無法繼續匯入 -webcad.order.import.plate_num.threshold.reach=部分匯入成功，生產單{}下板件數量已達 {} 片，本次拆單超出部分不納入生產單 +webcad.order.import.plate_num.check.error=匯入失敗：訂單{}下板件數量已達 {} 片，無法繼續匯入 +webcad.order.import.plate_num.threshold.reach=部分匯入成功，訂單{}下板件數量已達 {} 片，本次拆單超出部分不納入訂單 order.import.plate.goods.no_match=匯入失敗，板材庫中無板材匹配，商品編碼：{}，商品名稱：{}，材質：{}，顏色：{}，厚度：{}，品牌：{} webcad.order.import.peek.not_exist=匯入失敗：資料來源不存在，請檢查訊息可靠性 -webcad.order.import.order.update.concurrent=匯入失敗：生產單號{}板件數量已發生變更，請重新匯入 +webcad.order.import.order.update.concurrent=匯入失敗：訂單號{}板件數量已發生變更，請重新匯入 webcad.order.import.goods.update.concurrent=匯入失敗：材質{}板件數量已發生變更，請重新匯入 webcad.order.import.cad.view.file.id.empty.error=匯入失敗：請檢查CAD圖紙數據是否上傳成功 \ No newline at end of file diff --git a/cf-module-prod-plan/pom.xml b/cf-module-prod-plan/pom.xml index f1436f0f1..bcbbce502 100644 --- a/cf-module-prod-plan/pom.xml +++ b/cf-module-prod-plan/pom.xml @@ -22,7 +22,7 @@ - plan 模块下，我们放生产单计划业务 + plan 模块下，我们放订单计划业务 \ No newline at end of file diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateReqVO.java index 727350d73..9aa9db9a1 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateReqVO.java @@ -16,7 +16,7 @@ import lombok.ToString; @AllArgsConstructor @NoArgsConstructor public class ReportTemplateReqVO { - @Schema(description = "模板名称", example = "生产单模板") + @Schema(description = "模板名称", example = "订单模板") private String name; @Schema(description = "模板类型，0内置、1自定义", example = "1") diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java index ec2930700..31a99172e 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java @@ -21,7 +21,7 @@ public class ReportTemplateRespVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; - @Schema(description = "模板名称", example = "生产单模板") + @Schema(description = "模板名称", example = "订单模板") private String name; @Schema(description = "报表模板") diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java index b01d6f876..f498bd00d 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java @@ -25,7 +25,7 @@ public class ReportTemplateSaveReqVO { @Schema(description = "主键", example = "1") private Long id; - @Schema(description = "模板名称", example = "生产单模板") + @Schema(description = "模板名称", example = "订单模板") @NotBlank(message = "report.template.save.name.notBlank") @Length(min = 1, max = 30, message = "report.template.save.name.length") private String name; diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/customplateno/dto/CustomPlateNoSeqDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/customplateno/dto/CustomPlateNoSeqDTO.java index 009fc9731..745eece60 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/customplateno/dto/CustomPlateNoSeqDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/customplateno/dto/CustomPlateNoSeqDTO.java @@ -31,12 +31,12 @@ public class CustomPlateNoSeqDTO implements Serializable { private Long configId; /** - * 上次生产单号 + * 上次订单号 */ private Long lastOrderNo; /** - * 生产单序号前值 + * 订单序号前值 */ private Integer orderNoSeq; diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/organ/dto/OrgStatisticsReqDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/organ/dto/OrgStatisticsReqDTO.java index a1a7aff9a..393e6bf29 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/organ/dto/OrgStatisticsReqDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/organ/dto/OrgStatisticsReqDTO.java @@ -11,7 +11,7 @@ import java.time.LocalDate; /** * 统计集合 --- 组织统计 */ -@Schema(description = "管理后台 - 生产单统计 Request VO") +@Schema(description = "管理后台 - 订单统计 Request VO") @Data public class OrgStatisticsReqDTO { @Schema(description = "组织id") diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/process/dto/ProcessRespDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/process/dto/ProcessRespDTO.java index 7bdca48cf..f2b1626ac 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/process/dto/ProcessRespDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/process/dto/ProcessRespDTO.java @@ -17,7 +17,7 @@ public class ProcessRespDTO { @Schema(description = "计件工资", requiredMode = Schema.RequiredMode.REQUIRED) private Double pieceRate; - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer pieceType; @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/CustomPlateNoRuleCodeEnum.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/CustomPlateNoRuleCodeEnum.java index 3c8168bd3..15c5006ed 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/CustomPlateNoRuleCodeEnum.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/CustomPlateNoRuleCodeEnum.java @@ -22,7 +22,7 @@ public enum CustomPlateNoRuleCodeEnum { DATE("date"), /** - * 生产单序号 + * 订单序号 */ ORDERNO("orderNo"), diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/ResetModeEnum.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/ResetModeEnum.java index 0b870eeb7..4ac9ec6eb 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/ResetModeEnum.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/customplateno/ResetModeEnum.java @@ -36,7 +36,7 @@ public enum ResetModeEnum { DAY(4), /** - * 按生产单 + * 按订单 */ ORDER(5), diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/vo/AssemblyConfigImportReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/vo/AssemblyConfigImportReqVO.java index 79f29ff4a..eff286cdb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/vo/AssemblyConfigImportReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/vo/AssemblyConfigImportReqVO.java @@ -16,7 +16,7 @@ import java.util.List; @Schema(description = "管理后台 - 装配设置 - 导入部件 Request VO") @Data public class AssemblyConfigImportReqVO { - @Schema(description = "生产单号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1,2,3,4]") + @Schema(description = "订单号列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1,2,3,4]") @NotEmpty(message = "{assembly.config.import.orderIds.notEmpty}") @Size(max = 100, message = "{assembly.config.import.orderIds.size}") private List orderIds; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/customplateno/vo/CustomPlateNoRuleResetModeReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/customplateno/vo/CustomPlateNoRuleResetModeReqVO.java index b2303e97f..bda52dd2d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/customplateno/vo/CustomPlateNoRuleResetModeReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/customplateno/vo/CustomPlateNoRuleResetModeReqVO.java @@ -17,7 +17,7 @@ public class CustomPlateNoRuleResetModeReqVO { @NotNull(message = "系统配置编号不能为空") private Long id; - @Schema(description = "规则编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产单流水号") + @Schema(description = "规则编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "订单流水号") @NotEmpty(message = "规则编号不能为空") private String ruleCode; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessPageReqVO.java index 2f09da8f1..71f442e6f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessPageReqVO.java @@ -20,7 +20,7 @@ public class ProcessPageReqVO extends PageParam { @Schema(description = "计件工资") private Double pieceRate; - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", example = "1") + @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比", example = "1") private Integer pieceType; @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", example = "2") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessRespVO.java index d768ae6c7..93582041c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessRespVO.java @@ -23,8 +23,8 @@ public class ProcessRespVO { @ExcelProperty("计件工资") private Double pieceRate; - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比") + @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比") private Integer pieceType; @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessSaveReqVO.java index c65c57f4b..f3d49651b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessSaveReqVO.java @@ -24,8 +24,8 @@ public class ProcessSaveReqVO { @NotNull(message = "计件工资不能为空") private Double pieceRate; - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比不能为空") + @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比不能为空") private Integer pieceType; @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserRespVO.java index c01fd89ed..d57bec9a6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserRespVO.java @@ -29,8 +29,8 @@ public class ProcessUserRespVO { @ExcelProperty("计件工资") private Double pieceRate; - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比") + @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比") private Integer pieceType; @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java index 011982028..e694ab3eb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessUserSaveReqVO.java @@ -22,8 +22,8 @@ public class ProcessUserSaveReqVO { @NotNull(message = "计件工资不能为空") private Double pieceRate; - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比不能为空") + @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比不能为空") private Integer pieceType; @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/customplateno/CustomPlateNoSeqDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/customplateno/CustomPlateNoSeqDO.java index 535cacba5..94c464e64 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/customplateno/CustomPlateNoSeqDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/customplateno/CustomPlateNoSeqDO.java @@ -43,13 +43,13 @@ public class CustomPlateNoSeqDO implements Serializable { private Long organId; /** - * 上次生产单号 + * 上次订单号 */ @TableField(value = "last_orderNo") private Long lastOrderNo; /** - * 生产单序号前值 + * 订单序号前值 */ @TableField(value = "orderNo_seq") private Integer orderNoSeq; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/process/ProcessDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/process/ProcessDO.java index d06ccd802..d3c30dcd1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/process/ProcessDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/process/ProcessDO.java @@ -38,7 +38,7 @@ public class ProcessDO extends BaseDO { */ private BigDecimal pieceRate; /** - * 计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比 + * 计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 订单金额百分比 */ private Integer pieceType; /** diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/BodyNoRuleResetServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/BodyNoRuleResetServiceHandler.java index df094e117..23fc225c6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/BodyNoRuleResetServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/BodyNoRuleResetServiceHandler.java @@ -27,7 +27,7 @@ public class BodyNoRuleResetServiceHandler extends AbstractCustomPlateNoResetSer @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 更新使用该配置的生产单中的orderNoSeq + // 更新使用该配置的订单中的orderNoSeq CommonResult orderResetResult = orderCustomPlateNoApi.resetOrderSeq(ruleDTO); if(orderResetResult.isError()) { ServiceException serviceException = new ServiceException(SYSTEM_CONFIG_CUSTOM_PLATE_NO_ORDER_RESET_UPDATE_ERROR); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/OrderNoRuleResetServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/OrderNoRuleResetServiceHandler.java index 1d08ecd53..75a08a35b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/OrderNoRuleResetServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/OrderNoRuleResetServiceHandler.java @@ -17,7 +17,7 @@ import jakarta.annotation.Resource; import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_CONFIG_CUSTOM_PLATE_NO_ORDER_RESET_UPDATE_ERROR; /** - * 自定义板编号生产单序号规则复位处理器 + * 自定义板编号订单序号规则复位处理器 * * @author Gqr * @since 2024/11/28 16:45 @@ -34,13 +34,13 @@ public class OrderNoRuleResetServiceHandler extends AbstractCustomPlateNoResetSe @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 更新机构下全局序号中的生产单前序值 + // 更新机构下全局序号中的订单前序值 LambdaUpdateWrapper seqLambdaUpdateWrapper = new LambdaUpdateWrapper() .eq(CustomPlateNoSeqDO::getOrganId, OrganContextHolder.getOrganId()) .set(CustomPlateNoSeqDO::getOrderNoSeq, null); customPlateNoSeqMapper.update(seqLambdaUpdateWrapper); - // 更新使用该配置的生产单中的orderNoSeq + // 更新使用该配置的订单中的orderNoSeq CommonResult orderResetResult = orderCustomPlateNoApi.resetOrderSeq(ruleDTO); if(orderResetResult.isError()) { ServiceException serviceException = new ServiceException(SYSTEM_CONFIG_CUSTOM_PLATE_NO_ORDER_RESET_UPDATE_ERROR); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/PlateNoRuleResetServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/PlateNoRuleResetServiceHandler.java index b1fc4ddf4..75ffb755b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/PlateNoRuleResetServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/PlateNoRuleResetServiceHandler.java @@ -46,7 +46,7 @@ public class PlateNoRuleResetServiceHandler extends AbstractCustomPlateNoResetSe customPlateNoSeqMapper.update(seqLambdaUpdateWrapper); } - // 更新使用该配置的生产单中的orderNoSeq + // 更新使用该配置的订单中的orderNoSeq CommonResult orderResetResult = orderCustomPlateNoApi.resetOrderSeq(ruleDTO); if(orderResetResult.isError()) { ServiceException serviceException = new ServiceException(SYSTEM_CONFIG_CUSTOM_PLATE_NO_ORDER_RESET_UPDATE_ERROR); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/RoomNoRuleResetServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/RoomNoRuleResetServiceHandler.java index 4dde78dd6..24a0c8403 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/RoomNoRuleResetServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/factory/service/impl/RoomNoRuleResetServiceHandler.java @@ -27,7 +27,7 @@ public class RoomNoRuleResetServiceHandler extends AbstractCustomPlateNoResetSer @Override public void reset(CustomPlateNoRuleDTO ruleDTO) { - // 更新使用该配置的生产单中的orderNoSeq + // 更新使用该配置的订单中的orderNoSeq CommonResult orderResetResult = orderCustomPlateNoApi.resetOrderSeq(ruleDTO); if(orderResetResult.isError()) { ServiceException serviceException = new ServiceException(SYSTEM_CONFIG_CUSTOM_PLATE_NO_ORDER_RESET_UPDATE_ERROR); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java index ef4d66bc7..53ad50075 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java @@ -504,24 +504,24 @@ public class DataSourceServiceImpl implements DataSourceService { switch (aLong) { - // 生产单基础信息 - // 生产单经销商信息 - // 生产单终端客户信息 + // 订单基础信息 + // 订单经销商信息 + // 订单终端客户信息 case 1543, 68, 80 -> { String machineDataSourceKeyName = getMachineDataSourceKeyName(machineId, aLong); data.append(orderPlanApi.apiDataGetPlan(planId, machineDataSourceKeyName)); } - // 生产单组织信息 + // 订单组织信息 case 61 -> { String machineDataSourceKeyName1 = getMachineDataSourceKeyName(machineId, aLong); data.append(dataQuery.dataGetOrgan(machineDataSourceKeyName1)); } - // 生产单业务员信息 - // 生产单拆单员信息 + // 订单业务员信息 + // 订单拆单员信息 case 74, 92 -> { String machineDataSourceKeyName2 = getMachineDataSourceKeyName(machineId, aLong); List nameList = orderPlanApi.apiGetOrders(planId, aLong == 74); @@ -581,8 +581,8 @@ public class DataSourceServiceImpl implements DataSourceService { } - // 生产单中的房间信息 - // 生产单中的柜体信息 + // 订单中的房间信息 + // 订单中的柜体信息 // 板件中的基础信息的房间信息 // 板件中的基础信息的柜体信息 case 1544,1545, 881, 889 -> { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message.properties index bf4ead889..51db48f6f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message.properties @@ -101,7 +101,7 @@ aj.captcha.6202=接口验证失败数过多，请稍后再试。 aj.captcha.6204=check接口请求次数超限，请稍后再试! aj.captcha.6205=verify请求次数超限。 -assembly.config.import.orderIds.notEmpty=生产单号列表不能为空 -assembly.config.import.orderIds.size=生产单号列表长度不能超过100 +assembly.config.import.orderIds.notEmpty=订单号列表不能为空 +assembly.config.import.orderIds.size=订单号列表长度不能超过100 assembly.config.save.id.notNull=装备设置编号不能为空 assembly.config.save.structure.config.notNull=装备设置结构配置不能为空 \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties index 41ded1b7a..003444b03 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message_cht.properties @@ -102,7 +102,7 @@ aj.captcha.6202=接口驗證失敗次數過多，請稍後再試。 aj.captcha.6204=check 接口請求次數超限，請稍後再試！ aj.captcha.6205=verify 請求次數超限。 -assembly.config.import.orderIds.notEmpty=生產單號清單不能為空 -assembly.config.import.orderIds.size=生產單號清單長度不能超過100 +assembly.config.import.orderIds.notEmpty=訂單號清單不能為空 +assembly.config.import.orderIds.size=訂單號清單長度不能超過100 assembly.config.save.id.notNull=裝備設定編號不能為空 assembly.config.save.structure.config.notNull=裝備設定結構配寘不能為空 \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode.properties index 9d76a8ca7..5c7087dbd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode.properties @@ -1 +1 @@ -global.error.request.param.missing=请求参数缺失:{0} global.error.bad.request=请求参数不正确:{0} global.error.request.param.type.error=请求参数类型错误:{0} global.error.request.not.found=请求未找到:{0} global.error.request.method.error=请求方法不正确:{0} global.error.request.too.many=请求过于频繁，请稍后重试 global.error.request.duplicate.data.error=请求数据已存在，请检查 global.error.default.error=系统繁忙，请稍后再试 global.error.no.permission=没有该操作权限 global.error.no.permission.to.visit.org=您无权访问该组织的数据 global.error.request.organId.notExist=请求的组织标识未传递，请进行排查 global.org.product.not.exist=账号登录异常，套餐信息不存在，请重新登陆 global.org.product.expired=组织产品套餐已过期，请续费后继续使用 global.not.login=账号未登录 auth.login.bad_credentials=登录失败，账号密码不正确 auth.login.user_disabled=登录失败，账号被禁用 auth.login.captcha_code_error=验证码不正确，原因：{0} auth.login.third_not_bind=未绑定账号，需要进行绑定 auth.mobile.not_exists=手机号不存在 auth.mobile.no_change=手机号未发生改变，无需修改 auth.manage_endpoint.login_permission_error=登录失败，管理端账号不存在 menu.name.duplicate=已经存在该名字的菜单 menu.parent.not_exists=父菜单不存在 menu.parent.error=不能设置自己为父菜单 menu.not_exists=菜单不存在 menu.exists_children=存在子菜单，无法删除 menu.parent.not_dir_or_menu=父菜单的类型必须是目录或者菜单 menu.operation_permission_error=管理端菜单操作权限不足 menu.trans_error=菜单翻译异常，error_code :{0} role.not_exists=角色不存在 role.name.duplicate=已经存在名为[{0}]的角色 role.code.duplicate=已经存在编码为[{0}]的角色 role.can_not_update_system_type=不能操作类型为系统内置的角色 role.is_disable=名字为[{0}]的角色已被禁用 role.admin_code_error=编码[{0}]不能使用 role.me_error=不可为自身分配角色 role.not_superadmin_no_organ_id_oper_error=非超管分配权限 role.buildin.modify_permission_error=修改内置角色下菜单权限的权限不足 role.self.modify_permission_error=无法修改自身的角色菜单权限 role.self.modify_error=无法修改自身的角色 user.username.exists=手机号已经存在 user.mobile.exists=手机号已经存在 user.email.exists=邮箱已经存在 user.not_exists=用户不存在 user.import.empty=导入用户数据不能为空！ user.password.failed=用户密码校验失败 user.is_disable=名字为[{0}]的用户已被禁用 user.count.max=超过组织用户配额({0})，创建用户失败！ user.me.error=不允许操作用户自身 user.password.length_at_least_8=密码长度不少于8位，且包含大小写字母、数字和特殊字符 user.username.multiple_error=存在[{0}]重复用户，请联系系统管理员 user.operate_self_status_error=不允许操作用户自身状态 user.mobile_update_not_allow=该用户已通过手机号认证，如需修改手机号请前往个人中心 dept.name.duplicate=已经存在该名字的部门 dept.parent.not_exists=父级部门不存在 dept.not_found=当前部门不存在 dept.exists_children=存在子部门，无法删除 dept.parent.error=不能设置自己为父部门 dept.exists_user=部门中存在员工，无法删除 dept.parent_is_child=不能设置自己的子部门为父部门 dept.user_oper_not_allow=不允许操作用户自身部门 dept.parent_user_oper_not_allow=不允许操作用户自身部门及其上级部门 dept.disable=部门({0})已被禁用 dept.not_allowed_login=部门({0})已被禁用，无法登录 dept.parent_disable=上级部门({0})已被禁用，请开启后操作或选择其他上级部门 dict_type.not_exists=当前字典类型不存在 dict_type.not_enable=字典类型处于关闭状态，不允许新增或编辑 dict_type.name.duplicate=已经存在该名字的字典类型 dict_type.type.duplicate=已经存在该类型的字典类型 dict_type.has_children=无法删除，该字典类型还有字典数据 dict_data.not_exists=当前字典数据不存在 dict_data.not_enable=字典数据({0})不处于开启状态，不允许选择 dict_data.value.duplicate=已经存在该值的字典数据 dict_data.trans_error=字典数据标签翻译异常，error_code :{0} notice.not_found=当前通知公告不存在 notice.name_unique_error=公告标题已存在，请编辑后重试 notice.buildin.modify_permission_error=内置通知公告编辑权限不足 sms.channel.not_exists=短信渠道不存在 sms.template.not_exists=短信模板不存在 sms.template.code.duplicate=已经存在编码为[{0}]的短信模板 sms.template.api_error=短信 API 模板调用失败，原因是：{0} sms.template.api.audit_checking=短信 API 模版无法使用，原因：审批中 sms.template.api.audit_fail=短信 API 模版无法使用，原因：审批不通过，{0} sms.template.api.not_found=短信 API 模版无法使用，原因：模版不存在 sms.send.mobile.not_exists=手机号不存在 sms.send.mobile.template_param_miss=短信模板参数({0})缺失 sms.send.template.not_exists=短信模板不存在 sms.code.not_found=验证码不存在，请点击获取 sms.code.not_correct=验证码不正确 sms.code.send_too_fast=短信发送过于频率 sms.code.is_valid=验证码在有效期内，5分钟内请勿重复发送！ organ.not_exists=组织不存在 organ.disable=[{0}]组织已被禁用 organ.expire=[{0}]组织已过期 organ.can_not_update_system=系统组织不能进行修改、删除等操作！ organ.name.duplicate=名字为[{0}]的组织已存在 organ.website.duplicate=域名为[{0}]的组织已存在 organ.data_code.not_exists=组织未配置数据源标识 organ.already_exists=该新增组织已授权机台数量无需重复新增！ organ.user_oper.not_allow=不允许操作用户自身组织 organ.contact_mobile.duplicate=手机号为[{0}]的组织已存在 organ.expiretime.product_id_lack=请选择要购买的产品 notify.template.not.exists=站内信模版不存在 notify.template.code.duplicate=已经存在编码为[{}]的站内信模板 notify.send.template.param.miss=站内信模板参数({})缺失 machine.not.exists=机台不存在 machine.template.not.exists=机台模板不存在 default.template.count=默认模板数量异常 the.current.machine.is.already.in.use=当前机台已使用，禁止删除 machine.error=当前机台错误，请重新选择机台 the.current.brand.of.the.machine.exists=当前机台配置的模板中，该品牌已存在，请重新输入品牌名称 the.model.of.the.machine.does.not.exist=该型号的机台模板不存在，请进行配置 the.current.brand=品牌ID错误，或品牌不存在 machine.num.error=当前组织该类型的机台创建已达到最大值，无法继续创建 machine.name.error=当前机台名称已存在，请重新输入机台名称 machinetemplate.name.error=当前机台模板的名称已存在，请重新输入机台模板名称 labelingmachine.related.data.error=当前机台关联的贴标机数据有误，请在高级配置中重新配置贴标机或选择其他模板 drillmachine.related.data.error=当前机台关联的钻孔机数据有误，请在钻孔模块中重新配置钻孔机或选择其他模板 machine.data.error=当前组织还未进行机台授权，请联系组织管理员在基础管理里对当前组织进行机台授权，或联系客服进行授权 machine.num.data.error=组织授权的机台数量不能超过127台 machine.used.already=当前机台在加工方案组中已使用，无法删除 label.template.not.exists=标签模板不存在 label.not.exists=标签不存在 default.label.not.exists=该类型标签默认模板不存在 machine.use.label=当前标签已有机台使用，无法删除 default.not.deleted=默认标签模板无法删除 label.is.use.error=当前标签打包设置中已有用户使用，无法删除 data.source.not.exists=系统数据源不存在 order.parts.import.list.is.empty=生产配件导入数据不可以为空 remain.plate.status.used=余料板正在使用中，禁止修改 remain.plate.status.no.used=余料板未使用 remain.plate.usr.type=余料板使用类型为不可核销类型 remain.plate.id.not.exists=未选中余料板，请选择余料板 remain.plate.count.max=每次新增余料板数量，最大为999 currently.no.configuration.available=当前没有{0}配置信息，请前往设置配置 system.config.not_exists=系统配置不存在 system.config.type_not_support=不支持的系统配置类型 system.config.custom_plate_no.rule_save_format_error=自定义板编号配置：自定义板编号保存格式错误，请检查配置规则 system.config.custom_plate_no.rule_reset_not_support=自定义板编号配置：该规则不支持手动复位/清零 system.config.custom_plate_no.rule_item_not_found=自定义板编号配置：找不到对应的规则项进行手动复位/清零 system.config.custom_plate_no.rule_order_reset_failed=自定义板编号配置：手动复位/清零生产单下序号失败，请联系客服 custom.plate_no.rule.code_empty=规则编码不能为空 custom.plate_no.rule.code_not_match=规则编码[{0}]不合法，请检查配置规则 custom.plate_no.rule.date_format_error=时间格式[{0}]不合法，请检查配置规则 custom.plate_no.rule.custom_value_empty=自定义字符值不能为空，请检查配置规则 custom.plate_no.rule.reset_mode_error=规则[{0}]复位/清零模式不合法，请检查配置规则 custom.plate_no.rule.int_type_empty={0} 下的 {1} 不能为空，请检查配置规则 custom.plate_no.rule.int_type_convert_error={0} 下的数值类型参数 {1}:{2} 转换异常，请检查配置规则 custom.plate_no.rule.bool_type_convert_error={0} 下的布尔类型参数 {1}:{2} 转换异常，请检查配置规则 process.scheme.data_empty=加工方案组的：{0} 为空，无法保存，请进行配置 process.scheme.config.data_empty=加工方案组的：{0} 为空，请检查配置信息 process.scheme.config.field_error=当前方案组的配置异常，请重新配置 process.scheme.config.in_use=当前方案组已在排单中使用，无法删除 process.scheme.config.machine_label_empty=当前方案组对应的解析器的机台的标签数据为空，请检查机台的标签配置信息 config.data_error=当前系统配置的数据有误，请重新尝试排序 process.config.used_already=当前加工分线配置在加工方案组中已使用，无法删除 optimization.config.used_already=当前数据处理配置在加工方案组中已使用，无法删除 sealedge.config.item_empty=第 {0} 条配置中，有字段值为空，请添加数据 sealedge.config.max_value_error=第 {0} 条配置中，{1} 要大于等于 {2}，请修改数据 sealedge.config.data_error=当前封边条配置有误，请重新检查后新增 sealedge.config.name_exists=当前配置的名称已存在，请重新命名 sealedge.config.decimal_places_max_three=第 {0} 条配置中，小数位数最大为 3 位，请进行修改 sealedge.config.min_value_gt_zero=第 {0} 条配置中，宽最小值：{1} 要大于 0，请修改数据 sealedge.config.max_value_gt_zero=第 {0} 条配置中，宽最大值：{1} 要大于 0，请修改数据 sealedge.config.value_range_error=第 {0} 条配置中，宽最大值 要大于 宽最小值，请修改数据 token.app_type.exist=当前应用已存在token配置，无法继续新增 token.config.not_exists=当前应用的token配置不存在 token.time.is_expires=当前token已过期，请重新配置或延长时间 token.app_type.no_update=应用名称不允许更改 token.data.is_null=当前token的配置为空，无需删除 token.expires_time.is_null=当前未选择有效时间，请选择再进行新增 token.expires_time.data_error=当前选择的有效时间已过期，请增加有效时间 token.insert.data_error=token新增失败，请重新尝试 invoice.no_exist=当前发票记录有误，请重新查看 invoicing.reject_reason=请填写拒绝开票原因 purchase_record.no_exist=当前发票对应的购买记录有误，请退回组织后重新申请开票 invoice.is_fail=当前发票已开票，无法再次进行开票 products.is_exist=产品[{0}]已存在，请修改产品名称后再次操作 products.no_delete=当前产品已上架，无法删除，请下架后再删除 products.no_update=当前产品已上架，无法进行修改 products.detail.no_update=定价规则对应的产品已上架，无法进行修改 advertisement.time_error=投放时间错误，结束时间应大于开始时间 advertisement.name.is_exist=当前广告名称已存在，请重新命名 advertisement.no_delete=当前广告已经发布，无法删除，请结束发布后再删除 product_promotion.active.name.is_exist=当前优惠活动名称已存在，请修改 product_promotion.purchaseduration.is_exist=当前所选产品下{0}{1}购买时长的优惠活动已存在，请修改 invoice_title.not_exists=发票抬头不存在，请先创建发票抬头 org_invoice.purchase_record.update_num.not_match=当前勾选的购买记录中部分可能已开票，请查询后重新勾选提交开票 org_invoice.agree_file.null=确认开票发票附件不能为空，请上传后再提交 invoice_title.org.exists=组织下已存在发票抬头，请刷新后编辑抬头内容 invoice_title.taxpayerid.exists=统一社会信用代码已存在，请检查 products.not_nolist=当前产品未上架 org_product.purchase.lock=组织下存在购买中的产品操作，请稍后再试 invoice_title.enterprise.taxnumber.empty=企业统一信用代码不能为空 invoice.amount.zero=可开票金额为0，请检查购买记录 invoice.apply.uninvoiceable.exist=当前提交记录中存在不可开票记录，请刷新列表后重新选择提交 pay.channel_not_support=暂不支持的支付渠道，请使用其他支付渠道 pay.order_not_exist=支付订单不存在，支付编号[{0}]，请重新发起支付 pay.order_channel_query_not_exist=如果您已确认扫码支付，请稍后刷新页面，支付平台可能存在延迟到账 pay.order_notify_data_parse_error=解析支付回调数据异常 pay.order_status_is_not_waiting=支付订单不处于待支付 pay.order_submit_channel_error=发起渠道支付异常，请联系客服 pay.notify_passback_tradetype_not_support_error=不支持的支付回调tradeType:[{0}]，请检查支付渠道 product.no_exist=当前产品不存在 product.detail_no_exist=当前产品的规则不存在 product.detail_duration_exist=当前产品下已存在产品时长[{0}/{1}]的定价规则，请修改后重新操作 product.promotion_no_exist=当前优惠活动不存在 product.detail_duration_unit_not_support=不支持的时长单位，请检查该定价规则的时长单位 org.product_purchase_wait_pay_error=组织下存在当前产品的待支付记录，请确认或取消支付后再次发起软件购买 product.price_null_error=产品建议价格为空，请联系客服 org.product_purchase_not_exist_error=组织订购记录不存在，请检查数据 org.product_purchase_exist_error=组织[{0}]订购记录已存在，请勿重复定义订购机构 advertisement.no_exist=广告不存在 advertisement.status_endtime_expired=当前广告投放结束时间已超期，请重新发布选择投放时间或重新编辑投放时间 advertisement.image_empty_error=广告图片文件为空，请重新上传 advertisement.image_upload_fail=广告图片上传失败，请稍后再试 advertisement.update_status_error=当前广告已经发布，若要编辑请先结束发布 parser.no_exist=当前解析器不存在，请重新选择 parser.template_no_exist=当前解析器模板不存在，请重新选择 product_purchase.no_exist=当前购买记录不存在，请检查 product_purchase.endtime_before_delaytime_error=当前产品订购有效期{0}未超过当前日期，请调整订购时长 product.delay_duration_unit_not_support=不支持的产品延期时长单位 assembly.config.import.order_components.query.error=装配设置导入失败：订单部件查询失败，请检查生产单状态 assembly.config.not_exist=装配设置不存在 assembly.config.do_config_exist=装配设置不存在 assembly.config.cover_target_not_exist=覆盖目标装备设置不存在，请重新查询后再次操作 assembly.config.new_config_name_exist=新装配设置名称[{0}]已存在，请重新查询后再次操作 assembly.config.remove_not_exist=删除装配设置不存在，请重新查询后再次操作 \ No newline at end of file +global.error.request.param.missing=请求参数缺失:{0} global.error.bad.request=请求参数不正确:{0} global.error.request.param.type.error=请求参数类型错误:{0} global.error.request.not.found=请求未找到:{0} global.error.request.method.error=请求方法不正确:{0} global.error.request.too.many=请求过于频繁，请稍后重试 global.error.request.duplicate.data.error=请求数据已存在，请检查 global.error.default.error=系统繁忙，请稍后再试 global.error.no.permission=没有该操作权限 global.error.no.permission.to.visit.org=您无权访问该组织的数据 global.error.request.organId.notExist=请求的组织标识未传递，请进行排查 global.org.product.not.exist=账号登录异常，套餐信息不存在，请重新登陆 global.org.product.expired=组织产品套餐已过期，请续费后继续使用 global.not.login=账号未登录 auth.login.bad_credentials=登录失败，账号密码不正确 auth.login.user_disabled=登录失败，账号被禁用 auth.login.captcha_code_error=验证码不正确，原因：{0} auth.login.third_not_bind=未绑定账号，需要进行绑定 auth.mobile.not_exists=手机号不存在 auth.mobile.no_change=手机号未发生改变，无需修改 auth.manage_endpoint.login_permission_error=登录失败，管理端账号不存在 menu.name.duplicate=已经存在该名字的菜单 menu.parent.not_exists=父菜单不存在 menu.parent.error=不能设置自己为父菜单 menu.not_exists=菜单不存在 menu.exists_children=存在子菜单，无法删除 menu.parent.not_dir_or_menu=父菜单的类型必须是目录或者菜单 menu.operation_permission_error=管理端菜单操作权限不足 menu.trans_error=菜单翻译异常，error_code :{0} role.not_exists=角色不存在 role.name.duplicate=已经存在名为[{0}]的角色 role.code.duplicate=已经存在编码为[{0}]的角色 role.can_not_update_system_type=不能操作类型为系统内置的角色 role.is_disable=名字为[{0}]的角色已被禁用 role.admin_code_error=编码[{0}]不能使用 role.me_error=不可为自身分配角色 role.not_superadmin_no_organ_id_oper_error=非超管分配权限 role.buildin.modify_permission_error=修改内置角色下菜单权限的权限不足 role.self.modify_permission_error=无法修改自身的角色菜单权限 role.self.modify_error=无法修改自身的角色 user.username.exists=手机号已经存在 user.mobile.exists=手机号已经存在 user.email.exists=邮箱已经存在 user.not_exists=用户不存在 user.import.empty=导入用户数据不能为空！ user.password.failed=用户密码校验失败 user.is_disable=名字为[{0}]的用户已被禁用 user.count.max=超过组织用户配额({0})，创建用户失败！ user.me.error=不允许操作用户自身 user.password.length_at_least_8=密码长度不少于8位，且包含大小写字母、数字和特殊字符 user.username.multiple_error=存在[{0}]重复用户，请联系系统管理员 user.operate_self_status_error=不允许操作用户自身状态 user.mobile_update_not_allow=该用户已通过手机号认证，如需修改手机号请前往个人中心 dept.name.duplicate=已经存在该名字的部门 dept.parent.not_exists=父级部门不存在 dept.not_found=当前部门不存在 dept.exists_children=存在子部门，无法删除 dept.parent.error=不能设置自己为父部门 dept.exists_user=部门中存在员工，无法删除 dept.parent_is_child=不能设置自己的子部门为父部门 dept.user_oper_not_allow=不允许操作用户自身部门 dept.parent_user_oper_not_allow=不允许操作用户自身部门及其上级部门 dept.disable=部门({0})已被禁用 dept.not_allowed_login=部门({0})已被禁用，无法登录 dept.parent_disable=上级部门({0})已被禁用，请开启后操作或选择其他上级部门 dict_type.not_exists=当前字典类型不存在 dict_type.not_enable=字典类型处于关闭状态，不允许新增或编辑 dict_type.name.duplicate=已经存在该名字的字典类型 dict_type.type.duplicate=已经存在该类型的字典类型 dict_type.has_children=无法删除，该字典类型还有字典数据 dict_data.not_exists=当前字典数据不存在 dict_data.not_enable=字典数据({0})不处于开启状态，不允许选择 dict_data.value.duplicate=已经存在该值的字典数据 dict_data.trans_error=字典数据标签翻译异常，error_code :{0} notice.not_found=当前通知公告不存在 notice.name_unique_error=公告标题已存在，请编辑后重试 notice.buildin.modify_permission_error=内置通知公告编辑权限不足 sms.channel.not_exists=短信渠道不存在 sms.template.not_exists=短信模板不存在 sms.template.code.duplicate=已经存在编码为[{0}]的短信模板 sms.template.api_error=短信 API 模板调用失败，原因是：{0} sms.template.api.audit_checking=短信 API 模版无法使用，原因：审批中 sms.template.api.audit_fail=短信 API 模版无法使用，原因：审批不通过，{0} sms.template.api.not_found=短信 API 模版无法使用，原因：模版不存在 sms.send.mobile.not_exists=手机号不存在 sms.send.mobile.template_param_miss=短信模板参数({0})缺失 sms.send.template.not_exists=短信模板不存在 sms.code.not_found=验证码不存在，请点击获取 sms.code.not_correct=验证码不正确 sms.code.send_too_fast=短信发送过于频率 sms.code.is_valid=验证码在有效期内，5分钟内请勿重复发送！ organ.not_exists=组织不存在 organ.disable=[{0}]组织已被禁用 organ.expire=[{0}]组织已过期 organ.can_not_update_system=系统组织不能进行修改、删除等操作！ organ.name.duplicate=名字为[{0}]的组织已存在 organ.website.duplicate=域名为[{0}]的组织已存在 organ.data_code.not_exists=组织未配置数据源标识 organ.already_exists=该新增组织已授权机台数量无需重复新增！ organ.user_oper.not_allow=不允许操作用户自身组织 organ.contact_mobile.duplicate=手机号为[{0}]的组织已存在 organ.expiretime.product_id_lack=请选择要购买的产品 notify.template.not.exists=站内信模版不存在 notify.template.code.duplicate=已经存在编码为[{}]的站内信模板 notify.send.template.param.miss=站内信模板参数({})缺失 machine.not.exists=机台不存在 machine.template.not.exists=机台模板不存在 default.template.count=默认模板数量异常 the.current.machine.is.already.in.use=当前机台已使用，禁止删除 machine.error=当前机台错误，请重新选择机台 the.current.brand.of.the.machine.exists=当前机台配置的模板中，该品牌已存在，请重新输入品牌名称 the.model.of.the.machine.does.not.exist=该型号的机台模板不存在，请进行配置 the.current.brand=品牌ID错误，或品牌不存在 machine.num.error=当前组织该类型的机台创建已达到最大值，无法继续创建 machine.name.error=当前机台名称已存在，请重新输入机台名称 machinetemplate.name.error=当前机台模板的名称已存在，请重新输入机台模板名称 labelingmachine.related.data.error=当前机台关联的贴标机数据有误，请在高级配置中重新配置贴标机或选择其他模板 drillmachine.related.data.error=当前机台关联的钻孔机数据有误，请在钻孔模块中重新配置钻孔机或选择其他模板 machine.data.error=当前组织还未进行机台授权，请联系组织管理员在基础管理里对当前组织进行机台授权，或联系客服进行授权 machine.num.data.error=组织授权的机台数量不能超过127台 machine.used.already=当前机台在加工方案组中已使用，无法删除 label.template.not.exists=标签模板不存在 label.not.exists=标签不存在 default.label.not.exists=该类型标签默认模板不存在 machine.use.label=当前标签已有机台使用，无法删除 default.not.deleted=默认标签模板无法删除 label.is.use.error=当前标签打包设置中已有用户使用，无法删除 data.source.not.exists=系统数据源不存在 order.parts.import.list.is.empty=生产配件导入数据不可以为空 remain.plate.status.used=余料板正在使用中，禁止修改 remain.plate.status.no.used=余料板未使用 remain.plate.usr.type=余料板使用类型为不可核销类型 remain.plate.id.not.exists=未选中余料板，请选择余料板 remain.plate.count.max=每次新增余料板数量，最大为999 currently.no.configuration.available=当前没有{0}配置信息，请前往设置配置 system.config.not_exists=系统配置不存在 system.config.type_not_support=不支持的系统配置类型 system.config.custom_plate_no.rule_save_format_error=自定义板编号配置：自定义板编号保存格式错误，请检查配置规则 system.config.custom_plate_no.rule_reset_not_support=自定义板编号配置：该规则不支持手动复位/清零 system.config.custom_plate_no.rule_item_not_found=自定义板编号配置：找不到对应的规则项进行手动复位/清零 system.config.custom_plate_no.rule_order_reset_failed=自定义板编号配置：手动复位/清零订单下序号失败，请联系客服 custom.plate_no.rule.code_empty=规则编码不能为空 custom.plate_no.rule.code_not_match=规则编码[{0}]不合法，请检查配置规则 custom.plate_no.rule.date_format_error=时间格式[{0}]不合法，请检查配置规则 custom.plate_no.rule.custom_value_empty=自定义字符值不能为空，请检查配置规则 custom.plate_no.rule.reset_mode_error=规则[{0}]复位/清零模式不合法，请检查配置规则 custom.plate_no.rule.int_type_empty={0} 下的 {1} 不能为空，请检查配置规则 custom.plate_no.rule.int_type_convert_error={0} 下的数值类型参数 {1}:{2} 转换异常，请检查配置规则 custom.plate_no.rule.bool_type_convert_error={0} 下的布尔类型参数 {1}:{2} 转换异常，请检查配置规则 process.scheme.data_empty=加工方案组的：{0} 为空，无法保存，请进行配置 process.scheme.config.data_empty=加工方案组的：{0} 为空，请检查配置信息 process.scheme.config.field_error=当前方案组的配置异常，请重新配置 process.scheme.config.in_use=当前方案组已在排单中使用，无法删除 process.scheme.config.machine_label_empty=当前方案组对应的解析器的机台的标签数据为空，请检查机台的标签配置信息 config.data_error=当前系统配置的数据有误，请重新尝试排序 process.config.used_already=当前加工分线配置在加工方案组中已使用，无法删除 optimization.config.used_already=当前数据处理配置在加工方案组中已使用，无法删除 sealedge.config.item_empty=第 {0} 条配置中，有字段值为空，请添加数据 sealedge.config.max_value_error=第 {0} 条配置中，{1} 要大于等于 {2}，请修改数据 sealedge.config.data_error=当前封边条配置有误，请重新检查后新增 sealedge.config.name_exists=当前配置的名称已存在，请重新命名 sealedge.config.decimal_places_max_three=第 {0} 条配置中，小数位数最大为 3 位，请进行修改 sealedge.config.min_value_gt_zero=第 {0} 条配置中，宽最小值：{1} 要大于 0，请修改数据 sealedge.config.max_value_gt_zero=第 {0} 条配置中，宽最大值：{1} 要大于 0，请修改数据 sealedge.config.value_range_error=第 {0} 条配置中，宽最大值 要大于 宽最小值，请修改数据 token.app_type.exist=当前应用已存在token配置，无法继续新增 token.config.not_exists=当前应用的token配置不存在 token.time.is_expires=当前token已过期，请重新配置或延长时间 token.app_type.no_update=应用名称不允许更改 token.data.is_null=当前token的配置为空，无需删除 token.expires_time.is_null=当前未选择有效时间，请选择再进行新增 token.expires_time.data_error=当前选择的有效时间已过期，请增加有效时间 token.insert.data_error=token新增失败，请重新尝试 invoice.no_exist=当前发票记录有误，请重新查看 invoicing.reject_reason=请填写拒绝开票原因 purchase_record.no_exist=当前发票对应的购买记录有误，请退回组织后重新申请开票 invoice.is_fail=当前发票已开票，无法再次进行开票 products.is_exist=产品[{0}]已存在，请修改产品名称后再次操作 products.no_delete=当前产品已上架，无法删除，请下架后再删除 products.no_update=当前产品已上架，无法进行修改 products.detail.no_update=定价规则对应的产品已上架，无法进行修改 advertisement.time_error=投放时间错误，结束时间应大于开始时间 advertisement.name.is_exist=当前广告名称已存在，请重新命名 advertisement.no_delete=当前广告已经发布，无法删除，请结束发布后再删除 product_promotion.active.name.is_exist=当前优惠活动名称已存在，请修改 product_promotion.purchaseduration.is_exist=当前所选产品下{0}{1}购买时长的优惠活动已存在，请修改 invoice_title.not_exists=发票抬头不存在，请先创建发票抬头 org_invoice.purchase_record.update_num.not_match=当前勾选的购买记录中部分可能已开票，请查询后重新勾选提交开票 org_invoice.agree_file.null=确认开票发票附件不能为空，请上传后再提交 invoice_title.org.exists=组织下已存在发票抬头，请刷新后编辑抬头内容 invoice_title.taxpayerid.exists=统一社会信用代码已存在，请检查 products.not_nolist=当前产品未上架 org_product.purchase.lock=组织下存在购买中的产品操作，请稍后再试 invoice_title.enterprise.taxnumber.empty=企业统一信用代码不能为空 invoice.amount.zero=可开票金额为0，请检查购买记录 invoice.apply.uninvoiceable.exist=当前提交记录中存在不可开票记录，请刷新列表后重新选择提交 pay.channel_not_support=暂不支持的支付渠道，请使用其他支付渠道 pay.order_not_exist=支付订单不存在，支付编号[{0}]，请重新发起支付 pay.order_channel_query_not_exist=如果您已确认扫码支付，请稍后刷新页面，支付平台可能存在延迟到账 pay.order_notify_data_parse_error=解析支付回调数据异常 pay.order_status_is_not_waiting=支付订单不处于待支付 pay.order_submit_channel_error=发起渠道支付异常，请联系客服 pay.notify_passback_tradetype_not_support_error=不支持的支付回调tradeType:[{0}]，请检查支付渠道 product.no_exist=当前产品不存在 product.detail_no_exist=当前产品的规则不存在 product.detail_duration_exist=当前产品下已存在产品时长[{0}/{1}]的定价规则，请修改后重新操作 product.promotion_no_exist=当前优惠活动不存在 product.detail_duration_unit_not_support=不支持的时长单位，请检查该定价规则的时长单位 org.product_purchase_wait_pay_error=组织下存在当前产品的待支付记录，请确认或取消支付后再次发起软件购买 product.price_null_error=产品建议价格为空，请联系客服 org.product_purchase_not_exist_error=组织订购记录不存在，请检查数据 org.product_purchase_exist_error=组织[{0}]订购记录已存在，请勿重复定义订购机构 advertisement.no_exist=广告不存在 advertisement.status_endtime_expired=当前广告投放结束时间已超期，请重新发布选择投放时间或重新编辑投放时间 advertisement.image_empty_error=广告图片文件为空，请重新上传 advertisement.image_upload_fail=广告图片上传失败，请稍后再试 advertisement.update_status_error=当前广告已经发布，若要编辑请先结束发布 parser.no_exist=当前解析器不存在，请重新选择 parser.template_no_exist=当前解析器模板不存在，请重新选择 product_purchase.no_exist=当前购买记录不存在，请检查 product_purchase.endtime_before_delaytime_error=当前产品订购有效期{0}未超过当前日期，请调整订购时长 product.delay_duration_unit_not_support=不支持的产品延期时长单位 assembly.config.import.order_components.query.error=装配设置导入失败：订单部件查询失败，请检查订单状态 assembly.config.not_exist=装配设置不存在 assembly.config.do_config_exist=装配设置不存在 assembly.config.cover_target_not_exist=覆盖目标装备设置不存在，请重新查询后再次操作 assembly.config.new_config_name_exist=新装配设置名称[{0}]已存在，请重新查询后再次操作 assembly.config.remove_not_exist=删除装配设置不存在，请重新查询后再次操作 \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode_cht.properties b/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode_cht.properties index c4caae699..d397e2c5e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode_cht.properties +++ b/cf-module-system/cf-module-system-biz/src/main/resources/message_errorcode_cht.properties @@ -1 +1 @@ -global.error.request.param.missing=請求參數缺失：{0} global.error.bad.request=請求參數不正確：{0} global.error.request.param.type.error=請求參數類型錯誤：{0} global.error.request.not.found=請求未找到：{0} global.error.request.method.error=請求方法不正確：{0} global.error.request.too.many=請求過於頻繁，請稍後重試 global.error.request.duplicate.data.error=請求數據已存在，請檢查 global.error.default.error=系統繁忙，請稍後再試 global.error.no.permission=您沒有該操作的權限 global.error.no.permission.to.visit.org=您無權訪問該組織的數據 global.error.request.organId.notExist=請求的組織標識未傳遞，請進行排查 global.org.product.not.exist=帳號登入異常，套餐資訊不存在，請重新登入 global.org.product.expired=組織產品套餐已過期，請續費後繼續使用 global.not.login=賬號未登錄 auth.login.bad_credentials=登入失敗，帳號或密碼不正確 auth.login.user_disabled=登入失敗，帳號已被停用 auth.login.captcha_code_error=驗證碼不正確，原因：{0} auth.login.third_not_bind=尚未綁定帳號，需要進行綁定 auth.mobile.not_exists=手機號碼不存在 auth.mobile.no_change=手機號碼未發生變更，無需修改 auth.manage_endpoint.login_permission_error=登入失敗，管理端帳號不存在 menu.name.duplicate=已存在相同名稱的選單 menu.parent.not_exists=父選單不存在 menu.parent.error=不能將自身設定為父選單 menu.not_exists=選單不存在 menu.exists_children=存在子選單，無法刪除 menu.parent.not_dir_or_menu=父選單的類型必須是目錄或選單 menu.operation_permission_error=管理端選單操作權限不足 menu.trans_error=選單翻譯異常，error_code：{0} role.not_exists=角色不存在 role.name.duplicate=已存在名稱為[{0}]的角色 role.code.duplicate=已存在編碼為[{0}]的角色 role.can_not_update_system_type=不能操作系統內建的角色 role.is_disable=名稱為[{0}]的角色已被停用 role.admin_code_error=編碼[{0}]不能使用 role.me_error=不可為自身分配角色 role.not_superadmin_no_organ_id_oper_error=非超級管理員不可分配權限 role.buildin.modify_permission_error=修改內建角色下選單權限的權限不足 role.self.modify_permission_error=無法修改自身角色的選單權限 role.self.modify_error=無法修改自身的角色 user.username.exists=手機號已經存在 user.mobile.exists=手機號已經存在 user.email.exists=郵箱已經存在 user.not_exists=用戶不存在 user.import.empty=導入用戶數據不能為空！ user.password.failed=用戶密碼校驗失敗 user.is_disable=名字為[{0}]的用戶已被禁用 user.count.max=超過組織用戶配額({0})，創建用戶失敗！ user.me.error=不允許操作用戶自身 user.password.length_at_least_8=密碼長度不少於8位，且包含大小寫字母、數字和特殊字符 user.username.multiple_error=存在[{0}]重複用戶，請聯繫系統管理員 user.operate_self_status_error=不允許操作用戶自身狀態 user.mobile_update_not_allow=該用戶已通過手機號認證，如需修改手機號請前往個人中心 dept.name.duplicate=已經存在該名字的部門 dept.parent.not_exists=父級部門不存在 dept.not_found=當前部門不存在 dept.exists_children=存在子部門，無法刪除 dept.parent.error=不能設置自己為父部門 dept.exists_user=部門中存在員工，無法刪除 dept.parent_is_child=不能設置自己的子部門為父部門 dept.user_oper_not_allow=不允許操作用戶自身部門 dept.parent_user_oper_not_allow=不允許操作用戶自身部門及其上級部門 dept.disable=部門({0})已被禁用 dept.not_allowed_login=部門({0})已被禁用，無法登入 dept.parent_disable=上級部門({0})已被禁用，請開啟後操作或選擇其他上級部門 dict_type.not_exists=當前字典類型不存在 dict_type.not_enable=字典類型處於關閉狀態，不允許新增或編輯 dict_type.name.duplicate=已經存在該名字的字典類型 dict_type.type.duplicate=已經存在該類型的字典類型 dict_type.has_children=無法刪除，該字典類型還有字典數據 dict_data.not_exists=當前字典數據不存在 dict_data.not_enable=字典數據({0})不處於開啟狀態，不允許選擇 dict_data.value.duplicate=已經存在該值的字典數據 dict_data.trans_error=字典數據標籤翻譯異常，error_code :{0} notice.not_found=當前通知公告不存在 notice.name_unique_error=公告標題已存在，請編輯後重試 notice.buildin.modify_permission_error=內置通知公告編輯權限不足 sms.channel.not_exists=短信渠道不存在 sms.template.not_exists=短信模板不存在 sms.template.code.duplicate=已經存在編碼為[{0}]的短信模板 sms.template.api_error=短信 API 模板調用失敗，原因是：{0} sms.template.api.audit_checking=短信 API 模版無法使用，原因：審批中 sms.template.api.audit_fail=短信 API 模版無法使用，原因：審批不通過，{0} sms.template.api.not_found=短信 API 模版無法使用，原因：模版不存在 sms.send.mobile.not_exists=手機號碼不存在 sms.send.mobile.template_param_miss=短信模板參數({0})缺失 sms.send.template.not_exists=短信模板不存在 sms.code.not_found=驗證碼不存在，請點擊獲取 sms.code.not_correct=驗證碼不正確 sms.code.send_too_fast=短信發送過於頻繁 sms.code.is_valid=驗證碼在有效期內，5 分鐘內請勿重複發送！ organ.not_exists=組織不存在 organ.disable=[{0}]組織已被禁用 organ.expire=[{0}]組織已過期 organ.can_not_update_system=系統組織不能進行修改、刪除等操作！ organ.name.duplicate=名字為[{0}]的組織已存在 organ.website.duplicate=域名為[{0}]的組織已存在 organ.data_code.not_exists=組織未配置資料源標識 organ.already_exists=該新增組織已授權機台數量無需重複新增！ organ.user_oper.not_allow=不允許操作用戶自身組織 organ.contact_mobile.duplicate=手機號為[{0}]的組織已存在 organ.expiretime.product_id_lack=請選擇要購買的產品 notify.template.not.exists=站內信模版不存在 notify.template.code.duplicate=已經存在編碼為[{}]的站內信模板 notify.send.template.param.miss=站內信模板參數({})缺失 machine.not.exists=機台不存在 machine.template.not.exists=機台模板不存在 default.template.count=預設模板數量異常 the.current.machine.is.already.in.use=當前機台已使用，禁止刪除 machine.error=當前機台錯誤，請重新選擇機台 the.current.brand.of.the.machine.exists=當前機台配置的模板中，該品牌已存在，請重新輸入品牌名稱 the.model.of.the.machine.does.not.exist=該型號的機台模板不存在，請進行配置 the.current.brand=品牌ID錯誤，或品牌不存在 machine.num.error=當前組織該類型的機台創建已達到最大值，無法繼續創建 machine.name.error=當前機台名稱已存在，請重新輸入機台名稱 machinetemplate.name.error=當前機台模板的名稱已存在，請重新輸入機台模板名稱 labelingmachine.related.data.error=當前機台關聯的貼標機數據有誤，請在高級配置中重新配置貼標機或選擇其他模板 drillmachine.related.data.error=當前機台關聯的鑽孔機數據有誤，請在鑽孔模塊中重新配置鑽孔機或選擇其他模板 machine.data.error=當前組織尚未進行機台授權，請聯繫組織管理員或客服進行授權 machine.num.data.error=組織授權的機台數量不能超過127台 machine.used.already=當前機台在加工方案組中已使用，無法刪除 label.template.not.exists=標籤模板不存在 label.not.exists=標籤不存在 default.label.not.exists=該類型標籤的預設模板不存在 machine.use.label=當前標籤已有機台使用，無法刪除 default.not.deleted=預設標籤模板無法刪除 label.is.use.error=當前標籤在打包設定中已有使用者使用，無法刪除 data.source.not.exists=系統資料來源不存在 order.parts.import.list.is.empty=生產配件匯入資料不可為空 remain.plate.status.used=餘料板正在使用中，禁止修改 remain.plate.status.no.used=餘料板未使用 remain.plate.usr.type=餘料板使用類型為不可核銷類型 remain.plate.id.not.exists=未選中餘料板，請選擇餘料板 remain.plate.count.max=每次新增餘料板數量最大為 999 currently.no.configuration.available=當前沒有{0}配置信息，請前往設定配置 system.config.not_exists=系統配置不存在 system.config.type_not_support=不支援的系統配置類型 system.config.custom_plate_no.rule_save_format_error=自訂板編號配置：自訂板編號保存格式錯誤，請檢查配置規則 system.config.custom_plate_no.rule_reset_not_support=自訂板編號配置：該規則不支援手動復位／清零 system.config.custom_plate_no.rule_item_not_found=自訂板編號配置：找不到對應的規則項進行手動復位／清零 system.config.custom_plate_no.rule_order_reset_failed=自訂板編號配置：手動復位／清零生產單下序號失敗，請聯繫客服 custom.plate_no.rule.code_empty=規則編碼不能為空 custom.plate_no.rule.code_not_match=規則編碼[{0}]不合法，請檢查配置規則 custom.plate_no.rule.date_format_error=時間格式[{0}]不合法，請檢查配置規則 custom.plate_no.rule.custom_value_empty=自訂字元值不能為空，請檢查配置規則 custom.plate_no.rule.reset_mode_error=規則[{0}]復位／清零模式不合法，請檢查配置規則 custom.plate_no.rule.int_type_empty={0} 下的 {1} 不能為空，請檢查配置規則 custom.plate_no.rule.int_type_convert_error={0} 下的數值類型參數 {1}:{2} 轉換異常，請檢查配置規則 custom.plate_no.rule.bool_type_convert_error={0} 下的布林類型參數 {1}:{2} 轉換異常，請檢查配置規則 process.scheme.data_empty=加工方案組的：{0} 為空，無法保存，請進行配置 process.scheme.config.data_empty=加工方案組的：{0} 為空，請檢查配置信息 process.scheme.config.field_error=當前方案組的配置異常，請重新配置 process.scheme.config.in_use=當前方案組已在排單中使用，無法刪除 process.scheme.config.machine_label_empty=當前方案組對應解析器的機台標籤數據為空，請檢查機台標籤配置信息 config.data_error=當前系統配置的數據有誤，請重新嘗試排序 process.config.used_already=當前加工分線配置已在加工方案組中使用，無法刪除 optimization.config.used_already=當前數據處理配置已在加工方案組中使用，無法刪除 sealedge.config.item_empty=第 {0} 條配置中，有欄位值為空，請新增數據 sealedge.config.max_value_error=第 {0} 條配置中，{1} 要大於等於 {2}，請修改數據 sealedge.config.data_error=當前封邊條配置有誤，請重新檢查後新增 sealedge.config.name_exists=當前配置的名稱已存在，請重新命名 sealedge.config.decimal_places_max_three=第 {0} 條配置中，小數位數最多為 3 位，請修改 sealedge.config.min_value_gt_zero=第 {0} 條配置中，寬最小值：{1} 要大於 0，請修改 sealedge.config.max_value_gt_zero=第 {0} 條配置中，寬最大值：{1} 要大於 0，請修改 sealedge.config.value_range_error=第 {0} 條配置中，寬最大值 要大於 寬最小值，請修改 token.app_type.exist=當前應用已存在token配置，無法繼續新增 token.config.not_exists=當前應用的token配置不存在 token.time.is_expires=當前token已過期，請重新配置或延長時間 token.app_type.no_update=應用名稱不允許更改 token.data.is_null=當前token的配置為空，無需刪除 token.expires_time.is_null=當前未選擇有效時間，請選擇後再新增 token.expires_time.data_error=當前選擇的有效時間已過期，請增加有效時間 token.insert.data_error=token新增失敗，請重新嘗試 invoice.no_exist=當前發票記錄有誤，請重新查看 invoicing.reject_reason=請填寫拒絕開票原因 purchase_record.no_exist=當前發票對應的購買記錄有誤，請退回組織後重新申請開票 invoice.is_fail=當前發票已開票，無法再次進行開票 products.is_exist=產品[{0}]已存在，請修改產品名稱後再次操作 products.no_delete=當前產品已上架，無法刪除，請下架後再刪除 products.no_update=當前產品已上架，無法進行修改 products.detail.no_update=定價規則對應的產品已上架，無法進行修改 advertisement.time_error=投放時間錯誤，結束時間應大於開始時間 advertisement.name.is_exist=當前廣告名稱已存在，請重新命名 advertisement.no_delete=當前廣告已經發布，無法刪除，請結束發布後再刪除 product_promotion.active.name.is_exist=當前優惠活動名稱已存在，請修改 product_promotion.purchaseduration.is_exist=當前所選產品下{0}{1}購買時長的優惠活動已存在，請修改 invoice_title.not_exists=發票抬頭不存在，請先創建發票抬頭 org_invoice.purchase_record.update_num.not_match=當前勾選的購買記錄中部分可能已開票，請查詢後重新勾選提交開票 org_invoice.agree_file.null=確認開票發票附件不能為空，請上傳後再提交 invoice_title.org.exists=組織下已存在發票抬頭，請刷新後編輯抬頭內容 invoice_title.taxpayerid.exists=統一社會信用代碼已存在，請檢查 products.not_nolist=當前產品未上架 org_product.purchase.lock=組織下存在購買中的產品操作，請稍後再試 invoice_title.enterprise.taxnumber.empty=企業統一信用代碼不能為空 invoice.amount.zero=可開票金額為0，請檢查購買記錄 invoice.apply.uninvoiceable.exist=當前提交記錄中存在不可開票記錄，請刷新列表後重新選擇提交 pay.channel_not_support=暫不支援的支付渠道，請使用其他支付渠道 pay.order_not_exist=支付訂單不存在，支付編號[{0}]，請重新發起支付 pay.order_channel_query_not_exist=若您已確認掃碼支付，請稍後重新整理頁面，支付平台可能存在延遲入帳 pay.order_notify_data_parse_error=解析支付回調資料異常 pay.order_status_is_not_waiting=支付訂單不處於待支付狀態 pay.order_submit_channel_error=發起渠道支付異常，請聯繫客服 pay.notify_passback_tradetype_not_support_error=不支援的支付回調tradeType:[{0}]，請檢查支付渠道 product.no_exist=當前產品不存在 product.detail_no_exist=當前產品的規則不存在 product.detail_duration_exist=當前產品下已存在產品時長[{0}/{1}]的定價規則，請修改後重新操作 product.promotion_no_exist=當前優惠活動不存在 product.detail_duration_unit_not_support=不支援的時長單位，請檢查該定價規則的時長單位 org.product_purchase_wait_pay_error=組織下存在當前產品的待支付紀錄，請確認或取消支付後再次發起軟體購買 product.price_null_error=產品建議價格為空，請聯繫客服 org.product_purchase_not_exist_error=組織訂購紀錄不存在，請檢查資料 org.product_purchase_exist_error=組織[{0}]訂購紀錄已存在，請勿重複定義訂購機構 advertisement.no_exist=廣告不存在 advertisement.status_endtime_expired=當前廣告投放結束時間已逾期，請重新發布選擇投放時間或重新編輯投放時間 advertisement.image_empty_error=廣告圖片檔案為空，請重新上傳 advertisement.image_upload_fail=廣告圖片上傳失敗，請稍後再試 advertisement.update_status_error=當前廣告已經發布，若要編輯請先結束發布 parser.no_exist=當前解析器不存在，請重新選擇 parser.template_no_exist=當前解析器模板不存在，請重新選擇 product_purchase.no_exist=當前購買記錄不存在，請檢查 product_purchase.endtime_before_delaytime_error=當前產品訂購有效期{0}未超過當前日期，請調整訂購時長 product.delay_duration_unit_not_support=不支持的產品延期時長單位 assembly.config.import.order_components.query.error=裝配設定導入失敗：訂單部件査詢失敗，請檢查生產單狀態 assembly.config.not_exist=裝配設定不存在 assembly.config.do_config_exist=裝配設定不存在 assembly.config.cover_target_not_exist=覆蓋目標裝備設定不存在，請重新查詢後再次操作 assembly.config.new_config_name_exist=新裝配設定名稱[{0}]已存在，請重新查詢後再次操作 assembly.config.remove_not_exist=删除裝配設定不存在，請重新查詢後再次操作 \ No newline at end of file +global.error.request.param.missing=請求參數缺失：{0} global.error.bad.request=請求參數不正確：{0} global.error.request.param.type.error=請求參數類型錯誤：{0} global.error.request.not.found=請求未找到：{0} global.error.request.method.error=請求方法不正確：{0} global.error.request.too.many=請求過於頻繁，請稍後重試 global.error.request.duplicate.data.error=請求數據已存在，請檢查 global.error.default.error=系統繁忙，請稍後再試 global.error.no.permission=您沒有該操作的權限 global.error.no.permission.to.visit.org=您無權訪問該組織的數據 global.error.request.organId.notExist=請求的組織標識未傳遞，請進行排查 global.org.product.not.exist=帳號登入異常，套餐資訊不存在，請重新登入 global.org.product.expired=組織產品套餐已過期，請續費後繼續使用 global.not.login=賬號未登錄 auth.login.bad_credentials=登入失敗，帳號或密碼不正確 auth.login.user_disabled=登入失敗，帳號已被停用 auth.login.captcha_code_error=驗證碼不正確，原因：{0} auth.login.third_not_bind=尚未綁定帳號，需要進行綁定 auth.mobile.not_exists=手機號碼不存在 auth.mobile.no_change=手機號碼未發生變更，無需修改 auth.manage_endpoint.login_permission_error=登入失敗，管理端帳號不存在 menu.name.duplicate=已存在相同名稱的選單 menu.parent.not_exists=父選單不存在 menu.parent.error=不能將自身設定為父選單 menu.not_exists=選單不存在 menu.exists_children=存在子選單，無法刪除 menu.parent.not_dir_or_menu=父選單的類型必須是目錄或選單 menu.operation_permission_error=管理端選單操作權限不足 menu.trans_error=選單翻譯異常，error_code：{0} role.not_exists=角色不存在 role.name.duplicate=已存在名稱為[{0}]的角色 role.code.duplicate=已存在編碼為[{0}]的角色 role.can_not_update_system_type=不能操作系統內建的角色 role.is_disable=名稱為[{0}]的角色已被停用 role.admin_code_error=編碼[{0}]不能使用 role.me_error=不可為自身分配角色 role.not_superadmin_no_organ_id_oper_error=非超級管理員不可分配權限 role.buildin.modify_permission_error=修改內建角色下選單權限的權限不足 role.self.modify_permission_error=無法修改自身角色的選單權限 role.self.modify_error=無法修改自身的角色 user.username.exists=手機號已經存在 user.mobile.exists=手機號已經存在 user.email.exists=郵箱已經存在 user.not_exists=用戶不存在 user.import.empty=導入用戶數據不能為空！ user.password.failed=用戶密碼校驗失敗 user.is_disable=名字為[{0}]的用戶已被禁用 user.count.max=超過組織用戶配額({0})，創建用戶失敗！ user.me.error=不允許操作用戶自身 user.password.length_at_least_8=密碼長度不少於8位，且包含大小寫字母、數字和特殊字符 user.username.multiple_error=存在[{0}]重複用戶，請聯繫系統管理員 user.operate_self_status_error=不允許操作用戶自身狀態 user.mobile_update_not_allow=該用戶已通過手機號認證，如需修改手機號請前往個人中心 dept.name.duplicate=已經存在該名字的部門 dept.parent.not_exists=父級部門不存在 dept.not_found=當前部門不存在 dept.exists_children=存在子部門，無法刪除 dept.parent.error=不能設置自己為父部門 dept.exists_user=部門中存在員工，無法刪除 dept.parent_is_child=不能設置自己的子部門為父部門 dept.user_oper_not_allow=不允許操作用戶自身部門 dept.parent_user_oper_not_allow=不允許操作用戶自身部門及其上級部門 dept.disable=部門({0})已被禁用 dept.not_allowed_login=部門({0})已被禁用，無法登入 dept.parent_disable=上級部門({0})已被禁用，請開啟後操作或選擇其他上級部門 dict_type.not_exists=當前字典類型不存在 dict_type.not_enable=字典類型處於關閉狀態，不允許新增或編輯 dict_type.name.duplicate=已經存在該名字的字典類型 dict_type.type.duplicate=已經存在該類型的字典類型 dict_type.has_children=無法刪除，該字典類型還有字典數據 dict_data.not_exists=當前字典數據不存在 dict_data.not_enable=字典數據({0})不處於開啟狀態，不允許選擇 dict_data.value.duplicate=已經存在該值的字典數據 dict_data.trans_error=字典數據標籤翻譯異常，error_code :{0} notice.not_found=當前通知公告不存在 notice.name_unique_error=公告標題已存在，請編輯後重試 notice.buildin.modify_permission_error=內置通知公告編輯權限不足 sms.channel.not_exists=短信渠道不存在 sms.template.not_exists=短信模板不存在 sms.template.code.duplicate=已經存在編碼為[{0}]的短信模板 sms.template.api_error=短信 API 模板調用失敗，原因是：{0} sms.template.api.audit_checking=短信 API 模版無法使用，原因：審批中 sms.template.api.audit_fail=短信 API 模版無法使用，原因：審批不通過，{0} sms.template.api.not_found=短信 API 模版無法使用，原因：模版不存在 sms.send.mobile.not_exists=手機號碼不存在 sms.send.mobile.template_param_miss=短信模板參數({0})缺失 sms.send.template.not_exists=短信模板不存在 sms.code.not_found=驗證碼不存在，請點擊獲取 sms.code.not_correct=驗證碼不正確 sms.code.send_too_fast=短信發送過於頻繁 sms.code.is_valid=驗證碼在有效期內，5 分鐘內請勿重複發送！ organ.not_exists=組織不存在 organ.disable=[{0}]組織已被禁用 organ.expire=[{0}]組織已過期 organ.can_not_update_system=系統組織不能進行修改、刪除等操作！ organ.name.duplicate=名字為[{0}]的組織已存在 organ.website.duplicate=域名為[{0}]的組織已存在 organ.data_code.not_exists=組織未配置資料源標識 organ.already_exists=該新增組織已授權機台數量無需重複新增！ organ.user_oper.not_allow=不允許操作用戶自身組織 organ.contact_mobile.duplicate=手機號為[{0}]的組織已存在 organ.expiretime.product_id_lack=請選擇要購買的產品 notify.template.not.exists=站內信模版不存在 notify.template.code.duplicate=已經存在編碼為[{}]的站內信模板 notify.send.template.param.miss=站內信模板參數({})缺失 machine.not.exists=機台不存在 machine.template.not.exists=機台模板不存在 default.template.count=預設模板數量異常 the.current.machine.is.already.in.use=當前機台已使用，禁止刪除 machine.error=當前機台錯誤，請重新選擇機台 the.current.brand.of.the.machine.exists=當前機台配置的模板中，該品牌已存在，請重新輸入品牌名稱 the.model.of.the.machine.does.not.exist=該型號的機台模板不存在，請進行配置 the.current.brand=品牌ID錯誤，或品牌不存在 machine.num.error=當前組織該類型的機台創建已達到最大值，無法繼續創建 machine.name.error=當前機台名稱已存在，請重新輸入機台名稱 machinetemplate.name.error=當前機台模板的名稱已存在，請重新輸入機台模板名稱 labelingmachine.related.data.error=當前機台關聯的貼標機數據有誤，請在高級配置中重新配置貼標機或選擇其他模板 drillmachine.related.data.error=當前機台關聯的鑽孔機數據有誤，請在鑽孔模塊中重新配置鑽孔機或選擇其他模板 machine.data.error=當前組織尚未進行機台授權，請聯繫組織管理員或客服進行授權 machine.num.data.error=組織授權的機台數量不能超過127台 machine.used.already=當前機台在加工方案組中已使用，無法刪除 label.template.not.exists=標籤模板不存在 label.not.exists=標籤不存在 default.label.not.exists=該類型標籤的預設模板不存在 machine.use.label=當前標籤已有機台使用，無法刪除 default.not.deleted=預設標籤模板無法刪除 label.is.use.error=當前標籤在打包設定中已有使用者使用，無法刪除 data.source.not.exists=系統資料來源不存在 order.parts.import.list.is.empty=生產配件匯入資料不可為空 remain.plate.status.used=餘料板正在使用中，禁止修改 remain.plate.status.no.used=餘料板未使用 remain.plate.usr.type=餘料板使用類型為不可核銷類型 remain.plate.id.not.exists=未選中餘料板，請選擇餘料板 remain.plate.count.max=每次新增餘料板數量最大為 999 currently.no.configuration.available=當前沒有{0}配置信息，請前往設定配置 system.config.not_exists=系統配置不存在 system.config.type_not_support=不支援的系統配置類型 system.config.custom_plate_no.rule_save_format_error=自訂板編號配置：自訂板編號保存格式錯誤，請檢查配置規則 system.config.custom_plate_no.rule_reset_not_support=自訂板編號配置：該規則不支援手動復位／清零 system.config.custom_plate_no.rule_item_not_found=自訂板編號配置：找不到對應的規則項進行手動復位／清零 system.config.custom_plate_no.rule_order_reset_failed=自訂板編號配置：手動復位／清零訂單下序號失敗，請聯繫客服 custom.plate_no.rule.code_empty=規則編碼不能為空 custom.plate_no.rule.code_not_match=規則編碼[{0}]不合法，請檢查配置規則 custom.plate_no.rule.date_format_error=時間格式[{0}]不合法，請檢查配置規則 custom.plate_no.rule.custom_value_empty=自訂字元值不能為空，請檢查配置規則 custom.plate_no.rule.reset_mode_error=規則[{0}]復位／清零模式不合法，請檢查配置規則 custom.plate_no.rule.int_type_empty={0} 下的 {1} 不能為空，請檢查配置規則 custom.plate_no.rule.int_type_convert_error={0} 下的數值類型參數 {1}:{2} 轉換異常，請檢查配置規則 custom.plate_no.rule.bool_type_convert_error={0} 下的布林類型參數 {1}:{2} 轉換異常，請檢查配置規則 process.scheme.data_empty=加工方案組的：{0} 為空，無法保存，請進行配置 process.scheme.config.data_empty=加工方案組的：{0} 為空，請檢查配置信息 process.scheme.config.field_error=當前方案組的配置異常，請重新配置 process.scheme.config.in_use=當前方案組已在排單中使用，無法刪除 process.scheme.config.machine_label_empty=當前方案組對應解析器的機台標籤數據為空，請檢查機台標籤配置信息 config.data_error=當前系統配置的數據有誤，請重新嘗試排序 process.config.used_already=當前加工分線配置已在加工方案組中使用，無法刪除 optimization.config.used_already=當前數據處理配置已在加工方案組中使用，無法刪除 sealedge.config.item_empty=第 {0} 條配置中，有欄位值為空，請新增數據 sealedge.config.max_value_error=第 {0} 條配置中，{1} 要大於等於 {2}，請修改數據 sealedge.config.data_error=當前封邊條配置有誤，請重新檢查後新增 sealedge.config.name_exists=當前配置的名稱已存在，請重新命名 sealedge.config.decimal_places_max_three=第 {0} 條配置中，小數位數最多為 3 位，請修改 sealedge.config.min_value_gt_zero=第 {0} 條配置中，寬最小值：{1} 要大於 0，請修改 sealedge.config.max_value_gt_zero=第 {0} 條配置中，寬最大值：{1} 要大於 0，請修改 sealedge.config.value_range_error=第 {0} 條配置中，寬最大值 要大於 寬最小值，請修改 token.app_type.exist=當前應用已存在token配置，無法繼續新增 token.config.not_exists=當前應用的token配置不存在 token.time.is_expires=當前token已過期，請重新配置或延長時間 token.app_type.no_update=應用名稱不允許更改 token.data.is_null=當前token的配置為空，無需刪除 token.expires_time.is_null=當前未選擇有效時間，請選擇後再新增 token.expires_time.data_error=當前選擇的有效時間已過期，請增加有效時間 token.insert.data_error=token新增失敗，請重新嘗試 invoice.no_exist=當前發票記錄有誤，請重新查看 invoicing.reject_reason=請填寫拒絕開票原因 purchase_record.no_exist=當前發票對應的購買記錄有誤，請退回組織後重新申請開票 invoice.is_fail=當前發票已開票，無法再次進行開票 products.is_exist=產品[{0}]已存在，請修改產品名稱後再次操作 products.no_delete=當前產品已上架，無法刪除，請下架後再刪除 products.no_update=當前產品已上架，無法進行修改 products.detail.no_update=定價規則對應的產品已上架，無法進行修改 advertisement.time_error=投放時間錯誤，結束時間應大於開始時間 advertisement.name.is_exist=當前廣告名稱已存在，請重新命名 advertisement.no_delete=當前廣告已經發布，無法刪除，請結束發布後再刪除 product_promotion.active.name.is_exist=當前優惠活動名稱已存在，請修改 product_promotion.purchaseduration.is_exist=當前所選產品下{0}{1}購買時長的優惠活動已存在，請修改 invoice_title.not_exists=發票抬頭不存在，請先創建發票抬頭 org_invoice.purchase_record.update_num.not_match=當前勾選的購買記錄中部分可能已開票，請查詢後重新勾選提交開票 org_invoice.agree_file.null=確認開票發票附件不能為空，請上傳後再提交 invoice_title.org.exists=組織下已存在發票抬頭，請刷新後編輯抬頭內容 invoice_title.taxpayerid.exists=統一社會信用代碼已存在，請檢查 products.not_nolist=當前產品未上架 org_product.purchase.lock=組織下存在購買中的產品操作，請稍後再試 invoice_title.enterprise.taxnumber.empty=企業統一信用代碼不能為空 invoice.amount.zero=可開票金額為0，請檢查購買記錄 invoice.apply.uninvoiceable.exist=當前提交記錄中存在不可開票記錄，請刷新列表後重新選擇提交 pay.channel_not_support=暫不支援的支付渠道，請使用其他支付渠道 pay.order_not_exist=支付訂單不存在，支付編號[{0}]，請重新發起支付 pay.order_channel_query_not_exist=若您已確認掃碼支付，請稍後重新整理頁面，支付平台可能存在延遲入帳 pay.order_notify_data_parse_error=解析支付回調資料異常 pay.order_status_is_not_waiting=支付訂單不處於待支付狀態 pay.order_submit_channel_error=發起渠道支付異常，請聯繫客服 pay.notify_passback_tradetype_not_support_error=不支援的支付回調tradeType:[{0}]，請檢查支付渠道 product.no_exist=當前產品不存在 product.detail_no_exist=當前產品的規則不存在 product.detail_duration_exist=當前產品下已存在產品時長[{0}/{1}]的定價規則，請修改後重新操作 product.promotion_no_exist=當前優惠活動不存在 product.detail_duration_unit_not_support=不支援的時長單位，請檢查該定價規則的時長單位 org.product_purchase_wait_pay_error=組織下存在當前產品的待支付紀錄，請確認或取消支付後再次發起軟體購買 product.price_null_error=產品建議價格為空，請聯繫客服 org.product_purchase_not_exist_error=組織訂購紀錄不存在，請檢查資料 org.product_purchase_exist_error=組織[{0}]訂購紀錄已存在，請勿重複定義訂購機構 advertisement.no_exist=廣告不存在 advertisement.status_endtime_expired=當前廣告投放結束時間已逾期，請重新發布選擇投放時間或重新編輯投放時間 advertisement.image_empty_error=廣告圖片檔案為空，請重新上傳 advertisement.image_upload_fail=廣告圖片上傳失敗，請稍後再試 advertisement.update_status_error=當前廣告已經發布，若要編輯請先結束發布 parser.no_exist=當前解析器不存在，請重新選擇 parser.template_no_exist=當前解析器模板不存在，請重新選擇 product_purchase.no_exist=當前購買記錄不存在，請檢查 product_purchase.endtime_before_delaytime_error=當前產品訂購有效期{0}未超過當前日期，請調整訂購時長 product.delay_duration_unit_not_support=不支持的產品延期時長單位 assembly.config.import.order_components.query.error=裝配設定導入失敗：訂單部件査詢失敗，請檢查訂單狀態 assembly.config.not_exist=裝配設定不存在 assembly.config.do_config_exist=裝配設定不存在 assembly.config.cover_target_not_exist=覆蓋目標裝備設定不存在，請重新查詢後再次操作 assembly.config.new_config_name_exist=新裝配設定名稱[{0}]已存在，請重新查詢後再次操作 assembly.config.remove_not_exist=删除裝配設定不存在，請重新查詢後再次操作 \ No newline at end of file