feat（wms）：增加 SKU、仓库、商户删除前的使用校验

YunaiV
1 parent c96487f5
Showing 36 changed files with 736 additions and 24 deletions
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/inventory/WmsInventoryDetailMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderDetailMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/check/WmsCheckOrderMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderDetailMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/movement/WmsMovementOrderMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderDetailMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/receipt/WmsReceiptOrderMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderDetailMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/order/shipment/WmsShipmentOrderMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/DictTypeConstants.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsOrderTypeConstants.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/inventory/WmsInventoryDetailService.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/inventory/WmsInventoryDetailServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/inventory/WmsInventoryServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/item/WmsItemSkuServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderDetailService.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.wms.dal.mysql.inventory;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.module.wms.controller.admin.inventory.vo.detail.WmsInventoryDetailPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.inventory.WmsInventoryDetailDO;
@@ -15,6 +16,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.Collection;
+import java.util.List;
 /**
  * WMS 库存明细 Mapper
@@ -73,4 +76,29 @@ public interface WmsInventoryDetailMapper extends BaseMapperX&lt;WmsInventoryDetail
         throw new IllegalArgumentException("未知库存明细统计维度：" + type);
     }
+    default WmsInventoryDetailDO selectByIdForUpdate(Long id) {
+        return selectOneForUpdate(WmsInventoryDetailDO::getId, id);
+    }
+
+    default List<WmsInventoryDetailDO> selectListByIdsForUpdate(Collection<Long> ids) {
+        return selectList(new LambdaQueryWrapperX<WmsInventoryDetailDO>()
+                .in(WmsInventoryDetailDO::getId, ids)
+                .orderByAsc(WmsInventoryDetailDO::getId)
+                .last("FOR UPDATE"));
+    }
+
+    /**
+     * 增量更新库存明细剩余数量
+     *
+     * @param id       库存明细编号
+     * @param quantity 变更数量
+     * @return 更新行数
+     */
+    @SuppressWarnings("UnusedReturnValue")
+    default int updateRemainQuantityIncr(Long id, BigDecimal quantity) {
+        return update(null, new LambdaUpdateWrapper<WmsInventoryDetailDO>()
+                .eq(WmsInventoryDetailDO::getId, id)
+                .setSql("remain_quantity = remain_quantity + (" + quantity + ")"));
+    }
+
 }
@@ -31,4 +31,12 @@ public interface WmsCheckOrderDetailMapper extends BaseMapperX&lt;WmsCheckOrderDeta
         delete(WmsCheckOrderDetailDO::getOrderId, orderId);
     }
+    default Long selectCountBySkuId(Long skuId) {
+        return selectCount(WmsCheckOrderDetailDO::getSkuId, skuId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(WmsCheckOrderDetailDO::getAreaId, areaId);
+    }
+
 }
@@ -37,4 +37,12 @@ public interface WmsCheckOrderMapper extends BaseMapperX&lt;WmsCheckOrderDO&gt; {
         return selectOne(WmsCheckOrderDO::getNo, no);
     }
+    default Long selectCountByWarehouseId(Long warehouseId) {
+        return selectCount(WmsCheckOrderDO::getWarehouseId, warehouseId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(WmsCheckOrderDO::getAreaId, areaId);
+    }
+
 }
@@ -31,4 +31,14 @@ public interface WmsMovementOrderDetailMapper extends BaseMapperX&lt;WmsMovementOrd
         delete(WmsMovementOrderDetailDO::getOrderId, orderId);
     }
+    default Long selectCountBySkuId(Long skuId) {
+        return selectCount(WmsMovementOrderDetailDO::getSkuId, skuId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(new LambdaQueryWrapperX<WmsMovementOrderDetailDO>()
+                .and(query -> query.eq(WmsMovementOrderDetailDO::getSourceAreaId, areaId)
+                        .or().eq(WmsMovementOrderDetailDO::getTargetAreaId, areaId)));
+    }
+
 }
@@ -37,4 +37,16 @@ public interface WmsMovementOrderMapper extends BaseMapperX&lt;WmsMovementOrderDO&gt; 
         return selectOne(WmsMovementOrderDO::getNo, no);
     }
+    default Long selectCountByWarehouseId(Long warehouseId) {
+        return selectCount(new LambdaQueryWrapperX<WmsMovementOrderDO>()
+                .and(query -> query.eq(WmsMovementOrderDO::getSourceWarehouseId, warehouseId)
+                        .or().eq(WmsMovementOrderDO::getTargetWarehouseId, warehouseId)));
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(new LambdaQueryWrapperX<WmsMovementOrderDO>()
+                .and(query -> query.eq(WmsMovementOrderDO::getSourceAreaId, areaId)
+                        .or().eq(WmsMovementOrderDO::getTargetAreaId, areaId)));
+    }
+
 }
@@ -31,4 +31,12 @@ public interface WmsReceiptOrderDetailMapper extends BaseMapperX&lt;WmsReceiptOrder
         delete(WmsReceiptOrderDetailDO::getOrderId, orderId);
     }
+    default Long selectCountBySkuId(Long skuId) {
+        return selectCount(WmsReceiptOrderDetailDO::getSkuId, skuId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(WmsReceiptOrderDetailDO::getAreaId, areaId);
+    }
+
 }
@@ -39,4 +39,16 @@ public interface WmsReceiptOrderMapper extends BaseMapperX&lt;WmsReceiptOrderDO&gt; {
         return selectOne(WmsReceiptOrderDO::getNo, no);
     }
+    default Long selectCountByMerchantId(Long merchantId) {
+        return selectCount(WmsReceiptOrderDO::getMerchantId, merchantId);
+    }
+
+    default Long selectCountByWarehouseId(Long warehouseId) {
+        return selectCount(WmsReceiptOrderDO::getWarehouseId, warehouseId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(WmsReceiptOrderDO::getAreaId, areaId);
+    }
+
 }
@@ -31,4 +31,12 @@ public interface WmsShipmentOrderDetailMapper extends BaseMapperX&lt;WmsShipmentOrd
         delete(WmsShipmentOrderDetailDO::getOrderId, orderId);
     }
+    default Long selectCountBySkuId(Long skuId) {
+        return selectCount(WmsShipmentOrderDetailDO::getSkuId, skuId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(WmsShipmentOrderDetailDO::getAreaId, areaId);
+    }
+
 }
@@ -39,4 +39,16 @@ public interface WmsShipmentOrderMapper extends BaseMapperX&lt;WmsShipmentOrderDO&gt; 
         return selectOne(WmsShipmentOrderDO::getNo, no);
     }
+    default Long selectCountByMerchantId(Long merchantId) {
+        return selectCount(WmsShipmentOrderDO::getMerchantId, merchantId);
+    }
+
+    default Long selectCountByWarehouseId(Long warehouseId) {
+        return selectCount(WmsShipmentOrderDO::getWarehouseId, warehouseId);
+    }
+
+    default Long selectCountByAreaId(Long areaId) {
+        return selectCount(WmsShipmentOrderDO::getAreaId, areaId);
+    }
+
 }
@@ -12,7 +12,5 @@ public interface DictTypeConstants {
     String RECEIPT_ORDER_TYPE = "wms_receipt_order_type";
     String SHIPMENT_ORDER_TYPE = "wms_shipment_order_type";
     String INVENTORY_HISTORY_TYPE = "wms_inventory_history_type";
-    String MOVEMENT_STATUS = "wms_movement_status";
-    String CHECK_STATUS = "wms_check_status";
 }
@@ -17,12 +17,14 @@ public interface ErrorCodeConstants {
     ErrorCode WAREHOUSE_NAME_DUPLICATE = new ErrorCode(1_060_100_001, "仓库名称重复");
     ErrorCode WAREHOUSE_CODE_DUPLICATE = new ErrorCode(1_060_100_002, "仓库编号重复");
     ErrorCode WAREHOUSE_HAS_AREA = new ErrorCode(1_060_100_003, "删除失败！请先删除该仓库下的库区！");
+    ErrorCode WAREHOUSE_HAS_ORDER = new ErrorCode(1_060_100_004, "删除失败！仓库已被{}使用！");
     // ========== WMS 基础数据-库区 1-060-101-000 ==========
     ErrorCode WAREHOUSE_AREA_NOT_EXISTS = new ErrorCode(1_060_101_000, "库区不存在");
     ErrorCode WAREHOUSE_AREA_NAME_DUPLICATE = new ErrorCode(1_060_101_001, "库区名称重复");
     ErrorCode WAREHOUSE_AREA_CODE_DUPLICATE = new ErrorCode(1_060_101_002, "库区编号重复");
     ErrorCode WAREHOUSE_AREA_NOT_MATCH_WAREHOUSE = new ErrorCode(1_060_101_003, "库区不属于仓库");
+    ErrorCode WAREHOUSE_AREA_HAS_ORDER = new ErrorCode(1_060_101_004, "删除失败！库区已被{}使用！");
     // ========== WMS 基础数据-商品分类 1-060-102-000 ==========
     ErrorCode ITEM_CATEGORY_NOT_EXISTS = new ErrorCode(1_060_102_000, "商品分类不存在");
@@ -44,11 +46,13 @@ public interface ErrorCodeConstants {
     ErrorCode ITEM_SKU_NAME_DUPLICATE = new ErrorCode(1_060_104_003, "商品规格名称【{}】重复");
     ErrorCode ITEM_SKU_NOT_EXISTS = new ErrorCode(1_060_104_004, "商品规格不存在");
     ErrorCode ITEM_SKU_HAS_INVENTORY = new ErrorCode(1_060_104_005, "删除失败！商品规格【{}】已被库存业务使用！");
+    ErrorCode ITEM_SKU_HAS_ORDER = new ErrorCode(1_060_104_006, "删除失败！商品规格【{}】已被{}使用！");
     // ========== WMS 基础数据-往来企业 1-060-105-000 ==========
     ErrorCode MERCHANT_NOT_EXISTS = new ErrorCode(1_060_105_000, "往来企业不存在");
     ErrorCode MERCHANT_NOT_SUPPLIER = new ErrorCode(1_060_105_001, "往来企业必须是供应商或客户/供应商类型");
     ErrorCode MERCHANT_NOT_CUSTOMER = new ErrorCode(1_060_105_002, "往来企业必须是客户或客户/供应商类型");
+    ErrorCode MERCHANT_HAS_ORDER = new ErrorCode(1_060_105_003, "删除失败！往来企业已被{}使用！");
     // ========== WMS 入库单 1-060-200-000 ==========
     ErrorCode RECEIPT_ORDER_NOT_EXISTS = new ErrorCode(1_060_200_000, "入库单不存在");
@@ -68,6 +72,25 @@ public interface ErrorCodeConstants {
     ErrorCode SHIPMENT_ORDER_STATUS_NOT_DELETABLE = new ErrorCode(1_060_201_005, "出库单状态不是草稿或已作废，不能删除");
     ErrorCode SHIPMENT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_201_007, "出库单明细不存在");
+    // ========== WMS 移库单 1-060-202-000 ==========
+    ErrorCode MOVEMENT_ORDER_NOT_EXISTS = new ErrorCode(1_060_202_000, "移库单不存在");
+    ErrorCode MOVEMENT_ORDER_NO_DUPLICATE = new ErrorCode(1_060_202_001, "移库单号重复");
+    ErrorCode MOVEMENT_ORDER_STATUS_NOT_PREPARE = new ErrorCode(1_060_202_002, "移库单状态不是草稿，不能操作");
+    ErrorCode MOVEMENT_ORDER_DETAIL_REQUIRED = new ErrorCode(1_060_202_003, "移库单至少包含一条明细");
+    ErrorCode MOVEMENT_ORDER_AREA_REQUIRED = new ErrorCode(1_060_202_004, "库区模式下，移库单库区不能为空");
+    ErrorCode MOVEMENT_ORDER_STATUS_NOT_DELETABLE = new ErrorCode(1_060_202_005, "移库单状态不是草稿或已作废，不能删除");
+    ErrorCode MOVEMENT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_202_006, "移库单明细不存在");
+    ErrorCode MOVEMENT_ORDER_WAREHOUSE_AREA_SAME = new ErrorCode(1_060_202_007, "来源仓库库区和目标仓库库区不能相同");
+
+    // ========== WMS 盘库单 1-060-203-000 ==========
+    ErrorCode CHECK_ORDER_NOT_EXISTS = new ErrorCode(1_060_203_000, "盘库单不存在");
+    ErrorCode CHECK_ORDER_NO_DUPLICATE = new ErrorCode(1_060_203_001, "盘库单号重复");
+    ErrorCode CHECK_ORDER_STATUS_NOT_PREPARE = new ErrorCode(1_060_203_002, "盘库单状态不是草稿，不能操作");
+    ErrorCode CHECK_ORDER_DETAIL_REQUIRED = new ErrorCode(1_060_203_003, "盘库单至少包含一条明细");
+    ErrorCode CHECK_ORDER_AREA_REQUIRED = new ErrorCode(1_060_203_004, "库区模式下，盘库单库区不能为空");
+    ErrorCode CHECK_ORDER_STATUS_NOT_DELETABLE = new ErrorCode(1_060_203_005, "盘库单状态不是草稿或已作废，不能删除");
+    ErrorCode CHECK_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_203_006, "盘库单明细不存在");
+
     // ========== WMS 库存 1-060-300-000 ==========
     ErrorCode INVENTORY_QUANTITY_NOT_ENOUGH = new ErrorCode(1_060_300_000, "库存不足，当前库存：{}，变更数量：{}");
     ErrorCode INVENTORY_DETAIL_NOT_EXISTS = new ErrorCode(1_060_300_001, "库存明细不存在");
@@ -12,6 +12,13 @@ public final class WmsOrderTypeConstants {
     private WmsOrderTypeConstants() {}
+    // ========== 单据名称 ==========
+
+    public static final String ORDER_NAME_RECEIPT = "入库单";
+    public static final String ORDER_NAME_SHIPMENT = "出库单";
+    public static final String ORDER_NAME_MOVEMENT = "移库单";
+    public static final String ORDER_NAME_CHECK = "盘库单";
+
     // ========== 入库单类型 [100, 200) ==========
     public static final int RECEIPT_PRODUCTION = 100; // 生产入库：WmsReceiptOrderDO
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.wms.service.inventory;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.wms.controller.admin.inventory.vo.detail.WmsInventoryDetailPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.inventory.WmsInventoryDetailDO;
+import cn.iocoder.yudao.module.wms.service.inventory.dto.WmsInventoryChangeReqDTO;
 import java.util.List;
@@ -28,4 +29,11 @@ public interface WmsInventoryDetailService {
      */
     void createInventoryDetailList(List<WmsInventoryDetailDO> list);
+    /**
+     * 扣减库存明细剩余数量
+     *
+     * @param items 库存变更明细列表
+     */
+    void decreaseInventoryDetailList(List<WmsInventoryChangeReqDTO.Item> items);
+
 }
 package cn.iocoder.yudao.module.wms.service.inventory;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.wms.controller.admin.inventory.vo.detail.WmsInventoryDetailPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.inventory.WmsInventoryDetailDO;
 import cn.iocoder.yudao.module.wms.dal.mysql.inventory.WmsInventoryDetailMapper;
+import cn.iocoder.yudao.module.wms.service.inventory.dto.WmsInventoryChangeReqDTO;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.INVENTORY_DETAIL_NOT_EXISTS;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.INVENTORY_DETAIL_REMAIN_QUANTITY_NOT_ENOUGH;
 /**
  * WMS 库存明细 Service 实现类
@@ -38,4 +50,47 @@ public class WmsInventoryDetailServiceImpl implements WmsInventoryDetailService 
         inventoryDetailMapper.insertBatch(list);
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void decreaseInventoryDetailList(List<WmsInventoryChangeReqDTO.Item> items) {
+        if (CollUtil.isEmpty(items)) {
+            return;
+        }
+        if (items.stream().anyMatch(item -> item.getInventoryDetailId() == null)) {
+            throw exception(INVENTORY_DETAIL_NOT_EXISTS);
+        }
+        List<WmsInventoryChangeReqDTO.Item> sortedItems = items.stream()
+                .sorted(Comparator.comparing(WmsInventoryChangeReqDTO.Item::getInventoryDetailId))
+                .toList();
+
+        // 1. 按库存明细编号固定顺序加锁，避免多明细并发扣减时交叉拿锁
+        Map<Long, WmsInventoryDetailDO> detailMap = convertMap(inventoryDetailMapper.selectListByIdsForUpdate(
+                convertSet(sortedItems, WmsInventoryChangeReqDTO.Item::getInventoryDetailId)),
+                WmsInventoryDetailDO::getId);
+
+        // 2. 校验库存明细归属，并合并相同库存明细的扣减数量
+        Map<Long, BigDecimal> decreaseQuantityMap = new LinkedHashMap<>();
+        for (WmsInventoryChangeReqDTO.Item item : sortedItems) {
+            WmsInventoryDetailDO detail = detailMap.get(item.getInventoryDetailId());
+            if (detail == null
+                    || ObjectUtil.notEqual(detail.getSkuId(), item.getSkuId())
+                    || ObjectUtil.notEqual(detail.getWarehouseId(), item.getWarehouseId())
+                    || ObjectUtil.notEqual(detail.getAreaId(), item.getAreaId())) {
+                throw exception(INVENTORY_DETAIL_NOT_EXISTS);
+            }
+            decreaseQuantityMap.merge(detail.getId(), item.getQuantity().abs(), BigDecimal::add);
+        }
+
+        // 3. 校验并扣减库存明细剩余数量
+        for (Map.Entry<Long, BigDecimal> entry : decreaseQuantityMap.entrySet()) {
+            WmsInventoryDetailDO detail = detailMap.get(entry.getKey());
+            BigDecimal decreaseQuantity = entry.getValue();
+            if (detail.getRemainQuantity().compareTo(decreaseQuantity) < 0) {
+                throw exception(INVENTORY_DETAIL_REMAIN_QUANTITY_NOT_ENOUGH,
+                        detail.getRemainQuantity(), decreaseQuantity);
+            }
+            inventoryDetailMapper.updateRemainQuantityIncr(detail.getId(), decreaseQuantity.negate());
+        }
+    }
+
 }
@@ -19,7 +19,13 @@ import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
 /**
  * WMS 库存 Service 实现类
@@ -61,44 +67,72 @@ public class WmsInventoryServiceImpl implements WmsInventoryService {
             return;
         }
-        // 1. 变更库存余额，并构建库存流水与批次库存明细
+        // 1. 按固定顺序变更库存余额，避免多 SKU/仓库并发操作时交叉拿锁
+        Map<WmsInventoryChangeReqDTO.Item, Tuple> resultMap = changeInventoryList(reqDTO.getItems());
+
+        // 2. 构建库存流水与批次库存明细
         boolean batchEnabled = wmsProperties.isBatchEnabled();
         List<WmsInventoryHistoryDO> histories = new ArrayList<>(reqDTO.getItems().size());
         List<WmsInventoryDetailDO> details = batchEnabled ? new ArrayList<>(reqDTO.getItems().size()) : List.of();
+        List<WmsInventoryChangeReqDTO.Item> decreaseItems = batchEnabled ? new ArrayList<>(reqDTO.getItems().size()) : List.of();
         for (WmsInventoryChangeReqDTO.Item item : reqDTO.getItems()) {
-            // 1.1 变更库存余额
-            Tuple result = changeInventory0(item);
-            // 1.2 构建库存流水与批次库存明细
-            histories.add(buildInventoryHistory(reqDTO, item, result));
+            histories.add(buildInventoryHistory(reqDTO, item, resultMap.get(item)));
             if (batchEnabled) {
-                details.add(buildInventoryDetail(reqDTO, item));
+                if (isIncrease(item)) {
+                    details.add(buildInventoryDetail(reqDTO, item));
+                } else {
+                    decreaseItems.add(item);
+                }
             }
         }
-        // 2.1 批量写入库存流水
-        inventoryHistoryService.createInventoryHistoryList(histories);
+        // 3. 按固定顺序变更批次库存明细
         if (batchEnabled) {
-            // 2.2 批量写入批次库存明细
+            inventoryDetailService.decreaseInventoryDetailList(decreaseItems);
             inventoryDetailService.createInventoryDetailList(details);
         }
+
+        // 4. 批量写入库存流水
+        inventoryHistoryService.createInventoryHistoryList(histories);
     }
     /**
-     * 变更库存余额
+     * 批量变更库存余额
      *
-     * @param item 库存变更明细
-     * @return 变更前数量、变更后数量
+     * 按 SKU、仓库、库区固定顺序拿锁；相同库存余额只更新一次，避免同一批操作内反复更新。
+     *
+     * @param items 库存变更明细列表
+     * @return 每条变更明细对应的变更前数量、变更后数量
      */
-    private Tuple changeInventory0(WmsInventoryChangeReqDTO.Item item) {
-        // 1. 获取或创建库存余额，使用 FOR UPDATE 锁定行
-        WmsInventoryDO inventory = getOrCreateInventory(item);
-        // 2. 变更库存余额
-        BigDecimal beforeQuantity = inventory.getQuantity();
-        BigDecimal afterQuantity = beforeQuantity.add(item.getQuantity());
-        inventoryMapper.updateQuantity(inventory.getId(), item.getQuantity());
-        return new Tuple(beforeQuantity, afterQuantity);
-    }
+    private Map<WmsInventoryChangeReqDTO.Item, Tuple> changeInventoryList(List<WmsInventoryChangeReqDTO.Item> items) {
+        List<WmsInventoryChangeReqDTO.Item> sortedItems = sortByInventoryKey(items);
+        Map<WmsInventoryChangeReqDTO.Item, Tuple> resultMap = new IdentityHashMap<>(items.size());
+        for (int i = 0; i < sortedItems.size(); ) {
+            WmsInventoryChangeReqDTO.Item firstItem = sortedItems.get(i);
+            WmsInventoryDO inventory = getOrCreateInventory(firstItem);
+            BigDecimal currentQuantity = inventory.getQuantity();
+            BigDecimal totalChangeQuantity = BigDecimal.ZERO;
+
+            int j = i;
+            while (j < sortedItems.size() && isSameInventoryKey(firstItem, sortedItems.get(j))) {
+                WmsInventoryChangeReqDTO.Item item = sortedItems.get(j);
+                BigDecimal beforeQuantity = currentQuantity;
+                currentQuantity = currentQuantity.add(item.getQuantity());
+                if (currentQuantity.compareTo(BigDecimal.ZERO) < 0) {
+                    throw exception(INVENTORY_QUANTITY_NOT_ENOUGH, beforeQuantity, item.getQuantity());
+                }
+                resultMap.put(item, new Tuple(beforeQuantity, currentQuantity));
+                totalChangeQuantity = totalChangeQuantity.add(item.getQuantity());
+                j++;
+            }
+            if (totalChangeQuantity.compareTo(BigDecimal.ZERO) != 0) {
+                inventoryMapper.updateQuantity(inventory.getId(), totalChangeQuantity);
+            }
+            i = j;
+        }
+        return resultMap;
+    }
     private WmsInventoryDO getOrCreateInventory(WmsInventoryChangeReqDTO.Item item) {
         // 1. 查询库存余额，使用 FOR UPDATE 锁定行
@@ -147,4 +181,23 @@ public class WmsInventoryServiceImpl implements WmsInventoryService {
                 .setOrderId(reqDTO.getOrderId()).setOrderNo(reqDTO.getOrderNo()).setOrderType(reqDTO.getOrderType());
     }
+    private boolean isIncrease(WmsInventoryChangeReqDTO.Item item) {
+        return item.getQuantity().compareTo(BigDecimal.ZERO) > 0;
+    }
+
+    private static List<WmsInventoryChangeReqDTO.Item> sortByInventoryKey(List<WmsInventoryChangeReqDTO.Item> items) {
+        return items.stream()
+                .sorted(Comparator.comparing(WmsInventoryChangeReqDTO.Item::getSkuId)
+                        .thenComparing(WmsInventoryChangeReqDTO.Item::getWarehouseId)
+                        .thenComparing(WmsInventoryChangeReqDTO.Item::getAreaId))
+                .toList();
+    }
+
+    private static boolean isSameInventoryKey(WmsInventoryChangeReqDTO.Item item1,
+                                              WmsInventoryChangeReqDTO.Item item2) {
+        return item1.getSkuId().equals(item2.getSkuId())
+                && item1.getWarehouseId().equals(item2.getWarehouseId())
+                && item1.getAreaId().equals(item2.getAreaId());
+    }
+
 }
@@ -8,6 +8,10 @@ import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.sku.WmsItemSkuSav
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemSkuDO;
 import cn.iocoder.yudao.module.wms.dal.mysql.md.item.WmsItemSkuMapper;
 import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService;
+import cn.iocoder.yudao.module.wms.service.order.check.WmsCheckOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.movement.WmsMovementOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.receipt.WmsReceiptOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.shipment.WmsShipmentOrderDetailService;
 import cn.iocoder.yudao.module.wms.util.WmsUtils;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -23,6 +27,7 @@ import java.util.Set;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeConstants.*;
 /**
  * WMS 商品 SKU Service 实现类
@@ -38,6 +43,18 @@ public class WmsItemSkuServiceImpl implements WmsItemSkuService {
     @Resource
     @Lazy // 延迟加载，避免循环依赖
     private WmsInventoryService inventoryService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsReceiptOrderDetailService receiptOrderDetailService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsShipmentOrderDetailService shipmentOrderDetailService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsMovementOrderDetailService movementOrderDetailService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsCheckOrderDetailService checkOrderDetailService;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -146,12 +163,28 @@ public class WmsItemSkuServiceImpl implements WmsItemSkuService {
             return;
         }
         for (WmsItemSkuDO sku : skus) {
+            validateItemSkuOrderUnused(sku);
             if (inventoryService.getInventoryCountBySkuId(sku.getId()) > 0) {
                 throw exception(ITEM_SKU_HAS_INVENTORY, sku.getName());
             }
         }
     }
+    private void validateItemSkuOrderUnused(WmsItemSkuDO sku) {
+        if (receiptOrderDetailService.getReceiptOrderDetailCountBySkuId(sku.getId()) > 0) {
+            throw exception(ITEM_SKU_HAS_ORDER, sku.getName(), ORDER_NAME_RECEIPT);
+        }
+        if (shipmentOrderDetailService.getShipmentOrderDetailCountBySkuId(sku.getId()) > 0) {
+            throw exception(ITEM_SKU_HAS_ORDER, sku.getName(), ORDER_NAME_SHIPMENT);
+        }
+        if (movementOrderDetailService.getMovementOrderDetailCountBySkuId(sku.getId()) > 0) {
+            throw exception(ITEM_SKU_HAS_ORDER, sku.getName(), ORDER_NAME_MOVEMENT);
+        }
+        if (checkOrderDetailService.getCheckOrderDetailCountBySkuId(sku.getId()) > 0) {
+            throw exception(ITEM_SKU_HAS_ORDER, sku.getName(), ORDER_NAME_CHECK);
+        }
+    }
+
     /**
      * 填充空的条形码
      *
@@ -10,7 +10,10 @@ import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSa
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
 import cn.iocoder.yudao.module.wms.dal.mysql.md.merchant.WmsMerchantMapper;
 import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum;
+import cn.iocoder.yudao.module.wms.service.order.receipt.WmsReceiptOrderService;
+import cn.iocoder.yudao.module.wms.service.order.shipment.WmsShipmentOrderService;
 import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -19,6 +22,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeConstants.*;
 /**
  * WMS 往来企业 Service 实现类
@@ -31,6 +35,12 @@ public class WmsMerchantServiceImpl implements WmsMerchantService {
     @Resource
     private WmsMerchantMapper merchantMapper;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsReceiptOrderService receiptOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsShipmentOrderService shipmentOrderService;
     @Override
     public Long createMerchant(WmsMerchantSaveReqVO createReqVO) {
@@ -53,12 +63,22 @@ public class WmsMerchantServiceImpl implements WmsMerchantService {
     public void deleteMerchant(Long id) {
         // 校验存在
         validateMerchantExists(id);
-        // TODO 入库/出库单实现后，校验往来企业不存在业务关联后再删除
+        // 校验未被单据使用
+        validateMerchantUnused(id);
         // 删除
         merchantMapper.deleteById(id);
     }
+    private void validateMerchantUnused(Long id) {
+        if (receiptOrderService.getReceiptOrderCountByMerchantId(id) > 0) {
+            throw exception(MERCHANT_HAS_ORDER, ORDER_NAME_RECEIPT);
+        }
+        if (shipmentOrderService.getShipmentOrderCountByMerchantId(id) > 0) {
+            throw exception(MERCHANT_HAS_ORDER, ORDER_NAME_SHIPMENT);
+        }
+    }
+
     @Override
     public WmsMerchantDO validateMerchantExists(Long id) {
         WmsMerchantDO merchant = merchantMapper.selectById(id);
@@ -11,7 +11,16 @@ import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWare
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO;
 import cn.iocoder.yudao.module.wms.dal.mysql.md.warehouse.WmsWarehouseAreaMapper;
 import cn.iocoder.yudao.module.wms.framework.config.WmsProperties;
+import cn.iocoder.yudao.module.wms.service.order.check.WmsCheckOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.check.WmsCheckOrderService;
+import cn.iocoder.yudao.module.wms.service.order.movement.WmsMovementOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.movement.WmsMovementOrderService;
+import cn.iocoder.yudao.module.wms.service.order.receipt.WmsReceiptOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.receipt.WmsReceiptOrderService;
+import cn.iocoder.yudao.module.wms.service.order.shipment.WmsShipmentOrderDetailService;
+import cn.iocoder.yudao.module.wms.service.order.shipment.WmsShipmentOrderService;
 import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -21,6 +30,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeConstants.*;
 /**
  * WMS 库区 Service 实现类
@@ -37,6 +47,30 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService {
     private WmsWarehouseService warehouseService;
     @Resource
     private WmsProperties wmsProperties;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsReceiptOrderService receiptOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsReceiptOrderDetailService receiptOrderDetailService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsShipmentOrderService shipmentOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsShipmentOrderDetailService shipmentOrderDetailService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsMovementOrderService movementOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsMovementOrderDetailService movementOrderDetailService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsCheckOrderService checkOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsCheckOrderDetailService checkOrderDetailService;
     @Override
     public Long createWarehouseArea(WmsWarehouseAreaSaveReqVO createReqVO) {
@@ -98,11 +132,32 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService {
         validateAreaEnabled();
         // 校验存在
         validateWarehouseAreaExists(id);
+        // 校验未被单据使用
+        validateWarehouseAreaUnused(id);
         // 删除
         warehouseAreaMapper.deleteById(id);
     }
+    private void validateWarehouseAreaUnused(Long id) {
+        if (receiptOrderService.getReceiptOrderCountByAreaId(id) > 0
+                || receiptOrderDetailService.getReceiptOrderDetailCountByAreaId(id) > 0) {
+            throw exception(WAREHOUSE_AREA_HAS_ORDER, ORDER_NAME_RECEIPT);
+        }
+        if (shipmentOrderService.getShipmentOrderCountByAreaId(id) > 0
+                || shipmentOrderDetailService.getShipmentOrderDetailCountByAreaId(id) > 0) {
+            throw exception(WAREHOUSE_AREA_HAS_ORDER, ORDER_NAME_SHIPMENT);
+        }
+        if (movementOrderService.getMovementOrderCountByAreaId(id) > 0
+                || movementOrderDetailService.getMovementOrderDetailCountByAreaId(id) > 0) {
+            throw exception(WAREHOUSE_AREA_HAS_ORDER, ORDER_NAME_MOVEMENT);
+        }
+        if (checkOrderService.getCheckOrderCountByAreaId(id) > 0
+                || checkOrderDetailService.getCheckOrderDetailCountByAreaId(id) > 0) {
+            throw exception(WAREHOUSE_AREA_HAS_ORDER, ORDER_NAME_CHECK);
+        }
+    }
+
     @Override
     public WmsWarehouseAreaDO validateWarehouseAreaExists(Long id) {
         validateAreaEnabled();
@@ -11,7 +11,12 @@ import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseDO;
 import cn.iocoder.yudao.module.wms.dal.mysql.md.warehouse.WmsWarehouseAreaMapper;
 import cn.iocoder.yudao.module.wms.dal.mysql.md.warehouse.WmsWarehouseMapper;
 import cn.iocoder.yudao.module.wms.framework.config.WmsProperties;
+import cn.iocoder.yudao.module.wms.service.order.check.WmsCheckOrderService;
+import cn.iocoder.yudao.module.wms.service.order.movement.WmsMovementOrderService;
+import cn.iocoder.yudao.module.wms.service.order.receipt.WmsReceiptOrderService;
+import cn.iocoder.yudao.module.wms.service.order.shipment.WmsShipmentOrderService;
 import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -21,6 +26,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeConstants.*;
 /**
  * WMS 仓库 Service 实现类
@@ -37,6 +43,18 @@ public class WmsWarehouseServiceImpl implements WmsWarehouseService {
     private WmsWarehouseAreaMapper warehouseAreaMapper;
     @Resource
     private WmsProperties wmsProperties;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsReceiptOrderService receiptOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsShipmentOrderService shipmentOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsMovementOrderService movementOrderService;
+    @Resource
+    @Lazy // 延迟加载，避免循环依赖
+    private WmsCheckOrderService checkOrderService;
     @Override
     public Long createWarehouse(WmsWarehouseSaveReqVO createReqVO) {
@@ -93,6 +111,8 @@ public class WmsWarehouseServiceImpl implements WmsWarehouseService {
     public void deleteWarehouse(Long id) {
         // 校验存在
         validateWarehouseExists(id);
+        // 校验未被单据使用
+        validateWarehouseUnused(id);
         // 库区模式下，存在库区时不允许删除仓库
         if (wmsProperties.isAreaEnabled() && warehouseAreaMapper.selectCountByWarehouseId(id) > 0) {
             throw exception(WAREHOUSE_HAS_AREA);
@@ -102,6 +122,21 @@ public class WmsWarehouseServiceImpl implements WmsWarehouseService {
         warehouseMapper.deleteById(id);
     }
+    private void validateWarehouseUnused(Long id) {
+        if (receiptOrderService.getReceiptOrderCountByWarehouseId(id) > 0) {
+            throw exception(WAREHOUSE_HAS_ORDER, ORDER_NAME_RECEIPT);
+        }
+        if (shipmentOrderService.getShipmentOrderCountByWarehouseId(id) > 0) {
+            throw exception(WAREHOUSE_HAS_ORDER, ORDER_NAME_SHIPMENT);
+        }
+        if (movementOrderService.getMovementOrderCountByWarehouseId(id) > 0) {
+            throw exception(WAREHOUSE_HAS_ORDER, ORDER_NAME_MOVEMENT);
+        }
+        if (checkOrderService.getCheckOrderCountByWarehouseId(id) > 0) {
+            throw exception(WAREHOUSE_HAS_ORDER, ORDER_NAME_CHECK);
+        }
+    }
+
     @Override
     public WmsWarehouseDO validateWarehouseExists(Long id) {
         WmsWarehouseDO warehouse = warehouseMapper.selectById(id);
@@ -60,4 +60,20 @@ public interface WmsCheckOrderDetailService {
      */
     List<WmsCheckOrderDetailDO> validateCheckOrderDetailListExists(Long orderId);
+    /**
+     * 获得指定 SKU 的盘库单明细数量
+     *
+     * @param skuId SKU 编号
+     * @return 盘库单明细数量
+     */
+    long getCheckOrderDetailCountBySkuId(Long skuId);
+
+    /**
+     * 获得指定库区的盘库单明细数量
+     *
+     * @param areaId 库区编号
+     * @return 盘库单明细数量
+     */
+    long getCheckOrderDetailCountByAreaId(Long areaId);
+
 }
@@ -111,6 +111,16 @@ public class WmsCheckOrderDetailServiceImpl implements WmsCheckOrderDetailServic
         return details;
     }
+    @Override
+    public long getCheckOrderDetailCountBySkuId(Long skuId) {
+        return checkOrderDetailMapper.selectCountBySkuId(skuId);
+    }
+
+    @Override
+    public long getCheckOrderDetailCountByAreaId(Long areaId) {
+        return checkOrderDetailMapper.selectCountByAreaId(areaId);
+    }
+
     private List<WmsCheckOrderDetailDO> buildCheckOrderDetailList(WmsCheckOrderSaveReqVO reqVO) {
         if (CollUtil.isEmpty(reqVO.getDetails())) {
             return ListUtil.of();
@@ -65,4 +65,20 @@ public interface WmsCheckOrderService {
      */
     PageResult<WmsCheckOrderDO> getCheckOrderPage(WmsCheckOrderPageReqVO pageReqVO);
+    /**
+     * 获得指定仓库的盘库单数量
+     *
+     * @param warehouseId 仓库编号
+     * @return 盘库单数量
+     */
+    long getCheckOrderCountByWarehouseId(Long warehouseId);
+
+    /**
+     * 获得指定库区的盘库单数量
+     *
+     * @param areaId 库区编号
+     * @return 盘库单数量
+     */
+    long getCheckOrderCountByAreaId(Long areaId);
+
 }
@@ -129,6 +129,16 @@ public class WmsCheckOrderServiceImpl implements WmsCheckOrderService {
         return checkOrderMapper.selectPage(pageReqVO);
     }
+    @Override
+    public long getCheckOrderCountByWarehouseId(Long warehouseId) {
+        return checkOrderMapper.selectCountByWarehouseId(warehouseId);
+    }
+
+    @Override
+    public long getCheckOrderCountByAreaId(Long areaId) {
+        return checkOrderMapper.selectCountByAreaId(areaId);
+    }
+
     private void validateCheckOrderSaveData(WmsCheckOrderSaveReqVO reqVO) {
         // 校验盘库单号唯一
         validateCheckOrderNoUnique(reqVO.getId(), reqVO.getNo());
@@ -60,4 +60,20 @@ public interface WmsMovementOrderDetailService {
      */
     List<WmsMovementOrderDetailDO> validateMovementOrderDetailListExists(Long orderId);
+    /**
+     * 获得指定 SKU 的移库单明细数量
+     *
+     * @param skuId SKU 编号
+     * @return 移库单明细数量
+     */
+    long getMovementOrderDetailCountBySkuId(Long skuId);
+
+    /**
+     * 获得指定库区的移库单明细数量
+     *
+     * @param areaId 库区编号
+     * @return 移库单明细数量
+     */
+    long getMovementOrderDetailCountByAreaId(Long areaId);
+
 }
@@ -112,6 +112,16 @@ public class WmsMovementOrderDetailServiceImpl implements WmsMovementOrderDetail
         return details;
     }
+    @Override
+    public long getMovementOrderDetailCountBySkuId(Long skuId) {
+        return movementOrderDetailMapper.selectCountBySkuId(skuId);
+    }
+
+    @Override
+    public long getMovementOrderDetailCountByAreaId(Long areaId) {
+        return movementOrderDetailMapper.selectCountByAreaId(areaId);
+    }
+
     private List<WmsMovementOrderDetailDO> buildMovementOrderDetailList(WmsMovementOrderSaveReqVO reqVO) {
         if (CollUtil.isEmpty(reqVO.getDetails())) {
             return ListUtil.of();
@@ -65,4 +65,20 @@ public interface WmsMovementOrderService {
      */
     PageResult<WmsMovementOrderDO> getMovementOrderPage(WmsMovementOrderPageReqVO pageReqVO);
+    /**
+     * 获得指定仓库的移库单数量
+     *
+     * @param warehouseId 仓库编号
+     * @return 移库单数量
+     */
+    long getMovementOrderCountByWarehouseId(Long warehouseId);
+
+    /**
+     * 获得指定库区的移库单数量
+     *
+     * @param areaId 库区编号
+     * @return 移库单数量
+     */
+    long getMovementOrderCountByAreaId(Long areaId);
+
 }
@@ -128,6 +128,16 @@ public class WmsMovementOrderServiceImpl implements WmsMovementOrderService {
         return movementOrderMapper.selectPage(pageReqVO);
     }
+    @Override
+    public long getMovementOrderCountByWarehouseId(Long warehouseId) {
+        return movementOrderMapper.selectCountByWarehouseId(warehouseId);
+    }
+
+    @Override
+    public long getMovementOrderCountByAreaId(Long areaId) {
+        return movementOrderMapper.selectCountByAreaId(areaId);
+    }
+
     private void validateMovementOrderSaveData(WmsMovementOrderSaveReqVO reqVO) {
         // 校验移库单号唯一
         validateMovementOrderNoUnique(reqVO.getId(), reqVO.getNo());
@@ -60,4 +60,20 @@ public interface WmsReceiptOrderDetailService {
      */
     List<WmsReceiptOrderDetailDO> validateReceiptOrderDetailListExists(Long orderId);
+    /**
+     * 获得指定 SKU 的入库单明细数量
+     *
+     * @param skuId SKU 编号
+     * @return 入库单明细数量
+     */
+    long getReceiptOrderDetailCountBySkuId(Long skuId);
+
+    /**
+     * 获得指定库区的入库单明细数量
+     *
+     * @param areaId 库区编号
+     * @return 入库单明细数量
+     */
+    long getReceiptOrderDetailCountByAreaId(Long areaId);
+
 }
@@ -111,6 +111,16 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe
         return details;
     }
+    @Override
+    public long getReceiptOrderDetailCountBySkuId(Long skuId) {
+        return receiptOrderDetailMapper.selectCountBySkuId(skuId);
+    }
+
+    @Override
+    public long getReceiptOrderDetailCountByAreaId(Long areaId) {
+        return receiptOrderDetailMapper.selectCountByAreaId(areaId);
+    }
+
     private List<WmsReceiptOrderDetailDO> buildReceiptOrderDetailList(WmsReceiptOrderSaveReqVO reqVO) {
         if (CollUtil.isEmpty(reqVO.getDetails())) {
             return ListUtil.of();
@@ -65,4 +65,28 @@ public interface WmsReceiptOrderService {
      */
     PageResult<WmsReceiptOrderDO> getReceiptOrderPage(WmsReceiptOrderPageReqVO pageReqVO);
+    /**
+     * 获得指定往来企业的入库单数量
+     *
+     * @param merchantId 往来企业编号
+     * @return 入库单数量
+     */
+    long getReceiptOrderCountByMerchantId(Long merchantId);
+
+    /**
+     * 获得指定仓库的入库单数量
+     *
+     * @param warehouseId 仓库编号
+     * @return 入库单数量
+     */
+    long getReceiptOrderCountByWarehouseId(Long warehouseId);
+
+    /**
+     * 获得指定库区的入库单数量
+     *
+     * @param areaId 库区编号
+     * @return 入库单数量
+     */
+    long getReceiptOrderCountByAreaId(Long areaId);
+
 }
@@ -128,6 +128,21 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService {
         return receiptOrderMapper.selectPage(pageReqVO);
     }
+    @Override
+    public long getReceiptOrderCountByMerchantId(Long merchantId) {
+        return receiptOrderMapper.selectCountByMerchantId(merchantId);
+    }
+
+    @Override
+    public long getReceiptOrderCountByWarehouseId(Long warehouseId) {
+        return receiptOrderMapper.selectCountByWarehouseId(warehouseId);
+    }
+
+    @Override
+    public long getReceiptOrderCountByAreaId(Long areaId) {
+        return receiptOrderMapper.selectCountByAreaId(areaId);
+    }
+
     private void validateReceiptOrderSaveData(WmsReceiptOrderSaveReqVO reqVO) {
         // 校验入库单号唯一
         validateReceiptOrderNoUnique(reqVO.getId(), reqVO.getNo());
@@ -60,4 +60,20 @@ public interface WmsShipmentOrderDetailService {
      */
     List<WmsShipmentOrderDetailDO> validateShipmentOrderDetailListExists(Long orderId);
+    /**
+     * 获得指定 SKU 的出库单明细数量
+     *
+     * @param skuId SKU 编号
+     * @return 出库单明细数量
+     */
+    long getShipmentOrderDetailCountBySkuId(Long skuId);
+
+    /**
+     * 获得指定库区的出库单明细数量
+     *
+     * @param areaId 库区编号
+     * @return 出库单明细数量
+     */
+    long getShipmentOrderDetailCountByAreaId(Long areaId);
+
 }
@@ -111,6 +111,16 @@ public class WmsShipmentOrderDetailServiceImpl implements WmsShipmentOrderDetail
         return details;
     }
+    @Override
+    public long getShipmentOrderDetailCountBySkuId(Long skuId) {
+        return shipmentOrderDetailMapper.selectCountBySkuId(skuId);
+    }
+
+    @Override
+    public long getShipmentOrderDetailCountByAreaId(Long areaId) {
+        return shipmentOrderDetailMapper.selectCountByAreaId(areaId);
+    }
+
     private List<WmsShipmentOrderDetailDO> buildShipmentOrderDetailList(WmsShipmentOrderSaveReqVO reqVO) {
         if (CollUtil.isEmpty(reqVO.getDetails())) {
             return ListUtil.of();
@@ -65,4 +65,28 @@ public interface WmsShipmentOrderService {
      */
     PageResult<WmsShipmentOrderDO> getShipmentOrderPage(WmsShipmentOrderPageReqVO pageReqVO);
+    /**
+     * 获得指定往来企业的出库单数量
+     *
+     * @param merchantId 往来企业编号
+     * @return 出库单数量
+     */
+    long getShipmentOrderCountByMerchantId(Long merchantId);
+
+    /**
+     * 获得指定仓库的出库单数量
+     *
+     * @param warehouseId 仓库编号
+     * @return 出库单数量
+     */
+    long getShipmentOrderCountByWarehouseId(Long warehouseId);
+
+    /**
+     * 获得指定库区的出库单数量
+     *
+     * @param areaId 库区编号
+     * @return 出库单数量
+     */
+    long getShipmentOrderCountByAreaId(Long areaId);
+
 }
@@ -129,6 +129,21 @@ public class WmsShipmentOrderServiceImpl implements WmsShipmentOrderService {
         return shipmentOrderMapper.selectPage(pageReqVO);
     }
+    @Override
+    public long getShipmentOrderCountByMerchantId(Long merchantId) {
+        return shipmentOrderMapper.selectCountByMerchantId(merchantId);
+    }
+
+    @Override
+    public long getShipmentOrderCountByWarehouseId(Long warehouseId) {
+        return shipmentOrderMapper.selectCountByWarehouseId(warehouseId);
+    }
+
+    @Override
+    public long getShipmentOrderCountByAreaId(Long areaId) {
+        return shipmentOrderMapper.selectCountByAreaId(areaId);
+    }
+
     private void validateShipmentOrderSaveData(WmsShipmentOrderSaveReqVO reqVO) {
         // 校验出库单号唯一
         validateShipmentOrderNoUnique(reqVO.getId(), reqVO.getNo());
@@ -3,9 +3,11 @@ package cn.iocoder.yudao.module.wms.service.inventory;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.wms.controller.admin.inventory.vo.WmsInventoryPageReqVO;
+import cn.iocoder.yudao.module.wms.dal.dataobject.inventory.WmsInventoryDetailDO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.inventory.WmsInventoryHistoryDO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.inventory.WmsInventoryDO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemDO;
+import cn.iocoder.yudao.module.wms.dal.mysql.inventory.WmsInventoryDetailMapper;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemSkuDO;
 import cn.iocoder.yudao.module.wms.dal.mysql.inventory.WmsInventoryHistoryMapper;
 import cn.iocoder.yudao.module.wms.dal.mysql.inventory.WmsInventoryMapper;
@@ -19,8 +21,12 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.INVENTORY_DETAIL_REMAIN_QUANTITY_NOT_ENOUGH;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.INVENTORY_QUANTITY_NOT_ENOUGH;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -34,6 +40,8 @@ public class WmsInventoryServiceImplTest extends BaseDbUnitTest {
     @Resource
     private WmsInventoryMapper inventoryMapper;
     @Resource
+    private WmsInventoryDetailMapper inventoryDetailMapper;
+    @Resource
     private WmsInventoryHistoryMapper inventoryHistoryMapper;
     @Resource
     private WmsItemMapper itemMapper;
@@ -97,6 +105,72 @@ public class WmsInventoryServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testChangeInventory_quantityNotEnough() {
+        // mock 数据
+        wmsProperties.setBatchEnable(false);
+        WmsItemDO item = createItem("ITEM-001", "红富士苹果");
+        WmsItemSkuDO sku = createSku(item.getId(), "SKU-001", "10kg 箱装");
+        inventoryMapper.insert(createInventory(sku.getId(), 100L, 1001L, "2.00"));
+        WmsInventoryChangeReqDTO reqDTO = createChangeReq(sku.getId(), 100L, 1001L, "-3.00");
+
+        // 调用，并断言
+        assertServiceException(() -> inventoryService.changeInventory(reqDTO), INVENTORY_QUANTITY_NOT_ENOUGH,
+                new BigDecimal("2.000000"), new BigDecimal("-3.00"));
+    }
+
+    @Test
+    public void testChangeInventory_decreaseInventoryDetail() {
+        // mock 数据
+        wmsProperties.setBatchEnable(true);
+        WmsItemDO item = createItem("ITEM-001", "红富士苹果");
+        WmsItemSkuDO sku = createSku(item.getId(), "SKU-001", "10kg 箱装");
+        inventoryMapper.insert(createInventory(sku.getId(), 100L, 1001L, "10.00"));
+        WmsInventoryDetailDO detail = createInventoryDetail(sku.getId(), 100L, 1001L, "5.00");
+        inventoryDetailMapper.insert(detail);
+        WmsInventoryChangeReqDTO reqDTO = createChangeReq(sku.getId(), 100L, 1001L, "-3.00");
+        reqDTO.getItems().get(0).setInventoryDetailId(detail.getId());
+
+        // 调用
+        inventoryService.changeInventory(reqDTO);
+
+        // 断言：库存余额
+        WmsInventoryDO inventory = inventoryMapper.selectBySkuIdAndWarehouseIdAndAreaId(sku.getId(), 100L, 1001L);
+        assertEquals(0, new BigDecimal("7.00").compareTo(inventory.getQuantity()));
+        // 断言：库存明细
+        WmsInventoryDetailDO dbDetail = inventoryDetailMapper.selectById(detail.getId());
+        assertEquals(0, new BigDecimal("2.00").compareTo(dbDetail.getRemainQuantity()));
+        // 断言：库存流水
+        List<WmsInventoryHistoryDO> histories = inventoryHistoryMapper.selectList();
+        assertEquals(1, histories.size());
+        assertEquals(0, new BigDecimal("-3.00").compareTo(histories.get(0).getQuantity()));
+    }
+
+    @Test
+    public void testChangeInventory_decreaseInventoryDetailRemainQuantityNotEnough() {
+        // mock 数据
+        wmsProperties.setBatchEnable(true);
+        WmsItemDO item = createItem("ITEM-001", "红富士苹果");
+        WmsItemSkuDO sku = createSku(item.getId(), "SKU-001", "10kg 箱装");
+        inventoryMapper.insert(createInventory(sku.getId(), 100L, 1001L, "10.00"));
+        WmsInventoryDetailDO detail = createInventoryDetail(sku.getId(), 100L, 1001L, "5.00");
+        inventoryDetailMapper.insert(detail);
+        WmsInventoryChangeReqDTO reqDTO = createChangeReq(sku.getId(), 100L, 1001L, "-3.00");
+        reqDTO.getItems().get(0).setInventoryDetailId(detail.getId());
+        List<WmsInventoryChangeReqDTO.Item> items = new ArrayList<>(reqDTO.getItems());
+        items.add(new WmsInventoryChangeReqDTO.Item()
+                .setSkuId(sku.getId())
+                .setWarehouseId(100L)
+                .setAreaId(1001L)
+                .setInventoryDetailId(detail.getId())
+                .setQuantity(new BigDecimal("-3.00")));
+        reqDTO.setItems(items);
+
+        // 调用，并断言：相同库存明细会合并后校验
+        assertServiceException(() -> inventoryService.changeInventory(reqDTO),
+                INVENTORY_DETAIL_REMAIN_QUANTITY_NOT_ENOUGH, new BigDecimal("5.000000"), new BigDecimal("6.00"));
+    }
+
+    @Test
     public void testGetInventoryPage_groupByWarehouse() {
         // mock 数据
         WmsItemDO item = createItem("ITEM-001", "红富士苹果");
@@ -191,6 +265,17 @@ public class WmsInventoryServiceImplTest extends BaseDbUnitTest {
                 .build();
     }
+    private static WmsInventoryDetailDO createInventoryDetail(Long skuId, Long warehouseId, Long areaId,
+                                                             String remainQuantity) {
+        return WmsInventoryDetailDO.builder()
+                .skuId(skuId)
+                .warehouseId(warehouseId)
+                .areaId(areaId)
+                .quantity(new BigDecimal(remainQuantity))
+                .remainQuantity(new BigDecimal(remainQuantity))
+                .build();
+    }
+
     private static WmsInventoryChangeReqDTO createChangeReq(Long skuId, Long warehouseId, Long areaId, String quantity) {
         return new WmsInventoryChangeReqDTO()
                 .setOrderId(1L)