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 | 237 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 159 insertions(+), 78 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 ddd169b..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;
@@ -83,26 +87,34 @@
*/
private static final String UNIT_TYPE_TON = "鍚�";
/**
- * 璁￠噺鍗曚綅绫诲瀷銆孨鍗冨厠銆嶏細姣忔墭鐩樿 N 涓鐮�
+ * 璁￠噺鍗曚綅绫诲瀷銆孨琚嬨�嶏細姣忔墭鐩樿 N 涓鐮�
*/
- private static final Pattern KG_TYPE_PATTERN = Pattern.compile("^(\\d{1,5})鍗冨厠$");
+ private static final Pattern BAG_TYPE_PATTERN = Pattern.compile("^(\\d{1,5})琚�$");
@Resource
private MesCodeRedisDAO codeRedisDao;
@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());
String type = getUnitType(item);
- // 2. 鎸夌被鍨嬫崲绠楄鐮佹暟閲忥細N鍗冨厠 = 姣忔墭 N 琚� 脳 鎵樼洏鏁帮紱鍚� = 鐩存帴杈撳叆琚嬬爜鏁帮紙鏃犳墭鐩橈級
+ // 2. 鎸夌被鍨嬫崲绠楄鐮佹暟閲忥細N琚� = 姣忔墭 N 琚� 脳 鎵樼洏鏁帮紱鍚� = 鐩存帴杈撳叆琚嬬爜鏁帮紙鏃犳墭鐩橈級
boolean ton = UNIT_TYPE_TON.equals(type);
- int perPallet = ton ? 0 : parseKgPerPallet(type);
- int totalCount;
+ int perPallet = ton ? 0 : parseBagsPerPallet(type);
+ long totalCount;
int palletCount = 0;
if (ton) {
if (generateReqVO.getBagCount() == null || generateReqVO.getBagCount() <= 0) {
@@ -114,83 +126,98 @@
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());
}
/**
- * 璇诲彇鍝佺涓昏閲忓崟浣嶇殑绫诲瀷锛�48鍗冨厠/100鍗冨厠/鍚級锛屾湭閰嶇疆鎴栨棤娉曡瘑鍒椂鎶ラ敊
+ * 鍚屾鐢熸垚锛氬け璐ユ椂娓呯悊宸插啓鍏ョ殑鍒嗘锛岄伩鍏嶇暀涓嬩笉瀹屾暣鐨勬暟鎹寘
+ */
+ 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);
+ }
+ }
+
+ /**
+ * 璇诲彇鍝佺涓昏閲忓崟浣嶇殑绫诲瀷锛�48琚�/100琚�/鍚級锛屾湭閰嶇疆鎴栨棤娉曡瘑鍒椂鎶ラ敊
*/
private String getUnitType(MesMdmItemDO item) {
String type = null;
@@ -203,17 +230,31 @@
if (type == null) {
throw exception(PRO_BAG_CODE_ITEM_TYPE_NOT_CONFIGURED);
}
- if (!UNIT_TYPE_TON.equals(type) && !KG_TYPE_PATTERN.matcher(type).matches()) {
+ if (!UNIT_TYPE_TON.equals(type) && !BAG_TYPE_PATTERN.matcher(type).matches()) {
throw exception(PRO_BAG_CODE_ITEM_TYPE_NOT_CONFIGURED);
}
return type;
}
+ @Override
+ public List<MesProBagCodeDO> getUnboundTonBags() {
+ Map<Long, Boolean> tonItems = new LinkedHashMap<>();
+ return bagCodeMapper.selectUnboundPalletlessList().stream()
+ .filter(bag -> tonItems.computeIfAbsent(bag.getItemId(), id -> {
+ MesMdmItemDO item = mdmItemService.getItem(id);
+ if (item == null || item.getUnitMeasureId() == null) return false;
+ CommonResult<MdmUnitMeasureRespDTO> result = unitMeasureApi.getUnitMeasure(item.getUnitMeasureId());
+ return result != null && result.isSuccess() && result.getData() != null
+ && UNIT_TYPE_TON.equals(StrUtil.trim(result.getData().getType()));
+ }))
+ .toList();
+ }
+
/**
- * 瑙ｆ瀽銆孨鍗冨厠銆嶇被鍨嬪緱鍑烘瘡鎵樼洏琚嬫暟
+ * 瑙ｆ瀽銆孨琚嬨�嶇被鍨嬪緱鍑烘瘡鎵樼洏琚嬫暟
*/
- private int parseKgPerPallet(String type) {
- Matcher matcher = KG_TYPE_PATTERN.matcher(type);
+ private int parseBagsPerPallet(String type) {
+ Matcher matcher = BAG_TYPE_PATTERN.matcher(type);
if (!matcher.matches()) {
throw exception(PRO_BAG_CODE_ITEM_TYPE_NOT_CONFIGURED);
}
@@ -223,7 +264,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void bindBatch(MesProBagCodeBindBatchReqVO bindReqVO) {
- MesProBatchDO batch = batchMapper.selectByIdForUpdate(bindReqVO.getBatchId());
+ doBindBatch(bindReqVO.getBatchId(), bindReqVO.getIds());
+ }
+
+ /**
+ * 灏嗚鐮佸綍鍏ユ寚瀹氭壒娆★紝鍔犻攣椤哄簭涓恒�屾壒娆� 鈫� 琚嬬爜 鈫� 鎵樼洏銆嶃��
+ * <p>
+ * 銆屽綍鍏ユ壒娆°�嶄笌銆岀粦瀹氭墭鐩樸�嶅叡鐢ㄦ瀹炵幇锛氱粦瀹氭墭鐩樻椂鑻ユ墭鐩樺凡灞炴煇鎵规銆佽�屾墍閫夎鐮佸皻鏈綍鍏ユ壒娆★紝
+ * 鍏堟寜鏈柟娉曞畬鎴愬綍鍏ワ紝浠庤�屼繚璇佹壒娆″噯鍏ユ牎楠屻�佸搧绉嶄竴鑷存�ф牎楠屻�佹壒娆℃眹鎬诲洖鍐欎笌瀹屾暣鎬ц褰曞彧鏈変竴浠姐��
+ *
+ * @param batchId 鐢熶骇鎵规缂栧彿
+ * @param rawIds 寰呭綍鍏ョ殑琚嬬爜缂栧彿锛堟湭鍘婚噸锛�
+ */
+ private void doBindBatch(Long batchId, List<Long> rawIds) {
+ MesProBatchDO batch = batchMapper.selectByIdForUpdate(batchId);
if (batch == null) {
throw exception(PRO_BATCH_NOT_EXISTS);
}
@@ -234,7 +288,7 @@
if (StrUtil.isEmpty(batch.getCode())) {
throw exception(PRO_BATCH_NOT_FILLED);
}
- List<Long> ids = bindReqVO.getIds().stream().distinct().toList();
+ List<Long> ids = rawIds.stream().distinct().toList();
List<MesProBagCodeDO> bagCodes = bagCodeMapper.selectListByIdsForUpdate(ids);
if (bagCodes.size() != ids.size() || bagCodes.stream().anyMatch(code ->
code.getBatchId() != null
@@ -459,13 +513,40 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void bindPallet(MesProBagCodeBindReqVO bindReqVO) {
- // 1. 閿佸畾鎵樼洏锛岄伩鍏嶄笌鑷姩褰掗泦骞跺彂淇敼琚嬫暟
+ // 1. 鏃犻攣棰勮鎵樼洏涓庢墍閫夎鐮侊紝鍒ゆ柇鏄惁闇�瑕佸厛涓烘湭褰曞叆鎵规鐨勮鐮佽ˉ褰曟壒娆°��
+ // 鍔犻攣椤哄簭蹇呴』涓庛�屽綍鍏ユ壒娆°�嶄竴鑷达紙鎵规 鈫� 琚嬬爜 鈫� 鎵樼洏锛夛紝鍚﹀垯涓や釜鍏ュ彛骞跺彂鏃朵氦鍙夌瓑寰呬細姝婚攣銆�
+ List<Long> ids = bindReqVO.getIds().stream().distinct().toList();
+ MesProPalletDO palletSnapshot = palletMapper.selectById(bindReqVO.getPalletId());
+ if (palletSnapshot == null) {
+ throw exception(PRO_PALLET_NOT_EXISTS);
+ }
+ List<MesProBagCodeDO> snapshots = bagCodeMapper.selectListByIds(ids);
+ if (snapshots.size() != ids.size()) {
+ throw exception(PRO_BAG_CODE_NOT_EXISTS);
+ }
+ // 2. 鎵樼洏鏈粦瀹氭壒娆℃椂锛岃鐮佷篃蹇呴』鏈綍鍏ユ壒娆★紙鍙嶅悜涓嶆垚绔嬶細鏈綍鍏ユ壒娆＄殑琚嬬爜鍙粦鍒颁换鎰忔墭鐩橈級
+ if (palletSnapshot.getBatchId() == null
+ && snapshots.stream().anyMatch(code -> code.getBatchId() != null)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400,
+ "鎵�閫夎鐮佸凡褰曞叆鐢熶骇鎵规锛岃鏀归�夎鎵规涓嬬殑鎵樼洏");
+ }
+ // 3. 鎵樼洏宸茬粦瀹氭壒娆°�佷笖瀛樺湪鏈綍鍏ユ壒娆＄殑琚嬬爜鏃讹紝澶嶇敤銆屽綍鍏ユ壒娆°�嶉�昏緫琛ュ綍
+ if (palletSnapshot.getBatchId() != null) {
+ List<Long> unboundIds = snapshots.stream()
+ .filter(code -> code.getBatchId() == null && code.getPalletId() == null
+ && !MesProBagCodeStatusEnum.CANCELED.getStatus().equals(code.getStatus()))
+ .map(MesProBagCodeDO::getId).toList();
+ if (!unboundIds.isEmpty()) {
+ doBindBatch(palletSnapshot.getBatchId(), unboundIds);
+ }
+ }
+ // 4. 閿佸畾鎵樼洏锛岄伩鍏嶄笌鑷姩褰掗泦骞跺彂淇敼琚嬫暟
MesProPalletDO pallet = palletMapper.selectByIdForUpdate(bindReqVO.getPalletId());
if (pallet == null) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
- // 2. 閿佸畾骞舵牎楠岃鐮�
- List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(bindReqVO.getIds(), pallet, true);
+ // 5. 閿佸畾骞舵牎楠岃鐮侊紙褰曞叆鎵规鍚庯紝琚嬬爜涓庢墭鐩樺繀鐒跺悓鎵规锛�
+ List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(ids, pallet, true);
Long itemId = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.resolve(pallet,
bagCodeMapper.selectListByPalletId(pallet.getId()));
for (MesProBagCodeDO bag : bagCodes) {
@@ -473,9 +554,9 @@
itemId = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.merge(itemId, bag.getItemId());
}
palletMapper.updateById(new MesProPalletDO().setId(pallet.getId()).setItemId(itemId));
- // 3. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁帮紙鎵樼洏鏃犲閲忎笂闄愶級
+ // 6. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁帮紙鎵樼洏鏃犲閲忎笂闄愶級
int currentCount = pallet.getBagCount() == null ? 0 : pallet.getBagCount();
- bagCodeMapper.bindPalletByIds(bindReqVO.getIds(), pallet.getId(), StrUtil.isNotBlank(pallet.getCode()) ? pallet.getCode() : pallet.getTempCode());
+ bagCodeMapper.bindPalletByIds(ids, pallet.getId(), StrUtil.isNotBlank(pallet.getCode()) ? pallet.getCode() : pallet.getTempCode());
palletService.updatePalletBagCount(pallet.getId(), currentCount + bagCodes.size());
}
--
Gitblit v1.9.3