From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 158 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index d609a27..b3b7ec6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -10,6 +10,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmStockSummaryRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
@@ -28,6 +29,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.mes.service.wm.materialstockbag.MesWmMaterialStockBagService;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstockbag.MesWmMaterialStockBagMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import jakarta.annotation.Resource;
@@ -39,8 +43,11 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -71,6 +78,11 @@
@Resource
@Lazy
private MesWmBatchService batchService;
+
+ @Resource
+ private MesWmMaterialStockBagMapper materialStockBagMapper;
+ @Resource
+ private MesWmMaterialStockBagService materialStockBagService;
@Override
public MesWmMaterialStockDO getMaterialStock(Long id) {
@@ -118,9 +130,27 @@
Assert.notNull(virtualWarehouse, "铏氭嫙浠撳簱锛圵IP_VIRTUAL_WAREHOUSE锛変笉瀛樺湪");
virtualWarehouseId = virtualWarehouse.getId();
}
+ // 1.4 瑙ｆ瀽 warehouseType锛氳浆鎹负璇ョ被鍨嬩粨搴� warehouseIds锛堜笌 warehouseId / virtualFilter 骞跺瓨锛屼繚鐣欏吋瀹癸級
+ List<Long> warehouseIds = resolveWarehouseIdsByType(pageReqVO.getWarehouseType());
+ if (warehouseIds != null && warehouseIds.isEmpty()) {
+ return PageResult.empty();
+ }
// 2. 鍒嗛〉鏌ヨ
- return materialStockMapper.selectPage(pageReqVO, itemTypeIds, itemIds, virtualWarehouseId);
+ return materialStockMapper.selectPage(pageReqVO, itemTypeIds, itemIds, virtualWarehouseId, warehouseIds);
+ }
+
+ /**
+ * 灏嗕粨搴撶被鍨嬭В鏋愪负浠撳簱 id 闆嗗悎锛坵arehouseType 涓� null 鏃朵笉鍔犺繃婊わ紝杩斿洖 null锛�
+ *
+ * @param warehouseType 浠撳簱绫诲瀷锛岃 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmWarehouseTypeEnum}
+ * @return 璇ョ被鍨嬩粨搴� id 闆嗗悎锛泈arehouseType 涓� null 杩斿洖 null锛涜绫诲瀷鏃犱粨搴撹繑鍥炵┖闆嗗悎
+ */
+ private List<Long> resolveWarehouseIdsByType(Integer warehouseType) {
+ if (warehouseType == null) {
+ return null;
+ }
+ return convertList(warehouseService.getWarehouseListByType(warehouseType), MesWmWarehouseDO::getId);
}
@Override
@@ -166,7 +196,91 @@
@Override
public List<MesWmMaterialStockDO> getMaterialStockList(MesWmMaterialStockListReqVO reqVO) {
- return materialStockMapper.selectList(reqVO);
+ List<Long> warehouseIds = resolveWarehouseIdsByType(reqVO.getWarehouseType());
+ if (warehouseIds != null && warehouseIds.isEmpty()) {
+ return Collections.emptyList();
+ }
+ return materialStockMapper.selectList(reqVO, warehouseIds);
+ }
+
+ @Override
+ public List<MesWmStockSummaryRespVO> getStockSummaryByItem(MesWmMaterialStockListReqVO reqVO) {
+ List<MesWmMaterialStockDO> stocks = getMaterialStockList(reqVO);
+ List<MesWmStockSummaryRespVO> list = buildStockSummary(stocks,
+ stock -> String.valueOf(stock.getItemId()),
+ (vo, stock) -> vo.setItemId(stock.getItemId()));
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
+ convertSet(stocks, MesWmMaterialStockDO::getItemId));
+ list.forEach(vo -> {
+ MesMdmItemDO item = itemMap.get(vo.getItemId());
+ if (item != null) {
+ vo.setItemCode(item.getCode()).setItemName(item.getName());
+ }
+ });
+ return list;
+ }
+
+ @Override
+ public List<MesWmStockSummaryRespVO> getStockSummaryByBatch(MesWmMaterialStockListReqVO reqVO) {
+ List<MesWmMaterialStockDO> stocks = getMaterialStockList(reqVO);
+ return buildStockSummary(stocks,
+ stock -> stock.getBatchId() + "|" + (stock.getBatchCode() != null ? stock.getBatchCode() : ""),
+ (vo, stock) -> vo.setBatchId(stock.getBatchId()).setBatchCode(stock.getBatchCode()));
+ }
+
+ @Override
+ public List<MesWmStockSummaryRespVO> getStockSummaryByWarehouse(MesWmMaterialStockListReqVO reqVO) {
+ List<MesWmMaterialStockDO> stocks = getMaterialStockList(reqVO);
+ List<MesWmStockSummaryRespVO> list = buildStockSummary(stocks,
+ stock -> String.valueOf(stock.getWarehouseId()),
+ (vo, stock) -> vo.setWarehouseId(stock.getWarehouseId()));
+ Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+ convertSet(stocks, MesWmMaterialStockDO::getWarehouseId));
+ list.forEach(vo -> {
+ MesWmWarehouseDO warehouse = warehouseMap.get(vo.getWarehouseId());
+ if (warehouse != null) {
+ vo.setWarehouseName(warehouse.getName());
+ }
+ });
+ return list;
+ }
+
+ /**
+ * 鍐呭瓨鑱氬悎搴撳瓨鏁伴噺锛氭寜缁村害閿� + 搴撳瓨鐘舵�佸垎缁勶紝绱姞鍦ㄥ簱鏁伴噺
+ */
+ private List<MesWmStockSummaryRespVO> buildStockSummary(List<MesWmMaterialStockDO> stocks,
+ Function<MesWmMaterialStockDO, String> dimKeyFn,
+ BiConsumer<MesWmStockSummaryRespVO, MesWmMaterialStockDO> dimSetter) {
+ if (CollUtil.isEmpty(stocks)) {
+ return Collections.emptyList();
+ }
+ Map<String, MesWmStockSummaryRespVO> map = new LinkedHashMap<>();
+ for (MesWmMaterialStockDO stock : stocks) {
+ String key = dimKeyFn.apply(stock) + "|" + stock.getStockState();
+ MesWmStockSummaryRespVO vo = map.computeIfAbsent(key, k -> {
+ MesWmStockSummaryRespVO newVo = new MesWmStockSummaryRespVO();
+ dimSetter.accept(newVo, stock);
+ newVo.setStockState(stock.getStockState());
+ newVo.setStockStateName(stockStateName(stock.getStockState()));
+ newVo.setTotalQuantity(BigDecimal.ZERO);
+ return newVo;
+ });
+ BigDecimal qty = stock.getQuantity() != null ? stock.getQuantity() : BigDecimal.ZERO;
+ vo.setTotalQuantity(vo.getTotalQuantity().add(qty));
+ }
+ return new ArrayList<>(map.values());
+ }
+
+ private String stockStateName(Integer state) {
+ if (state == null) {
+ return "";
+ }
+ for (MesWmStockStateEnum e : MesWmStockStateEnum.values()) {
+ if (e.getState().equals(state)) {
+ return e.getName();
+ }
+ }
+ return String.valueOf(state);
}
@Override
@@ -199,7 +313,17 @@
@Override
public MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId, Long areaId,
Long batchId, Long vendorId) {
- return materialStockMapper.selectByCompositeKey(itemId, warehouseId, locationId, areaId, batchId, vendorId);
+ // 鍑哄簱/鍗犵敤鍙粠鍚堟牸搴撳尮閰嶏紝閬垮厤鎵ｅ埌鍚屾壒娆＄殑鏆傚瓨搴擄紙绉嶅瓙璐ㄦ鎸夎鎷嗘暟閲忓悗鍚屾壒娆″弻鐘舵�佸苟瀛橈級
+ return materialStockMapper.selectQualifiedByCompositeKey(itemId, warehouseId, locationId, areaId, batchId, vendorId);
+ }
+
+ @Override
+ public List<MesWmMaterialStockDO> getQualifiedMaterialStockListByItemAndBatch(Long itemId, Long batchId) {
+ List<Long> qualifiedWarehouseIds = warehouseService.getQualifiedWarehouseIds();
+ if (CollUtil.isEmpty(qualifiedWarehouseIds)) {
+ return Collections.emptyList();
+ }
+ return materialStockMapper.selectQualifiedListByItemAndBatch(itemId, batchId, qualifiedWarehouseIds);
}
@Override
@@ -268,7 +392,11 @@
|| ObjUtil.notEqual(stock.getAreaId(), areaId)) {
throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
}
- // 3. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝鏋滃墠绔紶浜� quantity锛屽垯蹇呴』淇濊瘉搴撳瓨鏁伴噺 >= quantity锛�
+ // 3. 鏍￠獙搴撳瓨璁板綍蹇呴』鏄悎鏍煎簱锛堟殏瀛樺簱瀛樻湭璐ㄦ锛屼笉鍙敤浜庡嚭搴�/鍗犵敤锛�
+ if (!MesWmStockStateEnum.QUALIFIED.getState().equals(stock.getStockState())) {
+ throw exception(WM_MATERIAL_STOCK_NOT_QUALIFIED);
+ }
+ // 4. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝鏋滃墠绔紶浜� quantity锛屽垯蹇呴』淇濊瘉搴撳瓨鏁伴噺 >= quantity锛�
if (quantity != null && stock.getQuantity() != null && stock.getQuantity().compareTo(quantity) < 0) {
throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
}
@@ -504,6 +632,32 @@
.setRelatedTransactionId(outTransactionId)
.setCheckFlag(false);
wmTransactionService.createTransaction(inTransaction);
+
+ // 9. 鏁翠綅缃Щ搴撴椂锛岄�愯杩佺Щ琚嬬爜鏄庣粏浣嶇疆锛堟暟閲忕瓑浜庢簮搴撲綅娲诲姩琚嬫暟涓斾负鏁存暟鎵嶈涓烘暣浣嶇Щ搴擄級
+ MesWmMaterialStockDO finalTargetStock = materialStockMapper.selectByCompositeKeyIgnoreVendor(
+ sourceStock.getItemId(), reqVO.getToWarehouseId(), reqVO.getToLocationId(),
+ reqVO.getToAreaId(), sourceStock.getBatchId());
+ relocateBagsForMove(sourceStock, reqVO.getQuantity(), inTransaction, finalTargetStock);
+ }
+
+ /**
+ * 鏁翠綅绉诲簱锛氬皢婧愬簱浣嶇殑娲诲姩琚嬬爜鏄庣粏杩佺Щ鍒扮洰鏍囧簱浣嶃��
+ * <p>
+ * 浠呭綋绉诲簱鏁伴噺绛変簬婧愬簱浣嶆椿鍔ㄨ鏁颁笖涓烘暣鏁版椂鎵ц锛堟暣浣嶇疆鎼Щ锛夛紝灏嗘瘡琚嬫槑缁嗙殑搴撳瓨姹囨�汇�佷粨搴撱�佸簱鍖恒�佸簱浣�
+ * 鏇存柊涓虹洰鏍囦綅缃紱閮ㄥ垎绉诲簱/鏃犺鐮佹槑缁嗙殑鏃у簱瀛樹笉鍋氳鐮佽縼绉伙紝淇濇寔姹囨�诲簱瀛樺彉鍔ㄥ嵆鍙��
+ */
+ private void relocateBagsForMove(MesWmMaterialStockDO sourceStock, BigDecimal quantity,
+ MesWmTransactionSaveReqDTO moveInReq, MesWmMaterialStockDO targetStock) {
+ List<MesWmMaterialStockBagDO> bags = materialStockBagMapper.selectActiveListByItemAndBatch(
+ sourceStock.getItemId(), sourceStock.getBatchId(), sourceStock.getStockState());
+ if (CollUtil.isEmpty(bags) || targetStock == null || quantity == null
+ || quantity.compareTo(BigDecimal.valueOf(bags.size())) != 0) {
+ return;
+ }
+ for (MesWmMaterialStockBagDO bag : bags) {
+ moveInReq.setBagCodeId(bag.getBagCodeId()).setBagCode(bag.getBagCode());
+ materialStockBagService.moveIn(moveInReq, targetStock, null);
+ }
}
}
--
Gitblit v1.9.3