From 3be684af887afe4c0e45f281cc53adfef6f12b78 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 20 七月 2026 09:48:44 +0800
Subject: [PATCH] feat(erp): 添加销售订单生产状态跟踪功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java
index 25cf9ae..13bd663 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRecordServiceImpl.java
@@ -32,6 +32,8 @@
@Validated
public class MesMdAutoCodeRecordServiceImpl implements MesMdAutoCodeRecordService {
+ private static final int GENERATE_MAX_RETRY_COUNT = 10;
+
@Resource
private MesMdAutoCodeRecordMapper recordMapper;
@@ -63,10 +65,34 @@
throw exception(AUTO_CODE_GENERATE_FAILED);
}
- // 2.1 鏋勫缓涓婁笅鏂�
- MesMdAutoCodeContext context = new MesMdAutoCodeContext()
- .setRule(rule).setParts(parts).setInputChar(inputChar);
- // 2.2 閬嶅巻鍒嗘锛岀敓鎴愮紪鐮�
+ // 2. 寰幆鐢熸垚缂栫爜锛岃烦杩囧洜 Redis 娴佹按鍙疯惤鍚庡鑷寸殑鍘嗗彶閲嶅缂栫爜
+ for (int i = 0; i < GENERATE_MAX_RETRY_COUNT; i++) {
+ // 2.1 鐢熸垚缂栫爜
+ MesMdAutoCodeContext context = new MesMdAutoCodeContext()
+ .setRule(rule).setParts(parts).setInputChar(inputChar);
+ String result = generateCode(rule, parts, context);
+ // 2.2 浜屾鏍￠獙锛堥槻姝㈤噸澶嶏級
+ MesMdAutoCodeRecordDO existRecord = recordMapper.selectByResult(result);
+ if (existRecord != null) {
+ continue;
+ }
+ // 2.3 淇濆瓨鐢熸垚璁板綍
+ MesMdAutoCodeRecordDO record = new MesMdAutoCodeRecordDO()
+ .setRuleId(rule.getId()).setResult(result)
+ .setSerialNo(context.getSerialNo()).setInputChar(inputChar);
+ recordMapper.insert(record);
+ return result;
+ }
+
+ // 3. 閲嶈瘯澶氭鍚庝粛鐒跺け璐ワ紝鎶涘嚭寮傚父
+ throw exception(AUTO_CODE_GENERATE_FAILED);
+ }
+
+ /**
+ * 鐢熸垚缂栫爜
+ */
+ private String generateCode(MesMdAutoCodeRuleDO rule, List<MesMdAutoCodePartDO> parts,
+ MesMdAutoCodeContext context) {
StringBuilder codeBuilder = new StringBuilder();
for (MesMdAutoCodePartDO part : parts) {
MesMdAutoCodePartStrategy strategy = strategyMap.get(part.getType());
@@ -78,22 +104,11 @@
// 鎷兼帴鍒嗘缂栫爜
codeBuilder.append(partCode);
}
- // 2.3 琛ラ綈澶勭悊
+ // 琛ラ綈澶勭悊
String result = codeBuilder.toString();
if (Boolean.TRUE.equals(rule.getPadded()) && rule.getMaxLength() != null) {
result = padCode(result, rule);
}
-
- // 3.1 浜屾鏍￠獙锛堥槻姝㈤噸澶嶏級
- MesMdAutoCodeRecordDO existRecord = recordMapper.selectByResult(result);
- if (existRecord != null) {
- throw exception(AUTO_CODE_GENERATE_FAILED);
- }
- // 3.2 淇濆瓨鐢熸垚璁板綍
- MesMdAutoCodeRecordDO record = new MesMdAutoCodeRecordDO()
- .setRuleId(rule.getId()).setResult(result)
- .setSerialNo(context.getSerialNo()).setInputChar(inputChar);
- recordMapper.insert(record);
return result;
}
--
Gitblit v1.9.3