From 02a1ae81eba7b48223052fb833859f0a65dd7d21 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 19 十月 2026 17:31:08 +0800
Subject: [PATCH] feat(mes): 实现袋码大批量生成异步任务功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java | 151 +++++++++++++++++++++++++++++--------------------
1 files changed, 89 insertions(+), 62 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java
index 1990cd8..8180e42 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java
@@ -18,6 +18,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeReplaceRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeGenerateTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeReplaceDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
@@ -26,9 +27,11 @@
import cn.iocoder.yudao.module.mes.dal.mysql.pro.batch.MesProBatchMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.pallet.MesProPalletMapper;
import cn.iocoder.yudao.module.mes.dal.redis.MesCodeRedisDAO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeGenerateBizTypeEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBatchStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum;
+import cn.iocoder.yudao.module.mes.framework.bagcode.MesProBagCodeGenerateProperties;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletService;
import jakarta.annotation.Resource;
@@ -46,6 +49,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -92,8 +96,16 @@
@Resource
private cn.iocoder.yudao.module.mes.service.trace.integrity.MesTraceIntegrityService integrityService;
+ @Resource
+ private MesProBagCodeBatchGenerator batchGenerator;
+ @Resource
+ private MesProBagCodeGenerateCleaner generateCleaner;
+ @Resource
+ private MesProBagCodeGenerateTaskService generateTaskService;
+ @Resource
+ private MesProBagCodeGenerateProperties generateProperties;
+
@Override
- @Transactional(rollbackFor = Exception.class)
public MesProBagCodeGenerateRespVO generateBagCodes(MesProBagCodeGenerateReqVO generateReqVO) {
// 1. 鏍￠獙鍝佺骞惰鍙栦富璁￠噺鍗曚綅绫诲瀷
MesMdmItemDO item = mdmItemService.validateItemExists(generateReqVO.getItemId());
@@ -102,7 +114,7 @@
// 2. 鎸夌被鍨嬫崲绠楄鐮佹暟閲忥細N琚� = 姣忔墭 N 琚� 脳 鎵樼洏鏁帮紱鍚� = 鐩存帴杈撳叆琚嬬爜鏁帮紙鏃犳墭鐩橈級
boolean ton = UNIT_TYPE_TON.equals(type);
int perPallet = ton ? 0 : parseBagsPerPallet(type);
- int totalCount;
+ long totalCount;
int palletCount = 0;
if (ton) {
if (generateReqVO.getBagCount() == null || generateReqVO.getBagCount() <= 0) {
@@ -114,79 +126,94 @@
throw exception(PRO_BAG_CODE_PALLET_COUNT_REQUIRED);
}
palletCount = generateReqVO.getPalletCount();
- totalCount = perPallet * palletCount;
+ // 鐢� long 璁＄畻锛岄伩鍏嶅ぇ鎵樼洏鏁扮浉涔樻孩鍑� int
+ totalCount = (long) perPallet * palletCount;
}
+ assertGenerateCountAllowed(totalCount);
// 3. 鐢熸垚闃舵锛氳鐮佺洿鎺ョ粦瀹氬搧绉嶏紱鐢熶骇鎵规鍦ㄥ悗缁綍鍏�
- String uuid = IdUtil.fastSimpleUUID();
- List<MesProPalletDO> pallets = new ArrayList<>(palletCount);
- if (!ton) {
- for (int i = 0; i < palletCount; i++) {
- pallets.add(new MesProPalletDO()
- .setTempCode(codeRedisDao.generate())
- .setBusinessCode(codeRedisDao.generate())
- .setBagCount(perPallet)
- .setAutoGenerated(true)
- .setItemId(item.getId())
- .setStatus(MesProPalletStatusEnum.IN_USE.getStatus()));
- }
- palletMapper.insertBatch(pallets);
+ MesProBagCodeGenerateSpec spec = new MesProBagCodeGenerateSpec(
+ MesProBagCodeGenerateBizTypeEnum.PACKAGE, IdUtil.fastSimpleUUID(),
+ item.getId(), item.getCode(), item.getName(), type,
+ perPallet, palletCount, (int) totalCount, generateReqVO.getRemark());
+
+ // 4. 灏忔壒閲忓悓姝ュ畬鎴愶紝澶ф壒閲忚浆鍚庡彴浠诲姟
+ if (totalCount <= generateProperties.getSyncThreshold()) {
+ MesProBagCodeBatchGenerator.GenerateResult result = runSyncGenerate(spec);
+ return new MesProBagCodeGenerateRespVO()
+ .setUuid(spec.uuid())
+ .setType(type)
+ .setPerPallet(perPallet)
+ .setTotalCount(result.finishedCount())
+ .setPalletCount(result.palletIds().size())
+ .setPalletIds(result.palletIds())
+ .setAsync(false);
}
- // 琚嬪簭鍙峰師瀛愬垎閰嶏細鍏堝彇搴撳唴鏈�澶у簭鍙蜂綔鍩哄噯锛屽啀鐢� Redis 鍘熷瓙鑷锛岄伩鍏嶅苟鍙戠敓鎴愪骇鐢熼噸澶嶈搴忓彿
- int startNo = codeRedisDao.allocateBagNoStart(totalCount, bagCodeMapper.selectMaxBagNo());
- List<MesProBagCodeDO> bagCodes = new ArrayList<>(totalCount);
- for (int i = 0; i < totalCount; i++) {
- int bagNo = startNo + i;
- MesProPalletDO pallet = ton ? null : pallets.get(i / perPallet);
- bagCodes.add(new MesProBagCodeDO()
- .setUuid(uuid)
- .setCode(codeRedisDao.generate())
- .setBusinessCode(codeRedisDao.generate())
- .setBagNo(bagNo)
- .setItemId(item.getId())
- .setItemCode(item.getCode())
- .setItemName(item.getName())
- .setPalletId(pallet == null ? null : pallet.getId())
- .setPalletCode(pallet == null ? null : pallet.getTempCode())
- .setStatus(MesProBagCodeStatusEnum.GENERATED.getStatus())
- .setRemark(generateReqVO.getRemark()));
- }
- bagCodeMapper.insertBatch(bagCodes);
+ MesProBagCodeGenerateTaskDO task = generateTaskService.submit(spec, generateReqVO.getRequestId());
return new MesProBagCodeGenerateRespVO()
- .setUuid(uuid)
- .setType(type)
- .setPerPallet(perPallet)
- .setTotalCount(totalCount)
- .setPalletIds(pallets.stream().map(MesProPalletDO::getId).toList());
+ .setUuid(task.getUuid())
+ .setType(task.getUnitType())
+ .setPerPallet(task.getPerPallet())
+ .setTotalCount(task.getTotalCount())
+ .setPalletCount(task.getPalletCount())
+ .setAsync(true)
+ .setTaskId(task.getId());
}
@Override
- @Transactional(rollbackFor = Exception.class)
public MesProBagCodeGenerateRespVO generateRawBagCodes(MesProBagCodeRawGenerateReqVO generateReqVO) {
// 鍘熷琚嬬爜涓嶄緷璧栬閲忓崟浣嶇被鍨嬩笌鎵樼洏锛氫粎鎸夋暟閲忕敓鎴愶紝琚嬬爜甯﹀搧绉嶅啑浣欙紝鍚庣画鍙甯稿綍鍏ユ壒娆�/缁戝畾鎵樼洏
MesMdmItemDO item = mdmItemService.validateItemExists(generateReqVO.getItemId());
- String uuid = IdUtil.fastSimpleUUID();
- // 琚嬪簭鍙峰師瀛愬垎閰嶏細鍏堝彇搴撳唴鏈�澶у簭鍙蜂綔鍩哄噯锛屽啀鐢� Redis 鍘熷瓙鑷锛岄伩鍏嶅苟鍙戠敓鎴愪骇鐢熼噸澶嶈搴忓彿
- int startNo = codeRedisDao.allocateBagNoStart(generateReqVO.getCount(), bagCodeMapper.selectMaxBagNo());
- List<MesProBagCodeDO> bagCodes = new ArrayList<>(generateReqVO.getCount());
- for (int i = 0; i < generateReqVO.getCount(); i++) {
- int bagNo = startNo + i;
- bagCodes.add(new MesProBagCodeDO()
- .setUuid(uuid)
- .setCode(codeRedisDao.generate())
- .setBusinessCode(codeRedisDao.generate())
- .setBagNo(bagNo)
- .setItemId(item.getId())
- .setItemCode(item.getCode())
- .setItemName(item.getName())
- .setStatus(MesProBagCodeStatusEnum.GENERATED.getStatus())
- .setRemark(generateReqVO.getRemark()));
+ long totalCount = generateReqVO.getCount();
+ assertGenerateCountAllowed(totalCount);
+
+ MesProBagCodeGenerateSpec spec = new MesProBagCodeGenerateSpec(
+ MesProBagCodeGenerateBizTypeEnum.RAW, IdUtil.fastSimpleUUID(),
+ item.getId(), item.getCode(), item.getName(), null,
+ 0, 0, (int) totalCount, generateReqVO.getRemark());
+
+ if (totalCount <= generateProperties.getSyncThreshold()) {
+ MesProBagCodeBatchGenerator.GenerateResult result = runSyncGenerate(spec);
+ return new MesProBagCodeGenerateRespVO()
+ .setUuid(spec.uuid())
+ .setTotalCount(result.finishedCount())
+ .setPalletCount(0)
+ .setPalletIds(List.of())
+ .setAsync(false);
}
- bagCodeMapper.insertBatch(bagCodes);
+ MesProBagCodeGenerateTaskDO task = generateTaskService.submit(spec, generateReqVO.getRequestId());
return new MesProBagCodeGenerateRespVO()
- .setUuid(uuid)
- .setTotalCount(bagCodes.size())
- .setPalletIds(List.of());
+ .setUuid(task.getUuid())
+ .setTotalCount(task.getTotalCount())
+ .setPalletCount(task.getPalletCount())
+ .setAsync(true)
+ .setTaskId(task.getId());
+ }
+
+ /**
+ * 鍚屾鐢熸垚锛氬け璐ユ椂娓呯悊宸插啓鍏ョ殑鍒嗘锛岄伩鍏嶇暀涓嬩笉瀹屾暣鐨勬暟鎹寘
+ */
+ private MesProBagCodeBatchGenerator.GenerateResult runSyncGenerate(MesProBagCodeGenerateSpec spec) {
+ try {
+ return batchGenerator.generate(spec, null, new AtomicBoolean(false));
+ } catch (RuntimeException e) {
+ try {
+ generateCleaner.cleanup(spec.uuid());
+ } catch (Exception cleanupException) {
+ log.error("[runSyncGenerate][鐢熸垚缁� {} 鍗婃垚鍝佹竻鐞嗗け璐", spec.uuid(), cleanupException);
+ }
+ throw e;
+ }
+ }
+
+ /**
+ * 鏍￠獙鍗曟鐢熸垚琚嬬爜鏁伴噺涓嶈秴杩囦笂闄�
+ */
+ private void assertGenerateCountAllowed(long totalCount) {
+ int maxCount = generateProperties.getMaxTaskCount();
+ if (totalCount > maxCount) {
+ throw exception(PRO_BAG_CODE_GENERATE_COUNT_TOO_MANY, maxCount);
+ }
}
/**
--
Gitblit v1.9.3