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 |  335 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 317 insertions(+), 18 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 5c9f684..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,10 @@
 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;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
@@ -16,9 +19,14 @@
 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;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
+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.warehouse.MesWmWarehouseAreaService;
@@ -32,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;
@@ -50,6 +60,8 @@
     @Resource
     private MesMdmItemService mdmItemService;
     @Resource
+    private MesMdItemService mdItemService;
+    @Resource
     private MesMdItemTypeService itemTypeService;
     @Resource
     private MesWmWarehouseAreaService areaService;
@@ -59,6 +71,9 @@
     @Resource
     @Lazy
     private MesWmTransactionService wmTransactionService;
+    @Resource
+    @Lazy
+    private MesWmBatchService batchService;
 
     @Override
     public MesWmMaterialStockDO getMaterialStock(Long id) {
@@ -88,10 +103,13 @@
             List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
             itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
         }
-        // 1.2 瑙f瀽 itemId
+        // 1.2 瑙f瀽 itemId锛氬墠绔紶鐨勬槸 mes_md_item.id锛屽簱瀛樿〃瀛樼殑鏄� mdm_item_id锛岄渶瑕佽浆鎹�
         Set<Long> itemIds = null;
         if (pageReqVO.getItemId() != null) {
-            itemIds = SetUtils.asSet(pageReqVO.getItemId());
+            MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
+            if (item != null && item.getMdmItemId() != null) {
+                itemIds = SetUtils.asSet(item.getMdmItemId());
+            }
         }
         // 1.3 瑙f瀽 virtualFilter锛氳浆鎹负铏氭嫙浠� warehouseId
         Long virtualWarehouseId = null;
@@ -155,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 鍙備笌鍞竴閿級
@@ -172,10 +270,24 @@
                 .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);
-        return newStock;
+        // 3. 閲嶆柊鏌ヨ锛岀‘淇濇嬁鍒版暟鎹簱鐢熸垚鐨勫畬鏁磋褰曪紙id銆乧reateTime 绛夛級
+        MesWmMaterialStockDO inserted = materialStockMapper.selectById(newStock.getId());
+        return inserted != null ? inserted : newStock;
+    }
+
+    @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);
+    }
+
+    @Override
+    public List<MesWmMaterialStockDO> getMaterialStockListByItemAndBatch(Long itemId, Long batchId) {
+        return materialStockMapper.selectListByItemAndBatch(itemId, batchId);
     }
 
     @Override
@@ -185,6 +297,16 @@
         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
@@ -243,20 +365,45 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long adjustMaterialStock(MesWmMaterialStockAdjustReqVO reqVO) {
+    public Long adjustMaterialStockIn(MesWmMaterialStockAdjustReqVO reqVO) {
+        return doAdjustMaterialStock(reqVO, true);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long adjustMaterialStockOut(MesWmMaterialStockAdjustReqVO reqVO) {
+        return doAdjustMaterialStock(reqVO, false);
+    }
+
+    /**
+     * 鎵ц搴撳瓨璋冩暣
+     *
+     * @param reqVO     璋冩暣璇锋眰
+     * @param isInbound 鏄惁涓哄叆搴擄紙true=鍏ュ簱锛宖alse=鍑哄簱锛�
+     * @return 搴撳瓨璁板綍ID
+     */
+    private Long doAdjustMaterialStock(MesWmMaterialStockAdjustReqVO reqVO, boolean isInbound) {
         // 1. 鏍¢獙鐗╂枡瀛樺湪涓斿惎鐢�
         MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
 
-        // 2. 鍒ゆ柇鏄叆搴撹繕鏄嚭搴�
-        BigDecimal quantity = reqVO.getQuantity();
-        if (quantity == null || quantity.compareTo(BigDecimal.ZERO) == 0) {
-            throw exception(WM_MATERIAL_STOCK_QUANTITY_INVALID);
+        // 2. 澶勭悊鎵规锛堜粎鍏ュ簱鏃堕渶瑕佸鐞嗘壒娆★級
+        Long batchId = reqVO.getBatchId();
+        String batchCode = reqVO.getBatchCode();
+        if (isInbound) {
+            MesWmBatchDO batch = resolveBatch(reqVO, item);
+            if (batch != null) {
+                batchId = batch.getId();
+                batchCode = batch.getCode();
+            }
+        } else {
+            // 鍑哄簱鏃舵牎楠屾壒娆″瓨鍦�
+            if (batchId != null) {
+                batchService.validateBatchExists(batchId, reqVO.getItemId());
+            }
         }
-        boolean isInbound = quantity.compareTo(BigDecimal.ZERO) > 0;
-        int bizType = isInbound ? MesBizTypeConstants.WM_STOCK_ADJUST_IN : MesBizTypeConstants.WM_STOCK_ADJUST_OUT;
 
         // 3. 鏍¢獙搴撲綅娣锋斁瑙勫垯
-        checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), reqVO.getBatchId());
+        checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), batchId);
 
         // 4. 鑾峰彇鎴栧垱寤哄簱瀛樿褰�
         MesWmMaterialStockDO stock = getOrCreateMaterialStock(
@@ -264,16 +411,17 @@
                 reqVO.getWarehouseId(),
                 reqVO.getLocationId(),
                 reqVO.getAreaId(),
-                reqVO.getBatchId(),
-                reqVO.getBatchCode(),
+                batchId,
+                batchCode,
                 reqVO.getVendorId(),
                 LocalDateTime.now()
         );
 
-        // 5. 鏇存柊搴撳瓨鏁伴噺锛堝嚭搴撴椂鏍¢獙搴撳瓨鍏呰冻锛�
-        updateMaterialStockQuantity(stock.getId(), quantity, !isInbound);
+        // 5. 璁$畻鍙樺姩鏁伴噺锛氬叆搴撲负姝o紝鍑哄簱涓鸿礋
+        BigDecimal quantity = isInbound ? reqVO.getQuantity() : reqVO.getQuantity().negate();
 
-        // 6. 鍒涘缓搴撳瓨浜嬪姟娴佹按
+        // 6. 鍒涘缓搴撳瓨浜嬪姟娴佹按锛堝唴閮ㄤ細鏇存柊搴撳瓨鏁伴噺锛�
+        int bizType = isInbound ? MesBizTypeConstants.WM_STOCK_ADJUST_IN : MesBizTypeConstants.WM_STOCK_ADJUST_OUT;
         MesWmTransactionSaveReqDTO transaction = new MesWmTransactionSaveReqDTO()
                 .setType(isInbound ? MesWmTransactionTypeEnum.IN.getType() : MesWmTransactionTypeEnum.OUT.getType())
                 .setBizType(bizType)
@@ -282,8 +430,8 @@
                 .setBizLineId(stock.getId())
                 .setItemId(reqVO.getItemId())
                 .setQuantity(quantity)
-                .setBatchId(reqVO.getBatchId())
-                .setBatchCode(reqVO.getBatchCode())
+                .setBatchId(batchId)
+                .setBatchCode(batchCode)
                 .setWarehouseId(reqVO.getWarehouseId())
                 .setLocationId(reqVO.getLocationId())
                 .setAreaId(reqVO.getAreaId())
@@ -295,4 +443,155 @@
         return stock.getId();
     }
 
+    /**
+     * 瑙f瀽鎵规
+     * <p>
+     * 鍏ュ簱鏃剁殑鎵规澶勭悊閫昏緫锛�
+     * 1. 鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭細杩斿洖 null
+     * 2. 浼犲叆 batchId锛氭牎楠屽苟浣跨敤宸叉湁鎵规
+     * 3. 鏈紶 batchId锛氭牴鎹� batchCode 绛夊弬鏁拌嚜鍔ㄥ垱寤烘壒娆�
+     *
+     * @param reqVO 鍏ュ簱璇锋眰
+     * @param item  鐗╂枡淇℃伅
+     * @return 鎵规璁板綍锛堢墿鏂欐湭鍚敤鎵规绠$悊鏃惰繑鍥� null锛�
+     */
+    private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
+        // 1. 鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭紝杩斿洖 null
+        if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
+            return null;
+        }
+
+        // 2. 浼犲叆 batchId锛屾牎楠屽苟杩斿洖宸叉湁鎵规
+        if (reqVO.getBatchId() != null) {
+            return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+        }
+
+        // 3. 鏈紶 batchId锛岃嚜鍔ㄥ垱寤烘壒娆�
+        MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
+                .setItemId(reqVO.getItemId())
+                .setBatchCode(reqVO.getBatchCode())
+                .setVendorId(reqVO.getVendorId())
+                .setProduceDate(reqVO.getProduceDate() != null ? reqVO.getProduceDate().atStartOfDay() : null)
+                .setExpireDate(reqVO.getExpireDate() != null ? reqVO.getExpireDate().atStartOfDay() : null)
+                .setReceiptDate(LocalDateTime.now())
+                .setLotNumber(reqVO.getLotNumber())
+                .setQualityStatus(parseQualityStatus(reqVO.getQualityStatus()));
+        return batchService.getOrGenerateBatchCode(batchReqVO);
+    }
+
+    /**
+     * 瑙f瀽璐ㄩ噺鐘舵�侊紙鏀寔鏁板瓧鎴栧瓧绗︿覆锛�
+     */
+    private Integer parseQualityStatus(Object qualityStatus) {
+        if (qualityStatus == null) {
+            return null;
+        }
+        if (qualityStatus instanceof Integer) {
+            return (Integer) qualityStatus;
+        }
+        if (qualityStatus instanceof String) {
+            String str = (String) qualityStatus;
+            // 鏀寔鏁板瓧瀛楃涓�
+            if (str.matches("\\d+")) {
+                return Integer.parseInt(str);
+            }
+            // 鏀寔甯歌瀛楃涓叉槧灏�
+            switch (str.toUpperCase()) {
+                case "PENDING":
+                case "寰呮楠�":
+                case "寰呮":
+                    return 0;
+                case "PASS":
+                case "QUALIFIED":
+                case "鍚堟牸":
+                    return 1;
+                case "FAIL":
+                case "UNQUALIFIED":
+                case "涓嶅悎鏍�":
+                    return 2;
+                default:
+                    throw new IllegalArgumentException("鏃犳晥鐨勮川閲忕姸鎬�: " + str);
+            }
+        }
+        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