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 | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 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 f8f4734..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
@@ -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;
@@ -18,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;
@@ -38,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;
@@ -169,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 鍙備笌鍞竴閿級
@@ -186,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);
@@ -201,6 +286,11 @@
}
@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);
@@ -210,6 +300,16 @@
}
@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
public void checkAreaMixingRule(Long areaId, Long itemId, Long batchId) {
// 1.1 鏍￠獙搴撲綅蹇呴』瀛樺湪
MesWmWarehouseAreaDO area = areaService.validateWarehouseAreaExists(areaId);
--
Gitblit v1.9.3