feat（wms）：修复只能删除作废的入库单的问题

YunaiV
1 parent 076de400
Showing 5 changed files with 99 additions and 10 deletions
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/WmsOrderStatusEnum.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/order/receipt/WmsReceiptOrderServiceImpl.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java
@@ -55,6 +55,7 @@ public interface ErrorCodeConstants {
     ErrorCode RECEIPT_ORDER_STATUS_NOT_PREPARE = new ErrorCode(1_060_200_002, "入库单状态不是草稿，不能操作");
     ErrorCode RECEIPT_ORDER_DETAIL_REQUIRED = new ErrorCode(1_060_200_003, "入库单至少包含一条明细");
     ErrorCode RECEIPT_ORDER_AREA_REQUIRED = new ErrorCode(1_060_200_004, "库区模式下，入库单库区不能为空");
+    ErrorCode RECEIPT_ORDER_STATUS_NOT_DELETABLE = new ErrorCode(1_060_200_005, "入库单状态不是草稿或已作废，不能删除");
     ErrorCode RECEIPT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_200_007, "入库单明细不存在");
  
 }
+package cn.iocoder.yudao.module.wms.enums.order;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * WMS 单据状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum WmsOrderStatusEnum implements ArrayValuable<Integer> {
+
+    PREPARE(0, "草稿"),
+    FINISHED(4, "已完成"),
+    CANCELED(5, "已作废");
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(WmsOrderStatusEnum::getStatus)
+            .toArray(Integer[]::new);
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 名称
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}
+package cn.iocoder.yudao.module.wms.enums.order;
+
+/**
+ * WMS 单据类型常量
+ *
+ * 集中管理业务类型枚举的编号，按业务域分段。
+ * 各枚举类引用此处常量，避免硬编码数字。（也避免冲突！！！）
+ *
+ * @author 芋道源码
+ */
+public final class WmsOrderTypeConstants {
+
+    private WmsOrderTypeConstants() {}
+
+    // ========== 入库单类型 [100, 200) ==========
+
+    public static final int RECEIPT_PRODUCTION = 100; // 生产入库：WmsReceiptOrderDO
+    public static final int RECEIPT_PURCHASE = 101; // 采购入库：WmsReceiptOrderDO
+    public static final int RECEIPT_RETURN = 102; // 退货入库：WmsReceiptOrderDO
+    public static final int RECEIPT_GIVE_BACK = 103; // 归还入库：WmsReceiptOrderDO
+
+}
@@ -78,8 +78,12 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteReceiptOrder(Long id) {
-        // 1. 校验存在，且草稿
-        validateReceiptOrderPrepare(id);
+        // 1. 校验存在，且可删除
+        WmsReceiptOrderDO order = validateReceiptOrderExists(id);
+        if (ObjectUtil.notEqual(order.getStatus(), WmsOrderStatusEnum.PREPARE.getStatus())
+                && ObjectUtil.notEqual(order.getStatus(), WmsOrderStatusEnum.CANCELED.getStatus())) {
+            throw exception(RECEIPT_ORDER_STATUS_NOT_DELETABLE);
+        }
  
         // 2.1 删除入库单
         receiptOrderMapper.deleteById(id);
@@ -130,7 +134,9 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService {
         // 校验仓库存在
         warehouseService.validateWarehouseExists(reqVO.getWarehouseId());
         // 校验供应商类型
-        validateReceiptOrderMerchant(reqVO.getMerchantId());
+        if (reqVO.getMerchantId() != null) {
+            merchantService.validateSupplierMerchantExists(reqVO.getMerchantId());
+        }
     }
  
     private void validateReceiptOrderNoUnique(Long id, String no) {
@@ -165,13 +171,6 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService {
         return order;
     }
  
-    private void validateReceiptOrderMerchant(Long merchantId) {
-        if (merchantId == null) {
-            return;
-        }
-        merchantService.validateSupplierMerchantExists(merchantId);
-    }
-
     private void createInventory(WmsReceiptOrderDO order, List<WmsReceiptOrderDetailDO> details) {
         List<WmsInventoryChangeReqDTO.Item> items = convertList(details,
                 detail -> BeanUtils.toBean(detail, WmsInventoryChangeReqDTO.Item.class));
@@ -26,8 +26,10 @@ import java.math.BigDecimal;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_AREA_REQUIRED;
 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_DELETABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -124,6 +126,32 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest {
         verify(inventoryService, never()).changeInventory(any());
     }
  
+    @Test
+    public void testDeleteReceiptOrder_canceled() {
+        // mock 数据
+        WmsReceiptOrderDO order = createReceiptOrder(100L).setStatus(WmsOrderStatusEnum.CANCELED.getStatus());
+        receiptOrderMapper.insert(order);
+        receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), 200L, 100L, 300L));
+
+        // 调用
+        receiptOrderService.deleteReceiptOrder(order.getId());
+
+        // 断言
+        assertNull(receiptOrderMapper.selectById(order.getId()));
+        assertEquals(0, receiptOrderDetailMapper.selectListByOrderId(order.getId()).size());
+    }
+
+    @Test
+    public void testDeleteReceiptOrder_finished() {
+        // mock 数据
+        WmsReceiptOrderDO order = createReceiptOrder(100L).setStatus(WmsOrderStatusEnum.FINISHED.getStatus());
+        receiptOrderMapper.insert(order);
+
+        // 调用，并断言
+        assertServiceException(() -> receiptOrderService.deleteReceiptOrder(order.getId()),
+                RECEIPT_ORDER_STATUS_NOT_DELETABLE);
+    }
+
     private static WmsReceiptOrderDO createReceiptOrder(Long warehouseId) {
         return new WmsReceiptOrderDO()
                 .setNo("RK202605120001")