From 31f9b2e3e6a1cffb83c838f1db1d6251b708f983 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 19 十月 2026 13:11:01 +0800
Subject: [PATCH] fix(mes): 电力作业计划生成工单兼容编码规则缺失
---
sql/mes_pro_work_order_code_rule_init.sql | 52 ++++++++++++++++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java | 19 ++++++++-
2 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/sql/mes_pro_work_order_code_rule_init.sql b/sql/mes_pro_work_order_code_rule_init.sql
new file mode 100644
index 0000000..1a39a9e
--- /dev/null
+++ b/sql/mes_pro_work_order_code_rule_init.sql
@@ -0,0 +1,52 @@
+-- ============================================================
+-- 鐢熶骇宸ュ崟缂栫爜瑙勫垯锛圥RO_WORK_ORDER_CODE锛夊垵濮嬪寲
+--
+-- 鑳屾櫙锛�
+-- 鐢靛姏浣滀笟璁″垝鈥滅敓鎴愬伐鍗曗�濅緷璧栫紪鐮佽鍒� PRO_WORK_ORDER_CODE锛�
+-- 鑻ュ簱涓己灏戣瑙勫垯锛屼細鎶涘嚭鈥滅紪鐮佽鍒欎笉瀛樺湪鈥濄��
+--
+-- 璇存槑锛�
+-- 1. 鑴氭湰鍙噸澶嶆墽琛岋紙宸插瓨鍦ㄥ垯璺宠繃锛夈��
+-- 2. 鐢熸垚鐨勭紪鐮佹牸寮忥細WO_yyyyMMdd + 3 浣嶆祦姘村彿锛屼緥濡� WO_20261019001銆�
+-- 3. 鍒嗘绫诲瀷锛�2=褰撳墠鏃ユ湡锛�3=鍥哄畾瀛楃锛�4=娴佹按鍙凤紱
+-- 寰幆鏂瑰紡锛�3=鎸夊ぉ锛涜ˉ榻愭柟寮忥細1=宸﹁ˉ榻愩��
+-- ============================================================
+
+-- 1. 缂栫爜瑙勫垯涓昏〃
+INSERT INTO mes_md_auto_code_rule
+ (code, name, description, max_length, padded, padded_char, padded_method, status, remark, creator, updater, create_time, update_time, deleted)
+SELECT 'PRO_WORK_ORDER_CODE', '鐢熶骇宸ュ崟缂栫爜', '鐢熶骇宸ュ崟鑷姩缂栫爜', 15, b'1', '0', 1, 0, NULL, '1', '1', NOW(), NOW(), b'0'
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM mes_md_auto_code_rule WHERE code = 'PRO_WORK_ORDER_CODE' AND deleted = b'0'
+);
+
+-- 2. 瑙勫垯鍒嗘锛氬浐瀹氬墠缂� WO_
+INSERT INTO mes_md_auto_code_part
+ (rule_id, sort, type, length, date_format, fix_character, serial_start_no, serial_step, cycle_flag, cycle_method, remark, creator, updater, create_time, update_time, deleted)
+SELECT r.id, 1, 3, 3, NULL, 'WO_', NULL, NULL, NULL, NULL, '鍥哄畾鍓嶇紑', '1', '1', NOW(), NOW(), b'0'
+FROM mes_md_auto_code_rule r
+WHERE r.code = 'PRO_WORK_ORDER_CODE' AND r.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM mes_md_auto_code_part p WHERE p.rule_id = r.id AND p.sort = 1 AND p.deleted = b'0'
+ );
+
+-- 3. 瑙勫垯鍒嗘锛氭棩鏈� yyyyMMdd
+INSERT INTO mes_md_auto_code_part
+ (rule_id, sort, type, length, date_format, fix_character, serial_start_no, serial_step, cycle_flag, cycle_method, remark, creator, updater, create_time, update_time, deleted)
+SELECT r.id, 2, 2, 8, 'yyyyMMdd', NULL, NULL, NULL, NULL, NULL, '鏃ユ湡', '1', '1', NOW(), NOW(), b'0'
+FROM mes_md_auto_code_rule r
+WHERE r.code = 'PRO_WORK_ORDER_CODE' AND r.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM mes_md_auto_code_part p WHERE p.rule_id = r.id AND p.sort = 2 AND p.deleted = b'0'
+ );
+
+-- 4. 瑙勫垯鍒嗘锛氭祦姘村彿锛堟寜澶╁惊鐜紝浠� 1 寮�濮嬶紝姝ラ暱 1锛�
+INSERT INTO mes_md_auto_code_part
+ (rule_id, sort, type, length, date_format, fix_character, serial_start_no, serial_step, cycle_flag, cycle_method, remark, creator, updater, create_time, update_time, deleted)
+SELECT r.id, 3, 4, 3, NULL, NULL, 1, 1, b'1', 3, '娴佹按鍙�', '1', '1', NOW(), NOW(), b'0'
+FROM mes_md_auto_code_rule r
+WHERE r.code = 'PRO_WORK_ORDER_CODE' AND r.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM mes_md_auto_code_part p WHERE p.rule_id = r.id AND p.sort = 3 AND p.deleted = b'0'
+ );
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..700cd73 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());
@@ -345,6 +344,22 @@
+ String.format("%03d", (int) (Math.random() * 1000));
}
+ /**
+ * 鐢熸垚宸ュ崟缂栫爜
+ *
+ * 浼樺厛浣跨敤缂栫爜瑙勫垯锛涜嫢鐜涓湭閰嶇疆 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) {
MesProMaintenancePlanDO plan = planMapper.selectById(id);
if (plan == null) {
--
Gitblit v1.9.3