feat（wms）：优化入库、出库等订单的完成、取消逻辑，避免并发问题

YunaiV
1 parent 77426402
Showing 13 changed files with 221 additions and 16 deletions
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/WmsMovementOrderMapper.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/WmsShipmentOrderMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImpl.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/inventory/WmsInventoryServiceImplTest.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/check/WmsCheckOrderServiceImplTest.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/movement/WmsMovementOrderServiceImplTest.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImplTest.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.wms.controller.admin.order.check.vo.order.WmsCheckOrderPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.order.check.WmsCheckOrderDO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 /**
@@ -42,4 +43,10 @@ public interface WmsCheckOrderMapper extends BaseMapperX&lt;WmsCheckOrderDO&gt; {
         return selectCount(WmsCheckOrderDO::getWarehouseId, warehouseId);
     }
+    default int updateByIdAndStatus(Long id, Integer status, WmsCheckOrderDO updateObj) {
+        return update(updateObj, new LambdaQueryWrapper<WmsCheckOrderDO>()
+                .eq(WmsCheckOrderDO::getId, id)
+                .eq(WmsCheckOrderDO::getStatus, status));
+    }
+
 }
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.wms.controller.admin.order.movement.vo.order.WmsMovementOrderPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.order.movement.WmsMovementOrderDO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 /**
@@ -43,4 +44,10 @@ public interface WmsMovementOrderMapper extends BaseMapperX&lt;WmsMovementOrderDO&gt; 
                         .or().eq(WmsMovementOrderDO::getTargetWarehouseId, warehouseId)));
     }
+    default int updateByIdAndStatus(Long id, Integer status, WmsMovementOrderDO updateObj) {
+        return update(updateObj, new LambdaQueryWrapper<WmsMovementOrderDO>()
+                .eq(WmsMovementOrderDO::getId, id)
+                .eq(WmsMovementOrderDO::getStatus, status));
+    }
+
 }
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 /**
@@ -47,4 +48,10 @@ public interface WmsReceiptOrderMapper extends BaseMapperX&lt;WmsReceiptOrderDO&gt; {
         return selectCount(WmsReceiptOrderDO::getWarehouseId, warehouseId);
     }
+    default int updateByIdAndStatus(Long id, Integer status, WmsReceiptOrderDO updateObj) {
+        return update(updateObj, new LambdaQueryWrapper<WmsReceiptOrderDO>()
+                .eq(WmsReceiptOrderDO::getId, id)
+                .eq(WmsReceiptOrderDO::getStatus, status));
+    }
+
 }
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.wms.controller.admin.order.shipment.vo.order.WmsShipmentOrderPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.order.shipment.WmsShipmentOrderDO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 /**
@@ -47,4 +48,10 @@ public interface WmsShipmentOrderMapper extends BaseMapperX&lt;WmsShipmentOrderDO&gt; 
         return selectCount(WmsShipmentOrderDO::getWarehouseId, warehouseId);
     }
+    default int updateByIdAndStatus(Long id, Integer status, WmsShipmentOrderDO updateObj) {
+        return update(updateObj, new LambdaQueryWrapper<WmsShipmentOrderDO>()
+                .eq(WmsShipmentOrderDO::getId, id)
+                .eq(WmsShipmentOrderDO::getStatus, status));
+    }
+
 }
@@ -102,8 +102,10 @@ public class WmsCheckOrderServiceImpl implements WmsCheckOrderService {
         List<WmsCheckOrderDetailDO> details = checkOrderDetailService.validateCheckOrderDetailListExists(id);
         // 2. 完成盘库单
-        checkOrderMapper.updateById(new WmsCheckOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.FINISHED.getStatus()));
+        if (checkOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsCheckOrderDO().setStatus(WmsOrderStatusEnum.FINISHED.getStatus())) == 0) {
+            throw exception(CHECK_ORDER_STATUS_NOT_PREPARE);
+        }
         // 3. 盘点库存
         changeInventory(order, details);
@@ -116,8 +118,10 @@ public class WmsCheckOrderServiceImpl implements WmsCheckOrderService {
         validateCheckOrderPrepare(id);
         // 2. 作废盘库单
-        checkOrderMapper.updateById(new WmsCheckOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+        if (checkOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsCheckOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus())) == 0) {
+            throw exception(CHECK_ORDER_STATUS_NOT_PREPARE);
+        }
     }
     @Override
@@ -102,8 +102,10 @@ public class WmsMovementOrderServiceImpl implements WmsMovementOrderService {
         List<WmsMovementOrderDetailDO> details = movementOrderDetailService.validateMovementOrderDetailListExists(id);
         // 2. 完成移库单
-        movementOrderMapper.updateById(new WmsMovementOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.FINISHED.getStatus()));
+        if (movementOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsMovementOrderDO().setStatus(WmsOrderStatusEnum.FINISHED.getStatus())) == 0) {
+            throw exception(MOVEMENT_ORDER_STATUS_NOT_PREPARE);
+        }
         // 3. 移动库存
         changeInventory(order, details);
@@ -116,8 +118,10 @@ public class WmsMovementOrderServiceImpl implements WmsMovementOrderService {
         validateMovementOrderPrepare(id);
         // 2. 作废移库单
-        movementOrderMapper.updateById(new WmsMovementOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+        if (movementOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsMovementOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus())) == 0) {
+            throw exception(MOVEMENT_ORDER_STATUS_NOT_PREPARE);
+        }
     }
     @Override
@@ -105,8 +105,10 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService {
         List<WmsReceiptOrderDetailDO> details = receiptOrderDetailService.validateReceiptOrderDetailListExists(id);
         // 2. 完成入库单
-        receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.FINISHED.getStatus()));
+        if (receiptOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsReceiptOrderDO().setStatus(WmsOrderStatusEnum.FINISHED.getStatus())) == 0) {
+            throw exception(RECEIPT_ORDER_STATUS_NOT_PREPARE);
+        }
         // 3. 写入库存
         createInventory(order, details);
@@ -119,8 +121,10 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService {
         validateReceiptOrderPrepare(id);
         // 2. 作废入库单
-        receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+        if (receiptOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsReceiptOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus())) == 0) {
+            throw exception(RECEIPT_ORDER_STATUS_NOT_PREPARE);
+        }
     }
     @Override
@@ -105,8 +105,10 @@ public class WmsShipmentOrderServiceImpl implements WmsShipmentOrderService {
         List<WmsShipmentOrderDetailDO> details = shipmentOrderDetailService.validateShipmentOrderDetailListExists(id);
         // 2. 完成出库单
-        shipmentOrderMapper.updateById(new WmsShipmentOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.FINISHED.getStatus()));
+        if (shipmentOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsShipmentOrderDO().setStatus(WmsOrderStatusEnum.FINISHED.getStatus())) == 0) {
+            throw exception(SHIPMENT_ORDER_STATUS_NOT_PREPARE);
+        }
         // 3. 扣减库存
         changeInventory(order, details);
@@ -119,8 +121,10 @@ public class WmsShipmentOrderServiceImpl implements WmsShipmentOrderService {
         validateShipmentOrderPrepare(id);
         // 2. 作废出库单
-        shipmentOrderMapper.updateById(new WmsShipmentOrderDO().setId(id)
-                .setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+        if (shipmentOrderMapper.updateByIdAndStatus(id, WmsOrderStatusEnum.PREPARE.getStatus(),
+                new WmsShipmentOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus())) == 0) {
+            throw exception(SHIPMENT_ORDER_STATUS_NOT_PREPARE);
+        }
     }
     @Override
@@ -320,6 +320,30 @@ public class WmsInventoryServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testGetInventoryPage_onlyPositiveQuantity() {
+        // mock 数据
+        WmsItemDO item = createItem("ITEM-001", "红富士苹果");
+        WmsItemSkuDO sku = createSku(item.getId(), "SKU-001", "10kg 箱装");
+        inventoryMapper.insert(createInventory(sku.getId(), 100L, "0.00"));
+        inventoryMapper.insert(createInventory(sku.getId(), 200L, "0.01"));
+        inventoryMapper.insert(createInventory(sku.getId(), 300L, "1.00"));
+        // 准备参数
+        WmsInventoryPageReqVO reqVO = new WmsInventoryPageReqVO();
+        reqVO.setType(WmsInventoryPageReqVO.TYPE_WAREHOUSE);
+        reqVO.setOnlyPositiveQuantity(true);
+
+        // 调用
+        PageResult<WmsInventoryDO> pageResult = inventoryService.getInventoryPage(reqVO);
+        // 断言
+        assertEquals(2, pageResult.getTotal());
+        assertEquals(2, pageResult.getList().size());
+        assertEquals(200L, pageResult.getList().get(0).getWarehouseId());
+        assertEquals(0, new BigDecimal("0.01").compareTo(pageResult.getList().get(0).getQuantity()));
+        assertEquals(300L, pageResult.getList().get(1).getWarehouseId());
+        assertEquals(0, new BigDecimal("1.00").compareTo(pageResult.getList().get(1).getQuantity()));
+    }
+
+    @Test
     public void testGetInventoryPage_sku() {
         // mock 数据
         WmsItemDO item = createItem("ITEM-001", "红富士苹果");
@@ -27,6 +27,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.CHECK_ORDER_DETAIL_REQUIRED;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.CHECK_ORDER_STATUS_NOT_DELETABLE;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.CHECK_ORDER_STATUS_NOT_PREPARE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -162,6 +163,23 @@ public class WmsCheckOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testCompleteCheckOrder_duplicateComplete() {
+        // mock 数据
+        WmsCheckOrderDO order = createCheckOrder(100L);
+        checkOrderMapper.insert(order);
+        checkOrderDetailMapper.insert(createCheckOrderDetail(order.getId(), 200L, 100L,
+                "10.00", "7.00"));
+
+        // 调用
+        checkOrderService.completeCheckOrder(order.getId());
+
+        // 调用，并断言：二次完成不能再次写库存
+        assertServiceException(() -> checkOrderService.completeCheckOrder(order.getId()),
+                CHECK_ORDER_STATUS_NOT_PREPARE);
+        verify(inventoryService).changeInventory(any());
+    }
+
+    @Test
     public void testCancelCheckOrder_success() {
         // mock 数据
         WmsCheckOrderDO order = createCheckOrder(100L);
@@ -178,6 +196,23 @@ public class WmsCheckOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testUpdateByIdAndStatus_statusNotMatch() {
+        // mock 数据
+        WmsCheckOrderDO order = createCheckOrder(100L);
+        checkOrderMapper.insert(order);
+
+        // 调用
+        int updateCount = checkOrderMapper.updateByIdAndStatus(order.getId(),
+                WmsOrderStatusEnum.FINISHED.getStatus(),
+                new WmsCheckOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+
+        // 断言
+        assertEquals(0, updateCount);
+        assertEquals(WmsOrderStatusEnum.PREPARE.getStatus(),
+                checkOrderMapper.selectById(order.getId()).getStatus());
+    }
+
+    @Test
     public void testDeleteCheckOrder_canceled() {
         // mock 数据
         WmsCheckOrderDO order = createCheckOrder(100L).setStatus(WmsOrderStatusEnum.CANCELED.getStatus());
@@ -26,6 +26,7 @@ import java.util.Arrays;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_DETAIL_REQUIRED;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_STATUS_NOT_DELETABLE;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_STATUS_NOT_PREPARE;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MOVEMENT_ORDER_WAREHOUSE_SAME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -136,6 +137,22 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testCompleteMovementOrder_duplicateComplete() {
+        // mock 数据
+        WmsMovementOrderDO order = createMovementOrder(100L, 200L);
+        movementOrderMapper.insert(order);
+        movementOrderDetailMapper.insert(createMovementOrderDetail(order.getId(), 300L, 100L, 200L));
+
+        // 调用
+        movementOrderService.completeMovementOrder(order.getId());
+
+        // 调用，并断言：二次完成不能再次写库存
+        assertServiceException(() -> movementOrderService.completeMovementOrder(order.getId()),
+                MOVEMENT_ORDER_STATUS_NOT_PREPARE);
+        verify(inventoryService).changeInventory(any());
+    }
+
+    @Test
     public void testCreateMovementOrder_sameWarehouse() {
         // 准备参数
         WmsMovementOrderSaveReqVO reqVO = createMovementOrderReqVO(100L, 100L);
@@ -162,6 +179,23 @@ public class WmsMovementOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testUpdateByIdAndStatus_statusNotMatch() {
+        // mock 数据
+        WmsMovementOrderDO order = createMovementOrder(100L, 200L);
+        movementOrderMapper.insert(order);
+
+        // 调用
+        int updateCount = movementOrderMapper.updateByIdAndStatus(order.getId(),
+                WmsOrderStatusEnum.FINISHED.getStatus(),
+                new WmsMovementOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+
+        // 断言
+        assertEquals(0, updateCount);
+        assertEquals(WmsOrderStatusEnum.PREPARE.getStatus(),
+                movementOrderMapper.selectById(order.getId()).getStatus());
+    }
+
+    @Test
     public void testDeleteMovementOrder_canceled() {
         // mock 数据
         WmsMovementOrderDO order = createMovementOrder(100L, 200L).setStatus(WmsOrderStatusEnum.CANCELED.getStatus());
@@ -27,6 +27,7 @@ import java.util.Arrays;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_REQUIRED;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_STATUS_NOT_PREPARE;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_STATUS_NOT_DELETABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -134,6 +135,22 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testCompleteReceiptOrder_duplicateComplete() {
+        // mock 数据
+        WmsReceiptOrderDO order = createReceiptOrder(100L);
+        receiptOrderMapper.insert(order);
+        receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), 200L, 100L));
+
+        // 调用
+        receiptOrderService.completeReceiptOrder(order.getId());
+
+        // 调用，并断言：二次完成不能再次写库存
+        assertServiceException(() -> receiptOrderService.completeReceiptOrder(order.getId()),
+                RECEIPT_ORDER_STATUS_NOT_PREPARE);
+        verify(inventoryService).changeInventory(any());
+    }
+
+    @Test
     public void testCancelReceiptOrder_success() {
         // mock 数据
         WmsReceiptOrderDO order = createReceiptOrder(100L);
@@ -150,6 +167,23 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testUpdateByIdAndStatus_statusNotMatch() {
+        // mock 数据
+        WmsReceiptOrderDO order = createReceiptOrder(100L);
+        receiptOrderMapper.insert(order);
+
+        // 调用
+        int updateCount = receiptOrderMapper.updateByIdAndStatus(order.getId(),
+                WmsOrderStatusEnum.FINISHED.getStatus(),
+                new WmsReceiptOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+
+        // 断言
+        assertEquals(0, updateCount);
+        assertEquals(WmsOrderStatusEnum.PREPARE.getStatus(),
+                receiptOrderMapper.selectById(order.getId()).getStatus());
+    }
+
+    @Test
     public void testDeleteReceiptOrder_canceled() {
         // mock 数据
         WmsReceiptOrderDO order = createReceiptOrder(100L).setStatus(WmsOrderStatusEnum.CANCELED.getStatus());
@@ -28,6 +28,7 @@ import java.util.Arrays;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.SHIPMENT_ORDER_DETAIL_REQUIRED;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.SHIPMENT_ORDER_STATUS_NOT_DELETABLE;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.SHIPMENT_ORDER_STATUS_NOT_PREPARE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -134,6 +135,22 @@ public class WmsShipmentOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testCompleteShipmentOrder_duplicateComplete() {
+        // mock 数据
+        WmsShipmentOrderDO order = createShipmentOrder(100L);
+        shipmentOrderMapper.insert(order);
+        shipmentOrderDetailMapper.insert(createShipmentOrderDetail(order.getId(), 200L, 100L));
+
+        // 调用
+        shipmentOrderService.completeShipmentOrder(order.getId());
+
+        // 调用，并断言：二次完成不能再次写库存
+        assertServiceException(() -> shipmentOrderService.completeShipmentOrder(order.getId()),
+                SHIPMENT_ORDER_STATUS_NOT_PREPARE);
+        verify(inventoryService).changeInventory(any());
+    }
+
+    @Test
     public void testCancelShipmentOrder_success() {
         // mock 数据
         WmsShipmentOrderDO order = createShipmentOrder(100L);
@@ -150,6 +167,23 @@ public class WmsShipmentOrderServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testUpdateByIdAndStatus_statusNotMatch() {
+        // mock 数据
+        WmsShipmentOrderDO order = createShipmentOrder(100L);
+        shipmentOrderMapper.insert(order);
+
+        // 调用
+        int updateCount = shipmentOrderMapper.updateByIdAndStatus(order.getId(),
+                WmsOrderStatusEnum.FINISHED.getStatus(),
+                new WmsShipmentOrderDO().setStatus(WmsOrderStatusEnum.CANCELED.getStatus()));
+
+        // 断言
+        assertEquals(0, updateCount);
+        assertEquals(WmsOrderStatusEnum.PREPARE.getStatus(),
+                shipmentOrderMapper.selectById(order.getId()).getStatus());
+    }
+
+    @Test
     public void testDeleteShipmentOrder_canceled() {
         // mock 数据
         WmsShipmentOrderDO order = createShipmentOrder(100L).setStatus(WmsOrderStatusEnum.CANCELED.getStatus());