From f7273277023f3497ac071bf98f556a569cb4dd25 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 16:24:10 +0800
Subject: [PATCH] feat(mes): 重构袋码生成与物料分类功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java | 429 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 384 insertions(+), 45 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 3ac2f9d..c8f11c4 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
@@ -3,17 +3,32 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeBindBatchReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeBindReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeGenerateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeRawGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeReplaceItemRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeReplaceReqVO;
+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.MesProBagCodeReplaceDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeReplaceMapper;
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.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.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +39,14 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -43,49 +65,336 @@
private MesProBagCodeMapper bagCodeMapper;
@Resource
private MesProBatchMapper batchMapper;
+ @Resource
+ private MesProBagCodeReplaceMapper replaceMapper;
+ @Resource
+ private MesProPalletMapper palletMapper;
@Resource
private MesProPalletService palletService;
+ @Resource
+ private MesMdmItemService mdmItemService;
+ @Resource
+ private MdmUnitMeasureApi unitMeasureApi;
+
+ /**
+ * 璁￠噺鍗曚綅绫诲瀷銆屽惃銆嶏紙鏃犳墭鐩樻ā寮忥級
+ */
+ private static final String UNIT_TYPE_TON = "鍚�";
+ /**
+ * 璁￠噺鍗曚綅绫诲瀷銆孨鍗冨厠銆嶏細姣忔墭鐩樿 N 涓鐮�
+ */
+ private static final Pattern KG_TYPE_PATTERN = Pattern.compile("^(\\d{1,5})鍗冨厠$");
@Override
@Transactional(rollbackFor = Exception.class)
- public String generateBagCodes(MesProBagCodeGenerateReqVO generateReqVO) {
- // 1. 鏍￠獙鎵规瀛樺湪涓斿浜庣敓浜т腑鐘舵��
- MesProBatchDO batch = batchMapper.selectById(generateReqVO.getBatchId());
+ public MesProBagCodeGenerateRespVO generateBagCodes(MesProBagCodeGenerateReqVO generateReqVO) {
+ // 1. 鏍￠獙鍝佺骞惰鍙栦富璁￠噺鍗曚綅绫诲瀷
+ MesMdmItemDO item = mdmItemService.validateItemExists(generateReqVO.getItemId());
+ String type = getUnitType(item);
+
+ // 2. 鎸夌被鍨嬫崲绠楄鐮佹暟閲忥細N鍗冨厠 = 姣忔墭 N 琚� 脳 鎵樼洏鏁帮紱鍚� = 鐩存帴杈撳叆琚嬬爜鏁帮紙鏃犳墭鐩橈級
+ boolean ton = UNIT_TYPE_TON.equals(type);
+ int perPallet = ton ? 0 : parseKgPerPallet(type);
+ int totalCount;
+ int palletCount = 0;
+ if (ton) {
+ if (generateReqVO.getBagCount() == null || generateReqVO.getBagCount() <= 0) {
+ throw exception(PRO_BAG_CODE_GENERATE_COUNT_INVALID);
+ }
+ totalCount = generateReqVO.getBagCount();
+ } else {
+ if (generateReqVO.getPalletCount() == null || generateReqVO.getPalletCount() <= 0) {
+ throw exception(PRO_BAG_CODE_PALLET_COUNT_REQUIRED);
+ }
+ palletCount = generateReqVO.getPalletCount();
+ totalCount = perPallet * palletCount;
+ }
+
+ // 3. 鐢熸垚闃舵锛氳鐮佺洿鎺ョ粦瀹氬搧绉嶏紱鐢熶骇鎵规鍦ㄥ悗缁綍鍏�
+ String uuid = IdUtil.fastSimpleUUID();
+ List<MesProPalletDO> pallets = new ArrayList<>(palletCount);
+ if (!ton) {
+ int startSeq = palletMapper.selectMaxTempCodeSeq() + 1;
+ for (int i = 0; i < palletCount; i++) {
+ pallets.add(new MesProPalletDO()
+ .setTempCode("PL-" + StrUtil.padPre(String.valueOf(startSeq + i), 8, '0'))
+ .setBagCount(perPallet)
+ .setAutoGenerated(true)
+ .setStatus(MesProPalletStatusEnum.IN_USE.getStatus()));
+ }
+ palletMapper.insertBatch(pallets);
+ }
+ int startNo = bagCodeMapper.selectMaxBagNo() + 1;
+ 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("BAG-" + StrUtil.padPre(String.valueOf(bagNo), 8, '0'))
+ .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);
+ return new MesProBagCodeGenerateRespVO()
+ .setUuid(uuid)
+ .setType(type)
+ .setPerPallet(perPallet)
+ .setTotalCount(totalCount)
+ .setPalletIds(pallets.stream().map(MesProPalletDO::getId).toList());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProBagCodeGenerateRespVO generateRawBagCodes(MesProBagCodeRawGenerateReqVO generateReqVO) {
+ // 鍘熷琚嬬爜涓嶄緷璧栬閲忓崟浣嶇被鍨嬩笌鎵樼洏锛氫粎鎸夋暟閲忕敓鎴愶紝琚嬬爜甯﹀搧绉嶅啑浣欙紝鍚庣画鍙甯稿綍鍏ユ壒娆�/缁戝畾鎵樼洏
+ MesMdmItemDO item = mdmItemService.validateItemExists(generateReqVO.getItemId());
+ String uuid = IdUtil.fastSimpleUUID();
+ int startNo = bagCodeMapper.selectMaxBagNo() + 1;
+ 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("BAG-" + StrUtil.padPre(String.valueOf(bagNo), 8, '0'))
+ .setBagNo(bagNo)
+ .setItemId(item.getId())
+ .setItemCode(item.getCode())
+ .setItemName(item.getName())
+ .setStatus(MesProBagCodeStatusEnum.GENERATED.getStatus())
+ .setRemark(generateReqVO.getRemark()));
+ }
+ bagCodeMapper.insertBatch(bagCodes);
+ return new MesProBagCodeGenerateRespVO()
+ .setUuid(uuid)
+ .setTotalCount(bagCodes.size())
+ .setPalletIds(List.of());
+ }
+
+ /**
+ * 璇诲彇鍝佺涓昏閲忓崟浣嶇殑绫诲瀷锛�48鍗冨厠/100鍗冨厠/鍚級锛屾湭閰嶇疆鎴栨棤娉曡瘑鍒椂鎶ラ敊
+ */
+ private String getUnitType(MesMdmItemDO item) {
+ String type = null;
+ if (item.getUnitMeasureId() != null) {
+ CommonResult<MdmUnitMeasureRespDTO> result = unitMeasureApi.getUnitMeasure(item.getUnitMeasureId());
+ if (result != null && result.isSuccess() && result.getData() != null) {
+ type = StrUtil.trimToNull(result.getData().getType());
+ }
+ }
+ if (type == null) {
+ throw exception(PRO_BAG_CODE_ITEM_TYPE_NOT_CONFIGURED);
+ }
+ if (!UNIT_TYPE_TON.equals(type) && !KG_TYPE_PATTERN.matcher(type).matches()) {
+ throw exception(PRO_BAG_CODE_ITEM_TYPE_NOT_CONFIGURED);
+ }
+ return type;
+ }
+
+ /**
+ * 瑙ｆ瀽銆孨鍗冨厠銆嶇被鍨嬪緱鍑烘瘡鎵樼洏琚嬫暟
+ */
+ private int parseKgPerPallet(String type) {
+ Matcher matcher = KG_TYPE_PATTERN.matcher(type);
+ if (!matcher.matches()) {
+ throw exception(PRO_BAG_CODE_ITEM_TYPE_NOT_CONFIGURED);
+ }
+ return Integer.parseInt(matcher.group(1));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void bindBatch(MesProBagCodeBindBatchReqVO bindReqVO) {
+ MesProBatchDO batch = batchMapper.selectByIdForUpdate(bindReqVO.getBatchId());
if (batch == null) {
throw exception(PRO_BATCH_NOT_EXISTS);
}
if (!MesProBatchStatusEnum.PRODUCING.getStatus().equals(batch.getStatus())) {
throw exception(PRO_BATCH_STATUS_NOT_GENERATE_CODE);
}
- if (generateReqVO.getCount() == null || generateReqVO.getCount() <= 0) {
- throw exception(PRO_BAG_CODE_GENERATE_COUNT_INVALID);
+ // 涓存椂鎵规锛堟湭琛ュ綍姝ｅ紡鎵规鍙凤級涓嶅厑璁歌鐮佸綍鍏�
+ if (StrUtil.isEmpty(batch.getCode())) {
+ throw exception(PRO_BATCH_NOT_FILLED);
}
+ List<Long> ids = bindReqVO.getIds().stream().distinct().toList();
+ List<MesProBagCodeDO> bagCodes = bagCodeMapper.selectListByIdsForUpdate(ids);
+ if (bagCodes.size() != ids.size() || bagCodes.stream().anyMatch(code ->
+ code.getBatchId() != null
+ || (!MesProBagCodeStatusEnum.GENERATED.getStatus().equals(code.getStatus())
+ && !MesProBagCodeStatusEnum.PRINTED.getStatus().equals(code.getStatus())))) {
+ throw exception(PRO_BAG_CODE_STATUS_NOT_GENERATED);
+ }
+ // 褰曞叆鐨勮鐮佸繀椤诲睘浜庡悓涓�鍝佺锛屼笖涓庢壒娆″凡鏈夎鐮佸搧绉嶄竴鑷达紙鍘嗗彶绌虹櫧琚嬬爜 item 涓虹┖涓嶅弬涓庢牎楠岋級
+ Set<Long> itemIds = new LinkedHashSet<>();
+ bagCodes.stream().map(MesProBagCodeDO::getItemId).filter(Objects::nonNull).forEach(itemIds::add);
+ itemIds.addAll(bagCodeMapper.selectDistinctItemIdsByBatchId(batch.getId()));
+ if (itemIds.size() > 1) {
+ throw exception(PRO_BAG_CODE_BIND_BATCH_ITEM_MISMATCH);
+ }
+ if (bagCodeMapper.bindBatchByIds(ids, batch.getId(), batch.getCode(),
+ List.of(MesProBagCodeStatusEnum.GENERATED.getStatus(),
+ MesProBagCodeStatusEnum.PRINTED.getStatus())) != ids.size()) {
+ throw exception(PRO_BAG_CODE_STATUS_NOT_GENERATED);
+ }
+ batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
+ .setBagQuantity(bagCodeMapper.selectEffectiveCountByBatchId(batch.getId())));
+ // 绾ц仈锛氭湰缁勮鐮佺粦瀹氱殑鏈叆鎵规鎵樼洏锛屽垎閰嶆寮忔墭鐩樼爜骞剁粦瀹氭壒娆�
+ bindPalletsToBatch(bagCodes, batch);
+ }
- // 2. 璁＄畻璧峰搴忓彿锛堝寘鍚凡閫昏緫鍒犻櫎璁板綍锛屼繚璇佸簭鍙蜂笉鍥為��銆佺爜鍊煎敮涓�锛�
- int startNo = bagCodeMapper.selectMaxBagNo(batch.getId()) + 1;
-
- // 3. 鎵归噺鐢熸垚琚嬬爜锛氭壒娆″彿 + - + 4 浣嶈搴忓彿锛屽悓涓�娆＄敓鎴愬叡浜悓涓� UUID锛堟暟鎹寘锛�
- String uuid = IdUtil.fastSimpleUUID();
- 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(batch.getCode() + "-" + StrUtil.padPre(String.valueOf(bagNo), 4, '0'))
- .setBagNo(bagNo)
+ /**
+ * 琚嬬爜褰曞叆鎵规鏃讹紝灏嗗叾缁戝畾鐨勪复鏃舵墭鐩橈紙鏈粦瀹氭壒娆★級绾ц仈缁戝畾鍒板悓涓�鎵规锛�
+ * 鍒嗛厤姝ｅ紡鎵樼洏鐮侊紙鎵规鍙�-P搴忓彿锛夈�佸洖鍐欒鐮佷笂鐨勫啑浣欐墭鐩樼爜銆佺疮璁℃壒娆℃墭鐩樻暟
+ */
+ private void bindPalletsToBatch(List<MesProBagCodeDO> bagCodes, MesProBatchDO batch) {
+ List<Long> palletIds = bagCodes.stream().map(MesProBagCodeDO::getPalletId)
+ .filter(Objects::nonNull).distinct().sorted().toList();
+ if (palletIds.isEmpty()) {
+ return;
+ }
+ int nextPalletNo = palletMapper.selectMaxPalletNo(batch.getId()) + 1;
+ int boundCount = 0;
+ for (Long palletId : palletIds) {
+ MesProPalletDO pallet = palletMapper.selectByIdForUpdate(palletId);
+ if (pallet == null || pallet.getBatchId() != null || StrUtil.isNotEmpty(pallet.getCode())) {
+ continue;
+ }
+ String palletCode = batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(nextPalletNo++), 2, '0');
+ palletMapper.updateById(new MesProPalletDO().setId(palletId)
+ .setCode(palletCode)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
- .setStatus(MesProBagCodeStatusEnum.GENERATED.getStatus())
- .setRemark(generateReqVO.getRemark()));
+ .setPalletNo(nextPalletNo - 1));
+ // 琚嬬爜涓婄殑鍐椾綑鎵樼洏鐮佺敱涓存椂鐮佹洿鏂颁负姝ｅ紡鐮�
+ bagCodeMapper.updatePalletCodeByPalletId(palletId, palletCode);
+ boundCount++;
}
- bagCodeMapper.insertBatch(bagCodes);
+ if (boundCount > 0) {
+ batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
+ .setPalletQuantity((batch.getPalletQuantity() == null ? 0 : batch.getPalletQuantity()) + boundCount));
+ }
+ }
- // 4. 鍥炲啓鎵规琚嬬爜鏁伴噺
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProBagCodeReplaceRespVO replaceBagCodes(MesProBagCodeReplaceReqVO replaceReqVO) {
+ MesProBatchDO batch = batchMapper.selectByIdForUpdate(replaceReqVO.getBatchId());
+ if (batch == null) {
+ throw exception(PRO_BATCH_NOT_EXISTS);
+ }
+ if (!MesProBatchStatusEnum.PRODUCING.getStatus().equals(batch.getStatus())
+ && !MesProBatchStatusEnum.FINISHED.getStatus().equals(batch.getStatus())) {
+ throw exception(PRO_BAG_CODE_REPLACE_BATCH_STATUS_INVALID);
+ }
+
+ List<Long> oldIds = replaceReqVO.getOldIds().stream()
+ .distinct().sorted().toList();
+ List<MesProBagCodeDO> oldBagCodes = bagCodeMapper.selectListByIdsForUpdate(oldIds);
+ if (oldBagCodes.size() != oldIds.size()) {
+ throw exception(PRO_BAG_CODE_NOT_EXISTS);
+ }
+ for (MesProBagCodeDO oldBagCode : oldBagCodes) {
+ if (!batch.getId().equals(oldBagCode.getBatchId())) {
+ throw exception(PRO_BAG_CODE_REPLACE_BATCH_MISMATCH);
+ }
+ if (!MesProBagCodeStatusEnum.GENERATED.getStatus().equals(oldBagCode.getStatus())
+ && !MesProBagCodeStatusEnum.PRINTED.getStatus().equals(oldBagCode.getStatus())) {
+ throw exception(PRO_BAG_CODE_REPLACE_STATUS_INVALID);
+ }
+ if (replaceMapper.selectByOldBagCodeId(oldBagCode.getId()) != null) {
+ throw exception(PRO_BAG_CODE_REPLACE_ALREADY_REPLACED);
+ }
+ }
+
+ Map<Long, MesProPalletDO> palletMap = new LinkedHashMap<>();
+ oldBagCodes.stream().map(MesProBagCodeDO::getPalletId).filter(id -> id != null)
+ .distinct().sorted().forEach(palletId -> {
+ MesProPalletDO pallet = palletMapper.selectByIdForUpdate(palletId);
+ if (pallet == null || !MesProPalletStatusEnum.IN_USE.getStatus().equals(pallet.getStatus())) {
+ throw exception(PRO_BAG_CODE_REPLACE_PALLET_INVALID);
+ }
+ palletMap.put(palletId, pallet);
+ });
+
+ String replaceUuid = IdUtil.fastSimpleUUID();
+ LocalDateTime replaceTime = LocalDateTime.now();
+ int startNo = bagCodeMapper.selectMaxBagNo() + 1;
+ List<MesProBagCodeDO> newBagCodes = new ArrayList<>(oldBagCodes.size());
+ List<MesProBagCodeReplaceDO> replacements = new ArrayList<>(oldBagCodes.size());
+ List<MesProBagCodeReplaceItemRespVO> items = new ArrayList<>(oldBagCodes.size());
+ for (int i = 0; i < oldBagCodes.size(); i++) {
+ MesProBagCodeDO oldBagCode = oldBagCodes.get(i);
+ if (bagCodeMapper.cancelById(oldBagCode.getId(), oldBagCode.getStatus(),
+ MesProBagCodeStatusEnum.CANCELED.getStatus(), replaceTime, replaceReqVO.getReason()) != 1) {
+ throw exception(PRO_BAG_CODE_REPLACE_STATUS_INVALID);
+ }
+ int newBagNo = startNo + i;
+ MesProPalletDO pallet = oldBagCode.getPalletId() == null ? null : palletMap.get(oldBagCode.getPalletId());
+ MesProBagCodeDO newBagCode = new MesProBagCodeDO()
+ .setUuid(replaceUuid)
+ .setCode(batch.getCode() + "-" + StrUtil.padPre(String.valueOf(newBagNo), 4, '0'))
+ .setBagNo(newBagNo)
+ .setBatchId(batch.getId())
+ .setBatchCode(batch.getCode())
+ .setItemId(oldBagCode.getItemId())
+ .setItemCode(oldBagCode.getItemCode())
+ .setItemName(oldBagCode.getItemName())
+ .setPalletId(pallet == null ? null : pallet.getId())
+ .setPalletCode(pallet == null ? null : pallet.getCode())
+ .setStatus(MesProBagCodeStatusEnum.GENERATED.getStatus())
+ .setRemark(replaceReqVO.getReason());
+ newBagCodes.add(newBagCode);
+
+ replacements.add(new MesProBagCodeReplaceDO()
+ .setReplaceUuid(replaceUuid)
+ .setBatchId(batch.getId())
+ .setBatchCode(batch.getCode())
+ .setOldBagCodeId(oldBagCode.getId())
+ .setOldCode(oldBagCode.getCode())
+ .setOldBagNo(oldBagCode.getBagNo())
+ .setOldStatus(oldBagCode.getStatus())
+ .setOldPalletId(oldBagCode.getPalletId())
+ .setOldPalletCode(oldBagCode.getPalletCode())
+ .setNewCode(newBagCode.getCode())
+ .setNewBagNo(newBagNo)
+ .setReason(replaceReqVO.getReason())
+ .setReplaceTime(replaceTime));
+ items.add(new MesProBagCodeReplaceItemRespVO()
+ .setOldBagCodeId(oldBagCode.getId())
+ .setOldCode(oldBagCode.getCode())
+ .setOldBagNo(oldBagCode.getBagNo())
+ .setOldStatus(oldBagCode.getStatus())
+ .setOldPalletId(oldBagCode.getPalletId())
+ .setOldPalletCode(oldBagCode.getPalletCode())
+ .setNewCode(newBagCode.getCode())
+ .setNewBagNo(newBagNo)
+ .setNewPalletId(newBagCode.getPalletId())
+ .setNewPalletCode(newBagCode.getPalletCode())
+ .setReason(replaceReqVO.getReason())
+ .setReplaceTime(replaceTime));
+ }
+ bagCodeMapper.insertBatch(newBagCodes);
+ for (int i = 0; i < replacements.size(); i++) {
+ replacements.get(i).setNewBagCodeId(newBagCodes.get(i).getId());
+ items.get(i).setNewBagCodeId(newBagCodes.get(i).getId());
+ }
+ replaceMapper.insertBatch(replacements);
batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
- .setBagQuantity((batch.getBagQuantity() == null ? 0 : batch.getBagQuantity())
- + generateReqVO.getCount()));
- return uuid;
+ .setBagQuantity(bagCodeMapper.selectEffectiveCountByBatchId(batch.getId())));
+
+ return new MesProBagCodeReplaceRespVO()
+ .setReplaceUuid(replaceUuid)
+ .setBatchId(batch.getId())
+ .setBatchCode(batch.getCode())
+ .setCount(newBagCodes.size())
+ .setItems(items);
}
@Override
@@ -96,17 +405,26 @@
if (CollUtil.isEmpty(bagCodes)) {
throw exception(PRO_BAG_CODE_UUID_NOT_EXISTS);
}
- // 2. 鏍￠獙鍧囦负宸茬敓鎴愮姸鎬佷笖鏈粦瀹氭墭鐩�
+ // 2. 鏍￠獙鍧囦负宸茬敓鎴愮姸鎬�
if (bagCodes.stream().anyMatch(bagCode ->
!MesProBagCodeStatusEnum.GENERATED.getStatus().equals(bagCode.getStatus()))) {
throw exception(PRO_BAG_CODE_STATUS_NOT_GENERATED);
}
- if (bagCodes.stream().anyMatch(bagCode -> bagCode.getPalletId() != null)) {
- throw exception(PRO_BAG_CODE_BIND_PALLET_BOUND);
+ // 3. 缁戝畾鐨勬墭鐩樹粎闄�"鑷姩鐢熸垚涓旀湭缁戝畾鎵规"锛堢敓鎴愭暟鎹寘鏃惰嚜鍔ㄧ粦瀹氾級锛岀骇鑱斿垹闄わ紱宸插叆鎵规鐨勬墭鐩樹笉鍏佽闅忓寘鍒犻櫎
+ Set<Long> palletIds = new LinkedHashSet<>();
+ bagCodes.stream().map(MesProBagCodeDO::getPalletId).filter(Objects::nonNull).forEach(palletIds::add);
+ for (Long palletId : palletIds) {
+ MesProPalletDO pallet = palletMapper.selectById(palletId);
+ if (pallet != null && (pallet.getBatchId() != null || StrUtil.isNotEmpty(pallet.getCode()))) {
+ throw exception(PRO_BAG_CODE_BIND_PALLET_BOUND);
+ }
}
- // 3. 鍒犻櫎鐢熸垚缁�
+ // 4. 鍒犻櫎鐢熸垚缁勪笌鍏惰嚜鍔ㄧ敓鎴愮殑涓存椂鎵樼洏
bagCodeMapper.deleteByIds(bagCodes.stream().map(MesProBagCodeDO::getId).toList());
- // 4. 鍥炲噺鎵规琚嬬爜鏁伴噺
+ if (!palletIds.isEmpty()) {
+ palletMapper.deleteByIds(palletIds);
+ }
+ // 5. 鍥炲噺鎵规琚嬬爜鏁伴噺
MesProBatchDO batch = batchMapper.selectById(bagCodes.get(0).getBatchId());
if (batch != null && batch.getBagQuantity() != null) {
batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
@@ -117,17 +435,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void bindPallet(MesProBagCodeBindReqVO bindReqVO) {
- // 1. 鏍￠獙鎵樼洏瀛樺湪
- MesProPalletDO pallet = palletService.validatePalletExists(bindReqVO.getPalletId());
- // 2. 鏍￠獙琚嬬爜
- List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(bindReqVO.getIds(), pallet);
- // 3. 鏍￠獙涓嶈秴杩囨墭鐩樺彲瑁呰鏁�
- int currentCount = pallet.getBagCount() == null ? 0 : pallet.getBagCount();
- if (pallet.getCapacity() != null && pallet.getCapacity() > 0
- && currentCount + bagCodes.size() > pallet.getCapacity()) {
- throw exception(PRO_BAG_CODE_BIND_PALLET_OVER_CAPACITY);
+ // 1. 閿佸畾鎵樼洏锛岄伩鍏嶄笌鑷姩褰掗泦骞跺彂淇敼琚嬫暟
+ MesProPalletDO pallet = palletMapper.selectByIdForUpdate(bindReqVO.getPalletId());
+ if (pallet == null) {
+ throw exception(PRO_PALLET_NOT_EXISTS);
}
- // 4. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁�
+ // 2. 閿佸畾骞舵牎楠岃鐮�
+ List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(bindReqVO.getIds(), pallet, true);
+ // 3. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁帮紙鎵樼洏鏃犲閲忎笂闄愶級
+ int currentCount = pallet.getBagCount() == null ? 0 : pallet.getBagCount();
bagCodeMapper.bindPalletByIds(bindReqVO.getIds(), pallet.getId(), pallet.getCode());
palletService.updatePalletBagCount(pallet.getId(), currentCount + bagCodes.size());
}
@@ -135,10 +451,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void unbindPallet(MesProBagCodeBindReqVO bindReqVO) {
- // 1. 鏍￠獙鎵樼洏瀛樺湪
- MesProPalletDO pallet = palletService.validatePalletExists(bindReqVO.getPalletId());
- // 2. 鏍￠獙琚嬬爜鍧囩粦瀹氬湪褰撳墠鎵樼洏涓�
- List<MesProBagCodeDO> bagCodes = bagCodeMapper.selectListByIds(bindReqVO.getIds());
+ // 1. 閿佸畾鎵樼洏锛岄伩鍏嶄笌鑷姩褰掗泦骞跺彂淇敼琚嬫暟
+ MesProPalletDO pallet = palletMapper.selectByIdForUpdate(bindReqVO.getPalletId());
+ if (pallet == null) {
+ throw exception(PRO_PALLET_NOT_EXISTS);
+ }
+ // 2. 閿佸畾骞舵牎楠岃鐮佸潎缁戝畾鍦ㄥ綋鍓嶆墭鐩樹笂
+ List<MesProBagCodeDO> bagCodes = bagCodeMapper.selectListByIdsForUpdate(bindReqVO.getIds());
if (bagCodes.size() != bindReqVO.getIds().size()) {
throw exception(PRO_BAG_CODE_NOT_EXISTS);
}
@@ -180,6 +499,16 @@
}
@Override
+ public MesProBagCodeReplaceDO getReplacementByOldBagCodeId(Long oldBagCodeId) {
+ return replaceMapper.selectByOldBagCodeId(oldBagCodeId);
+ }
+
+ @Override
+ public MesProBagCodeReplaceDO getReplacementByNewBagCodeId(Long newBagCodeId) {
+ return replaceMapper.selectByNewBagCodeId(newBagCodeId);
+ }
+
+ @Override
public PageResult<MesProBagCodeDO> getBagCodePage(MesProBagCodePageReqVO pageReqVO) {
return bagCodeMapper.selectPage(pageReqVO);
}
@@ -199,13 +528,23 @@
return bagCodeMapper.selectListByBatchId(batchId);
}
+ @Override
+ public void markOutbound(Long id, Long salesId) {
+ bagCodeMapper.markOutbound(id, salesId, LocalDateTime.now());
+ }
+
+ @Override
+ public void clearOutbound(Long id) {
+ bagCodeMapper.clearOutbound(id);
+ }
+
// ==================== 绉佹湁鏂规硶 ====================
/**
* 鏍￠獙寰呯粦瀹氱殑琚嬬爜锛氬瓨鍦ㄣ�佷笌鎵樼洏鍚屾壒娆°�佹湭缁戝畾杩囨墭鐩樸�佺姸鎬佹湁鏁堬紙宸茬敓鎴�/宸插鍑哄嵃鍒凤級
*/
- private List<MesProBagCodeDO> validateBagCodesForBind(List<Long> ids, MesProPalletDO pallet) {
- List<MesProBagCodeDO> bagCodes = bagCodeMapper.selectListByIds(ids);
+ private List<MesProBagCodeDO> validateBagCodesForBind(List<Long> ids, MesProPalletDO pallet, boolean lock) {
+ List<MesProBagCodeDO> bagCodes = lock ? bagCodeMapper.selectListByIdsForUpdate(ids) : bagCodeMapper.selectListByIds(ids);
if (bagCodes.size() != ids.size()) {
throw exception(PRO_BAG_CODE_NOT_EXISTS);
}
--
Gitblit v1.9.3