From 6d910029b6c81db0a2b66caa66952781397b153a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 29 八月 2026 13:45:52 +0800
Subject: [PATCH] feat(mes): 实现H5溯源页面与二维码内容集成
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 179 insertions(+), 0 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 b62bbec..4318153 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
@@ -8,7 +8,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
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;
@@ -17,6 +19,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockStateEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
@@ -37,6 +40,8 @@
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.convertSet;
@@ -168,6 +173,86 @@
}
@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
public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
// 1. 鏌ユ壘宸叉湁搴撳瓨璁板綍锛坴endorId 鍙備笌鍞竴閿級
@@ -185,6 +270,7 @@
.batchId(batchId).batchCode(batchCode).vendorId(vendorId)
.quantity(BigDecimal.ZERO) // 鍒濆鏁伴噺涓� 0锛岀敱 updateMaterialStockQuantity 鏇存柊
.receiptTime(receiptTime != null ? receiptTime : LocalDateTime.now())
+ .stockState(MesWmStockStateEnum.TEMP.getState())
.frozen(false)
.build();
materialStockMapper.insert(newStock);
@@ -200,12 +286,27 @@
}
@Override
+ public List<MesWmMaterialStockDO> getMaterialStockListByItemAndBatch(Long itemId, Long batchId) {
+ return materialStockMapper.selectListByItemAndBatch(itemId, batchId);
+ }
+
+ @Override
public void updateMaterialStockQuantity(Long id, BigDecimal quantity, boolean checkFlag) {
// 鏇存柊搴撳瓨鏁伴噺锛圡apper 灞� CAS 闃茶礋搴撳瓨锛沜heckFlag=false 鏃跺厑璁歌礋鏁帮級
int updatedRows = materialStockMapper.updateQuantity(id, quantity, checkFlag);
if (updatedRows == 0) {
throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
}
+ }
+
+ @Override
+ public void updateMaterialStockState(Long id, Integer stockState) {
+ materialStockMapper.updateById(new MesWmMaterialStockDO().setId(id).setStockState(stockState));
+ }
+
+ @Override
+ public int updateStockStateByBatchId(Long batchId, Integer toState, Integer fromState) {
+ return materialStockMapper.updateStockStateByBatchId(batchId, toState, fromState);
}
@Override
@@ -415,4 +516,82 @@
throw new IllegalArgumentException("鏃犳晥鐨勮川閲忕姸鎬佺被鍨�: " + qualityStatus.getClass().getName());
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void moveMaterialStock(MesWmMaterialStockMoveReqVO reqVO) {
+ // 1. 鏌ヨ鍘熷簱瀛樿褰�
+ MesWmMaterialStockDO sourceStock = validateMaterialStockExists(reqVO.getMaterialStockId());
+
+ // 2. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝彲鐢ㄩ噺 = 鍦ㄥ簱鏁伴噺 - 鍐荤粨鏁伴噺 - 鍗犵敤閲忥級
+ BigDecimal availableQty = sourceStock.getQuantity() != null ? sourceStock.getQuantity() : BigDecimal.ZERO;
+ if (sourceStock.getFrozenQuantity() != null) {
+ availableQty = availableQty.subtract(sourceStock.getFrozenQuantity());
+ }
+ if (sourceStock.getReservedQuantity() != null) {
+ availableQty = availableQty.subtract(sourceStock.getReservedQuantity());
+ }
+ if (availableQty.compareTo(reqVO.getQuantity()) < 0) {
+ throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
+ }
+
+ // 3. 鏍￠獙搴撳瓨鏈喕缁�
+ if (Boolean.TRUE.equals(sourceStock.getFrozen())) {
+ throw exception(WM_MATERIAL_STOCK_FROZEN);
+ }
+
+ // 4. 鏍￠獙鐩爣搴撲綅娣锋斁瑙勫垯
+ checkAreaMixingRule(reqVO.getToAreaId(), sourceStock.getItemId(), sourceStock.getBatchId());
+
+ // 5. 鐢熸垚绉诲簱鍗曞彿
+ String moveCode = "MOVE_" + System.currentTimeMillis();
+
+ // 6. 鍒涘缓璋冩嫧绉诲嚭浜嬪姟锛堣礋鏁帮級
+ MesWmTransactionSaveReqDTO outTransaction = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.MOVE_OUT.getType())
+ .setBizType(MesBizTypeConstants.WM_TRANSFER_OUT)
+ .setBizId(sourceStock.getId())
+ .setBizCode(moveCode)
+ .setBizLineId(sourceStock.getId())
+ .setItemId(sourceStock.getItemId())
+ .setQuantity(reqVO.getQuantity().negate())
+ .setBatchId(sourceStock.getBatchId())
+ .setBatchCode(sourceStock.getBatchCode())
+ .setWarehouseId(sourceStock.getWarehouseId())
+ .setLocationId(sourceStock.getLocationId())
+ .setAreaId(sourceStock.getAreaId())
+ .setVendorId(sourceStock.getVendorId())
+ .setMaterialStockId(sourceStock.getId())
+ .setCheckFlag(true);
+ Long outTransactionId = wmTransactionService.createTransaction(outTransaction);
+
+ // 7. 鏌ユ壘鐩爣搴撲綅鐨勫簱瀛樿褰曪紙蹇界暐渚涘簲鍟嗭級锛岀敤浜庡悎骞跺簱瀛�
+ MesWmMaterialStockDO targetStock = materialStockMapper.selectByCompositeKeyIgnoreVendor(
+ sourceStock.getItemId(),
+ reqVO.getToWarehouseId(),
+ reqVO.getToLocationId(),
+ reqVO.getToAreaId(),
+ sourceStock.getBatchId()
+ );
+
+ // 8. 鍒涘缓璋冩嫧绉诲叆浜嬪姟锛堟鏁帮級锛屽叧鑱斿嚭搴撲簨鍔�
+ // 浣跨敤鐩爣搴撲綅宸叉湁搴撳瓨璁板綍鐨� vendorId锛堝鏋滄湁锛夛紝鍚﹀垯涓嶄紶
+ MesWmTransactionSaveReqDTO inTransaction = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.MOVE_IN.getType())
+ .setBizType(MesBizTypeConstants.WM_TRANSFER_IN)
+ .setBizId(sourceStock.getId())
+ .setBizCode(moveCode)
+ .setBizLineId(sourceStock.getId())
+ .setItemId(sourceStock.getItemId())
+ .setQuantity(reqVO.getQuantity())
+ .setBatchId(sourceStock.getBatchId())
+ .setBatchCode(sourceStock.getBatchCode())
+ .setWarehouseId(reqVO.getToWarehouseId())
+ .setLocationId(reqVO.getToLocationId())
+ .setAreaId(reqVO.getToAreaId())
+ .setVendorId(targetStock != null ? targetStock.getVendorId() : null)
+ .setRelatedTransactionId(outTransactionId)
+ .setCheckFlag(false);
+ wmTransactionService.createTransaction(inTransaction);
+ }
+
}
--
Gitblit v1.9.3