From 8655501ffb8dbdaf2508e575933063e6731be714 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 17:14:40 +0800
Subject: [PATCH] refactor(mes): 重构MES生产批次和袋码管理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java | 151 ++++++++++++++++++++++++++------------------------
1 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
index 285f8f7..33794e4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
@@ -1,22 +1,19 @@
package cn.iocoder.yudao.module.mes.service.pro.pallet;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletAutoPrintRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletBatchCreateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletBindBatchReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletPreGenerateReqVO;
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.batch.MesProBatchMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.pallet.MesProPalletMapper;
-import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
-import cn.iocoder.yudao.module.mes.enums.pro.MesProBagTypeEnum;
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.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -24,7 +21,7 @@
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -46,10 +43,6 @@
private MesProBagCodeMapper bagCodeMapper;
@Resource
private MesProBatchMapper batchMapper;
- @Resource
- private MesMdmItemService mdmItemService;
- @Resource
- private AdminUserApi adminUserApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -95,53 +88,69 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public List<MesProPalletAutoPrintRespVO> autoCreatePallets(Long batchId) {
- MesProBatchDO batch = batchMapper.selectByIdForUpdate(batchId);
+ public List<MesProPalletDO> preGeneratePallet(MesProPalletPreGenerateReqVO reqVO) {
+ // 1. 鐢熸垚涓存椂鎵樼洏鐮侊紙鍏ㄥ眬 8 浣嶅簭鍙凤紝鏍煎紡 PL-00000001锛�
+ int startSeq = palletMapper.selectMaxTempCodeSeq() + 1;
+ List<MesProPalletDO> list = new ArrayList<>(reqVO.getCount());
+ for (int i = 0; i < reqVO.getCount(); i++) {
+ list.add(new MesProPalletDO()
+ .setTempCode("PL-" + StrUtil.padPre(String.valueOf(startSeq + i), 8, '0'))
+ .setCapacity(reqVO.getCapacity())
+ .setBagCount(0)
+ .setAutoGenerated(false)
+ .setStatus(MesProPalletStatusEnum.IN_USE.getStatus())
+ .setRemark(reqVO.getRemark()));
+ }
+ // 2. 鎵归噺鎻掑叆锛堟湭缁戝畾鐢熶骇鎵规锛岀瓑寰呯粦瀹氾級
+ palletMapper.insertBatch(list);
+ return list;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int bindBatch(MesProPalletBindBatchReqVO bindReqVO) {
+ // 1. 閿佸畾鐩爣鎵规骞舵牎楠屽凡琛ュ綍姝ｅ紡淇℃伅 + 鐢熶骇涓�
+ 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);
}
- MesProBagTypeEnum bagType = MesProBagTypeEnum.valueOfType(batch.getBagType());
- if (bagType == null) {
- throw exception(PRO_BATCH_BAG_TYPE_INVALID);
+ if (StrUtil.isEmpty(batch.getCode())) {
+ throw exception(PRO_BATCH_NOT_FILLED);
}
- List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO> candidates =
- bagCodeMapper.selectUnboundEffectiveListByBatchId(batchId);
- int threshold = bagType.getThreshold();
- int palletCount = candidates.size() / threshold;
- if (palletCount == 0) {
- return Collections.emptyList();
+ // 2. 閿佸畾鎵樼洏锛屾牎楠屽潎鏈粦瀹氭壒娆′笖鏈敓鎴愭寮忔墭鐩樼爜
+ List<Long> ids = bindReqVO.getIds().stream().distinct().sorted().toList();
+ if (ids.isEmpty()) {
+ throw exception(PRO_PALLET_BIND_IDS_EMPTY);
}
-
- int startNo = palletMapper.selectMaxPalletNo(batchId) + 1;
- List<MesProPalletDO> pallets = new ArrayList<>(palletCount);
- List<List<Long>> bagIdGroups = new ArrayList<>(palletCount);
- for (int i = 0; i < palletCount; i++) {
- int palletNo = startNo + i;
- MesProPalletDO pallet = new MesProPalletDO()
- .setCode(batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(palletNo), 2, '0'))
- .setBatchId(batchId)
- .setBatchCode(batch.getCode())
- .setPalletNo(palletNo)
- .setCapacity(threshold)
- .setBagCount(threshold)
- .setAutoGenerated(true)
- .setStatus(MesProPalletStatusEnum.IN_USE.getStatus())
- .setRemark("鎸夋湁鏁堣鐮侀槇鍊艰嚜鍔ㄧ敓鎴�");
+ List<MesProPalletDO> pallets = new ArrayList<>(ids.size());
+ for (Long id : ids) {
+ MesProPalletDO pallet = palletMapper.selectByIdForUpdate(id);
+ if (pallet == null) {
+ throw exception(PRO_PALLET_NOT_EXISTS);
+ }
+ if (pallet.getBatchId() != null || StrUtil.isNotEmpty(pallet.getCode())) {
+ throw exception(PRO_PALLET_ALREADY_BIND_BATCH);
+ }
pallets.add(pallet);
- bagIdGroups.add(candidates.subList(i * threshold, (i + 1) * threshold).stream()
- .map(cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO::getId).toList());
}
- palletMapper.insertBatch(pallets);
+ // 3. 鍒嗛厤姝ｅ紡鎵樼洏鐮侊細鎵规鍙� + -P + 2 浣嶆墭鐩樺簭鍙凤紙鍚�昏緫鍒犻櫎璁板綍鍙備笌搴忓彿锛屼繚璇佷笉鍥為��銆佺爜鍊煎敮涓�锛�
+ int startNo = palletMapper.selectMaxPalletNo(batch.getId()) + 1;
for (int i = 0; i < pallets.size(); i++) {
- MesProPalletDO pallet = pallets.get(i);
- bagCodeMapper.bindPalletByIds(bagIdGroups.get(i), pallet.getId(), pallet.getCode());
+ int palletNo = startNo + i;
+ palletMapper.updateById(new MesProPalletDO()
+ .setId(pallets.get(i).getId())
+ .setCode(batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(palletNo), 2, '0'))
+ .setBatchId(batch.getId())
+ .setBatchCode(batch.getCode())
+ .setPalletNo(palletNo));
}
- batchMapper.updateById(new MesProBatchDO().setId(batchId)
+ // 4. 鍥炲啓鎵规鎵樼洏鐮佹暟閲�
+ batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
.setPalletQuantity((batch.getPalletQuantity() == null ? 0 : batch.getPalletQuantity()) + pallets.size()));
- return buildAutoPrintVOs(pallets, batch);
+ return pallets.size();
}
@Override
@@ -155,36 +164,12 @@
}
// 3. 鍒犻櫎鎵樼洏鐮�
palletMapper.deleteById(id);
- // 4. 鍥炲噺鎵规鎵樼洏鐮佹暟閲�
- MesProBatchDO batch = batchMapper.selectById(pallet.getBatchId());
+ // 4. 鍥炲噺鎵规鎵樼洏鐮佹暟閲忥紙涓存椂鎵樼洏鏈粦瀹氭壒娆℃棤闇�鍥炲噺锛�
+ MesProBatchDO batch = pallet.getBatchId() == null ? null : batchMapper.selectById(pallet.getBatchId());
if (batch != null && batch.getPalletQuantity() != null && batch.getPalletQuantity() > 0) {
batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
.setPalletQuantity(batch.getPalletQuantity() - 1));
}
- }
-
- private List<MesProPalletAutoPrintRespVO> buildAutoPrintVOs(List<MesProPalletDO> pallets, MesProBatchDO batch) {
- MesMdmItemDO item = batch.getItemId() == null ? null : mdmItemService.getItem(batch.getItemId());
- AdminUserRespDTO owner = batch.getOwnerUserId() == null ? null : adminUserApi.getUser(batch.getOwnerUserId());
- return pallets.stream().map(pallet -> new MesProPalletAutoPrintRespVO()
- .setId(pallet.getId())
- .setCode(pallet.getCode())
- .setBatchId(pallet.getBatchId())
- .setBatchCode(pallet.getBatchCode())
- .setPalletNo(pallet.getPalletNo())
- .setCopies(3)
- .setCapacity(pallet.getCapacity())
- .setBagCount(pallet.getBagCount())
- .setItemId(batch.getItemId())
- .setItemCode(item == null ? null : item.getCode())
- .setItemName(item == null ? null : item.getName())
- .setItemSpecification(item == null ? null : item.getSpecification())
- .setLineCode(batch.getLineCode())
- .setLineName(batch.getLineName())
- .setProduceDate(batch.getProduceDate())
- .setOwnerUserId(batch.getOwnerUserId())
- .setOwnerUserName(owner == null ? null : owner.getNickname()))
- .toList();
}
@Override
@@ -194,7 +179,11 @@
@Override
public MesProPalletDO getPalletByCode(String code) {
- return palletMapper.selectByCode(code);
+ MesProPalletDO pallet = palletMapper.selectByCode(code);
+ if (pallet == null) {
+ pallet = palletMapper.selectByTempCode(code);
+ }
+ return pallet;
}
@Override
@@ -217,8 +206,26 @@
}
@Override
+ public List<MesProPalletDO> getPalletListByIds(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return List.of();
+ }
+ return palletMapper.selectBatchIds(ids);
+ }
+
+ @Override
public void updatePalletBagCount(Long palletId, Integer bagCount) {
palletMapper.updateById(new MesProPalletDO().setId(palletId).setBagCount(bagCount));
}
+ @Override
+ public void markOutbound(Long id, Long salesId) {
+ palletMapper.markOutbound(id, salesId, java.time.LocalDateTime.now());
+ }
+
+ @Override
+ public void clearOutbound(Long id) {
+ palletMapper.clearOutbound(id);
+ }
+
}
--
Gitblit v1.9.3