From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植（与新高原有 em 模块重复）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
index 7887f2e..d0b58fb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
@@ -226,8 +226,7 @@
}
// 3. 缁勮宸ュ崟
MesProWorkOrderSaveReqVO workOrderReq = new MesProWorkOrderSaveReqVO();
- workOrderReq.setCode(autoCodeRecordService.generateAutoCode(
- MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode()));
+ workOrderReq.setCode(generateWorkOrderCode());
workOrderReq.setName(plan.getName());
workOrderReq.setType(convertPlanTypeToWorkOrderType(plan.getPlanType()));
workOrderReq.setOrderSourceType(MesProWorkOrderSourceTypeEnum.MAINTENANCE_PLAN.getType());
@@ -341,8 +340,30 @@
}
private String generatePlanCode() {
- return "MP" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmss")
- + String.format("%03d", (int) (Math.random() * 1000));
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_MAINTENANCE_PLAN_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("[generatePlanCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_MAINTENANCE_PLAN_CODE.getCode(), e);
+ return "MP" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
+ }
+
+ /**
+ * 鐢熸垚宸ュ崟缂栫爜
+ *
+ * 浼樺厛浣跨敤缂栫爜瑙勫垯锛涜嫢鐜涓湭閰嶇疆 PRO_WORK_ORDER_CODE 瑙勫垯锛屽垯闄嶇骇涓烘椂闂存埑缂栫爜锛岄伩鍏嶇敓鎴愬伐鍗曡闃绘柇
+ */
+ private String generateWorkOrderCode() {
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode(), e);
+ return "WO" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
}
private MesProMaintenancePlanDO validatePlanExists(Long id) {
--
Gitblit v1.9.3