diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java index e6db2a8..ad60e25 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderStatusEnum; +import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum; import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -25,7 +25,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam { private String no; @Schema(description = "单据状态", example = "0") - @InEnum(WmsReceiptOrderStatusEnum.class) + @InEnum(WmsOrderStatusEnum.class) private Integer status; @Schema(description = "仓库编号", example = "1024") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java index 29412dd..853dc19 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java @@ -32,7 +32,7 @@ public class WmsReceiptOrderRespVO { @Schema(description = "入库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") @ExcelProperty(value = "入库状态", converter = DictConvert.class) - @DictFormat(DictTypeConstants.RECEIPT_ORDER_STATUS) + @DictFormat(DictTypeConstants.ORDER_STATUS) private Integer status; @Schema(description = "业务单号", example = "PO202605110001") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java index c9e854e..9c2f249 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java @@ -48,7 +48,8 @@ public class WmsReceiptOrderSaveReqVO { @Schema(description = "库区编号", example = "1024") private Long areaId; - @Schema(description = "入库数量", example = "100.00") + @Schema(description = "入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") + @NotNull(message = "入库数量不能为空") private BigDecimal totalQuantity; @Schema(description = "总金额", example = "1000.00") diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/warehouse/WmsWarehouseAreaDO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/warehouse/WmsWarehouseAreaDO.java index 0312a4a..9ca980d 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/warehouse/WmsWarehouseAreaDO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/warehouse/WmsWarehouseAreaDO.java @@ -22,6 +22,11 @@ import lombok.*; public class WmsWarehouseAreaDO extends BaseDO { /** + * 空库区编号 + */ + public static final Long ID_EMPTY = 0L; + + /** * 主键编号 */ @TableId diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java index 3a66f14..575a9e5 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java @@ -45,7 +45,7 @@ public class WmsReceiptOrderDO extends BaseDO { /** * 入库状态 * - * 字典 {@link DictTypeConstants#RECEIPT_ORDER_STATUS} + * 字典 {@link DictTypeConstants#ORDER_STATUS} */ private Integer status; /** diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/DictTypeConstants.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/DictTypeConstants.java index 9fe1cd6..8fe51bb 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/DictTypeConstants.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/DictTypeConstants.java @@ -8,7 +8,7 @@ package cn.iocoder.yudao.module.wms.enums; public interface DictTypeConstants { String MERCHANT_TYPE = "merchant_type"; - String RECEIPT_ORDER_STATUS = "wms_receipt_order_status"; + String ORDER_STATUS = "wms_order_status"; String RECEIPT_ORDER_TYPE = "wms_receipt_order_type"; String SHIPMENT_STATUS = "wms_shipment_status"; String SHIPMENT_TYPE = "wms_shipment_type"; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java index af999bd..cbcc89d 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java @@ -22,6 +22,7 @@ public interface ErrorCodeConstants { 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, "库区不属于仓库"); // ========== WMS 基础数据-商品分类 1-060-102-000 ========== ErrorCode ITEM_CATEGORY_NOT_EXISTS = new ErrorCode(1_060_102_000, "商品分类不存在"); @@ -46,16 +47,14 @@ public interface ErrorCodeConstants { // ========== 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, "往来企业必须是供应商或客户/供应商类型"); // ========== WMS 入库单 1-060-200-000 ========== ErrorCode RECEIPT_ORDER_NOT_EXISTS = new ErrorCode(1_060_200_000, "入库单不存在"); ErrorCode RECEIPT_ORDER_NO_DUPLICATE = new ErrorCode(1_060_200_001, "入库单号重复"); - ErrorCode RECEIPT_ORDER_STATUS_NOT_PENDING = new ErrorCode(1_060_200_002, "入库单状态不是暂存,不能操作"); + 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_AREA_NOT_MATCH_WAREHOUSE = new ErrorCode(1_060_200_005, "库区不属于入库仓库"); - ErrorCode RECEIPT_ORDER_COMPLETED_CANNOT_DELETE = new ErrorCode(1_060_200_006, "入库单已完成,不能删除"); ErrorCode RECEIPT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_200_007, "入库单明细不存在"); - ErrorCode RECEIPT_ORDER_MERCHANT_NOT_SUPPLIER = new ErrorCode(1_060_200_008, "入库单供应商必须选择供应商或客户/供应商类型的往来企业"); } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderStatusEnum.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderStatusEnum.java deleted file mode 100644 index 4548b84..0000000 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderStatusEnum.java +++ /dev/null @@ -1,38 +0,0 @@ -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 WmsReceiptOrderStatusEnum implements ArrayValuable { - - CANCELED(-1, "作废"), - PENDING(0, "暂存"), - COMPLETED(1, "完成入库"); - - public static final Integer[] ARRAYS = Arrays.stream(values()).map(WmsReceiptOrderStatusEnum::getStatus).toArray(Integer[]::new); - - /** - * 状态 - */ - private final Integer status; - /** - * 名称 - */ - private final String name; - - @Override - public Integer[] array() { - return ARRAYS; - } - -} diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java index 61d6210..5c087d3 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java @@ -50,6 +50,14 @@ public interface WmsMerchantService { WmsMerchantDO validateMerchantExists(Long id); /** + * 校验供应商存在 + * + * @param id 编号 + * @return 往来企业 + */ + WmsMerchantDO validateSupplierMerchantExists(Long id); + + /** * 获得往来企业 * * @param id 编号 diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java index 17faa8b..5f555af 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java @@ -2,12 +2,14 @@ package cn.iocoder.yudao.module.wms.service.md.merchant; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO; import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO; 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 jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -16,7 +18,7 @@ import java.util.Collection; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MERCHANT_NOT_EXISTS; +import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; /** * WMS 往来企业 Service 实现类 @@ -67,6 +69,16 @@ public class WmsMerchantServiceImpl implements WmsMerchantService { } @Override + public WmsMerchantDO validateSupplierMerchantExists(Long id) { + WmsMerchantDO merchant = validateMerchantExists(id); + if (ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.SUPPLIER.getType()) + && ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.CUSTOMER_SUPPLIER.getType())) { + throw exception(MERCHANT_NOT_SUPPLIER); + } + return merchant; + } + + @Override public WmsMerchantDO getMerchant(Long id) { return merchantMapper.selectById(id); } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaService.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaService.java index 45a323f..3180762 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaService.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaService.java @@ -50,6 +50,15 @@ public interface WmsWarehouseAreaService { WmsWarehouseAreaDO validateWarehouseAreaExists(Long id); /** + * 校验并标准化库区编号 + * + * @param id 库区编号 + * @param warehouseId 仓库编号 + * @return 库区编号;未启用库区模式或为空时,返回 {@link WmsWarehouseAreaDO#ID_EMPTY} + */ + Long validateAndNormalizeWarehouseAreaId(Long id, Long warehouseId); + + /** * 获得库区 * * @param id 编号 diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaServiceImpl.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaServiceImpl.java index 05ba018..1a0f00b 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaServiceImpl.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaServiceImpl.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.wms.service.md.warehouse; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWarehouseAreaPageReqVO; import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWarehouseAreaSaveReqVO; import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; @@ -74,7 +75,7 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { if (area == null) { return; } - if (ObjUtil.notEqual(area.getId(), id)) { + if (ObjectUtil.notEqual(area.getId(), id)) { throw exception(WAREHOUSE_AREA_NAME_DUPLICATE); } } @@ -87,7 +88,7 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { if (area == null) { return; } - if (ObjUtil.notEqual(area.getId(), id)) { + if (ObjectUtil.notEqual(area.getId(), id)) { throw exception(WAREHOUSE_AREA_CODE_DUPLICATE); } } @@ -113,6 +114,21 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { } @Override + public Long validateAndNormalizeWarehouseAreaId(Long id, Long warehouseId) { + if (!wmsProperties.isAreaEnabled()) { + return WmsWarehouseAreaDO.ID_EMPTY; + } + if (ObjectUtils.equalsAny(id, null, WmsWarehouseAreaDO.ID_EMPTY)) { + return WmsWarehouseAreaDO.ID_EMPTY; + } + WmsWarehouseAreaDO area = validateWarehouseAreaExists(id); + if (ObjectUtil.notEqual(area.getWarehouseId(), warehouseId)) { + throw exception(WAREHOUSE_AREA_NOT_MATCH_WAREHOUSE); + } + return id; + } + + @Override public WmsWarehouseAreaDO getWarehouseArea(Long id) { validateAreaEnabled(); return warehouseAreaMapper.selectById(id); diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailService.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailService.java index fc1c2db..03122cb 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailService.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailService.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.wms.service.order.receipt; +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; import java.util.Collection; @@ -16,17 +17,17 @@ public interface WmsReceiptOrderDetailService { * 创建入库单明细列表 * * @param orderId 入库单编号 - * @param list 明细列表 + * @param reqVO 入库单保存信息 */ - void createReceiptOrderDetailList(Long orderId, List list); + void createReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO); /** * 更新入库单明细列表 * * @param orderId 入库单编号 - * @param list 明细列表 + * @param reqVO 入库单保存信息 */ - void updateReceiptOrderDetailList(Long orderId, List list); + void updateReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO); /** * 按入库单编号删除明细列表 @@ -51,4 +52,12 @@ public interface WmsReceiptOrderDetailService { */ List getReceiptOrderDetailList(Collection orderIds); + /** + * 校验入库单明细列表存在 + * + * @param orderId 入库单编号 + * @return 明细列表 + */ + List validateReceiptOrderDetailListExists(Long orderId); + } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImpl.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImpl.java index 1be7429..25703e0 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImpl.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImpl.java @@ -2,8 +2,15 @@ package cn.iocoder.yudao.module.wms.service.order.receipt; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; +import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; +import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; +import cn.iocoder.yudao.module.wms.service.md.item.WmsItemSkuService; +import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseAreaService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,7 +22,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; -import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_NOT_EXISTS; +import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; /** * WMS 入库单明细 Service 实现类 @@ -28,25 +35,30 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe @Resource private WmsReceiptOrderDetailMapper receiptOrderDetailMapper; + @Resource + private WmsItemSkuService itemSkuService; + @Resource + private WmsWarehouseAreaService warehouseAreaService; + @Resource + private WmsProperties wmsProperties; @Override @Transactional(rollbackFor = Exception.class) - public void createReceiptOrderDetailList(Long orderId, List list) { + public void createReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO) { + List list = buildReceiptOrderDetailList(reqVO); if (CollUtil.isEmpty(list)) { return; } - if (CollUtil.isNotEmpty(convertList(list, WmsReceiptOrderDetailDO::getId))) { - throw exception(RECEIPT_ORDER_DETAIL_NOT_EXISTS); - } - list.forEach(detail -> detail.setOrderId(orderId)); + list.forEach(detail -> detail.setId(null).setOrderId(orderId)); receiptOrderDetailMapper.insertBatch(list); } @Override @Transactional(rollbackFor = Exception.class) - public void updateReceiptOrderDetailList(Long orderId, List list) { + public void updateReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO) { // 第一步,对比新老数据,获得添加、修改、删除的列表 List oldList = receiptOrderDetailMapper.selectListByOrderId(orderId); + List list = buildReceiptOrderDetailList(reqVO); List newList = CollUtil.isEmpty(list) ? ListUtil.of() : list; List> diffList = diffList(oldList, newList, // id 不同,就认为是不同的记录 (oldVal, newVal) -> oldVal.getId().equals(newVal.getId())); @@ -86,4 +98,33 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe return receiptOrderDetailMapper.selectListByOrderIds(orderIds); } + @Override + public List validateReceiptOrderDetailListExists(Long orderId) { + List details = receiptOrderDetailMapper.selectListByOrderId(orderId); + if (CollUtil.isEmpty(details)) { + throw exception(RECEIPT_ORDER_DETAIL_REQUIRED); + } + if (wmsProperties.isAreaEnabled() && details.stream() + .anyMatch(detail -> ObjectUtils.equalsAny(detail.getAreaId(), null, WmsWarehouseAreaDO.ID_EMPTY))) { + throw exception(RECEIPT_ORDER_AREA_REQUIRED); + } + return details; + } + + private List buildReceiptOrderDetailList(WmsReceiptOrderSaveReqVO reqVO) { + if (CollUtil.isEmpty(reqVO.getDetails())) { + return ListUtil.of(); + } + return convertList(reqVO.getDetails(), detail -> { + // 校验 SKU 存在 + itemSkuService.validateItemSkuExists(detail.getSkuId()); + // 校验仓库区域存在,并且属于当前仓库 + Long areaId = warehouseAreaService.validateAndNormalizeWarehouseAreaId( + detail.getAreaId() == null ? reqVO.getAreaId() : detail.getAreaId(), reqVO.getWarehouseId()); + // 构建对象 + return BeanUtils.toBean(detail, WmsReceiptOrderDetailDO.class) + .setWarehouseId(reqVO.getWarehouseId()).setAreaId(areaId); + }); + } + } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImpl.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImpl.java index e04b32f..e1ad228 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImpl.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImpl.java @@ -1,33 +1,24 @@ package cn.iocoder.yudao.module.wms.service.order.receipt; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderPageReqVO; import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; -import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO; -import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDO; import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderMapper; import cn.iocoder.yudao.module.wms.enums.inventory.WmsInventoryOrderTypeEnum; -import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum; -import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderStatusEnum; -import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; +import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum; import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService; import cn.iocoder.yudao.module.wms.service.inventory.dto.WmsInventoryChangeReqDTO; -import cn.iocoder.yudao.module.wms.service.md.item.WmsItemSkuService; import cn.iocoder.yudao.module.wms.service.md.merchant.WmsMerchantService; -import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseAreaService; import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseService; 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.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -43,8 +34,6 @@ import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; @Validated public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { - private static final Long EMPTY_AREA_ID = 0L; - @Resource private WmsReceiptOrderMapper receiptOrderMapper; @Resource @@ -52,85 +41,77 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { @Resource private WmsWarehouseService warehouseService; @Resource - private WmsWarehouseAreaService warehouseAreaService; - @Resource private WmsMerchantService merchantService; @Resource - private WmsItemSkuService itemSkuService; - @Resource private WmsInventoryService inventoryService; - @Resource - private WmsProperties wmsProperties; @Override @Transactional(rollbackFor = Exception.class) public Long createReceiptOrder(WmsReceiptOrderSaveReqVO createReqVO) { - return createReceiptOrder(createReqVO, false).getId(); - } - - // TODO @AI:不需要 detailRequired 参数呀。。。(对齐 mes 的做法) - private WmsReceiptOrderDO createReceiptOrder(WmsReceiptOrderSaveReqVO createReqVO, boolean detailRequired) { // 1. 校验入库单保存数据 validateReceiptOrderSaveData(createReqVO); - // TODO @AI:是不是(对齐 mes 的做法) - List details = buildReceiptOrderDetailList(createReqVO, detailRequired); // 2.1 插入入库单 WmsReceiptOrderDO order = BeanUtils.toBean(createReqVO, WmsReceiptOrderDO.class); - order.setStatus(WmsReceiptOrderStatusEnum.PENDING.getStatus()); - fillReceiptOrderTotal(order, details); + order.setStatus(WmsOrderStatusEnum.PREPARE.getStatus()); receiptOrderMapper.insert(order); // 2.2 插入入库单明细 - receiptOrderDetailService.createReceiptOrderDetailList(order.getId(), details); - return order; + receiptOrderDetailService.createReceiptOrderDetailList(order.getId(), createReqVO); + return order.getId(); } @Override @Transactional(rollbackFor = Exception.class) public void updateReceiptOrder(WmsReceiptOrderSaveReqVO updateReqVO) { - updateReceiptOrder(updateReqVO, false); + // 1. 校验入库单保存数据 + validateReceiptOrderPrepare(updateReqVO.getId()); + validateReceiptOrderSaveData(updateReqVO); + + // 2.1 更新入库单 + WmsReceiptOrderDO updateObj = BeanUtils.toBean(updateReqVO, WmsReceiptOrderDO.class) + .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()); + receiptOrderMapper.updateById(updateObj); + // 2.2 更新入库单明细 + receiptOrderDetailService.updateReceiptOrderDetailList(updateReqVO.getId(), updateReqVO); } @Override @Transactional(rollbackFor = Exception.class) public void deleteReceiptOrder(Long id) { - // 1. 校验存在,且暂存 - WmsReceiptOrderDO order = validateReceiptOrderExists(id); - // TODO @AI:只有未“COMPLETED”不允许删除。 - validateReceiptOrderPending(order); + // 1. 校验存在,且草稿 + validateReceiptOrderPrepare(id); // 2.1 删除入库单 receiptOrderMapper.deleteById(id); - // 2.1 删除入库单明细 + // 2.2 删除入库单明细 receiptOrderDetailService.deleteReceiptOrderDetailListByOrderId(id); } @Override @Transactional(rollbackFor = Exception.class) public void completeReceiptOrder(Long id) { - // 1.1 校验存在,且未完成 - WmsReceiptOrderDO order = validateReceiptOrderExists(id); - validateReceiptOrderPending(order); + // 1.1 校验存在,且草稿 + WmsReceiptOrderDO order = validateReceiptOrderPrepare(id); // 1.2 校验入库单明细存在 - List details = validateReceiptOrderDetailExists(id); + List details = receiptOrderDetailService.validateReceiptOrderDetailListExists(id); - // 2.1 完成入库单 - WmsReceiptOrderDO updateObj = new WmsReceiptOrderDO().setId(id).setStatus(WmsReceiptOrderStatusEnum.COMPLETED.getStatus()); - receiptOrderMapper.updateById(updateObj); - // 2.2 写入库存 + // 2. 完成入库单 + receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id) + .setStatus(WmsOrderStatusEnum.FINISHED.getStatus())); + + // 3. 写入库存 createInventory(order, details); } @Override @Transactional(rollbackFor = Exception.class) public void cancelReceiptOrder(Long id) { - // 1. 校验存在,且未完成 - WmsReceiptOrderDO order = validateReceiptOrderExists(id); - validateReceiptOrderPending(order); + // 1. 校验存在,且草稿 + validateReceiptOrderPrepare(id); // 2. 作废入库单 receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id) - .setStatus(WmsReceiptOrderStatusEnum.CANCELED.getStatus())); + .setStatus(WmsOrderStatusEnum.CANCELED.getStatus())); } @Override @@ -143,28 +124,13 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { return receiptOrderMapper.selectPage(pageReqVO); } - private WmsReceiptOrderDO updateReceiptOrder(WmsReceiptOrderSaveReqVO updateReqVO, boolean detailRequired) { - // 1. 校验入库单保存数据 - WmsReceiptOrderDO oldOrder = validateReceiptOrderExists(updateReqVO.getId()); - validateReceiptOrderPending(oldOrder); - validateReceiptOrderSaveData(updateReqVO); - List details = buildReceiptOrderDetailList(updateReqVO, detailRequired); - - // 2.1 更新入库单 - WmsReceiptOrderDO updateObj = BeanUtils.toBean(updateReqVO, WmsReceiptOrderDO.class) - .setStatus(WmsReceiptOrderStatusEnum.PENDING.getStatus()); - fillReceiptOrderTotal(updateObj, details); - receiptOrderMapper.updateById(updateObj); - // 2.2 更新入库单明细 - receiptOrderDetailService.updateReceiptOrderDetailList(updateReqVO.getId(), details); - return updateObj; - } - private void validateReceiptOrderSaveData(WmsReceiptOrderSaveReqVO reqVO) { + // 校验入库单号唯一 validateReceiptOrderNoUnique(reqVO.getId(), reqVO.getNo()); + // 校验仓库存在 warehouseService.validateWarehouseExists(reqVO.getWarehouseId()); + // 校验供应商类型 validateReceiptOrderMerchant(reqVO.getMerchantId()); - reqVO.setAreaId(normalizeAreaId(reqVO.getAreaId(), reqVO.getWarehouseId(), false)); } private void validateReceiptOrderNoUnique(Long id, String no) { @@ -185,86 +151,30 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { return order; } - private void validateReceiptOrderPending(WmsReceiptOrderDO order) { - if (ObjectUtil.notEqual(order.getStatus(), WmsReceiptOrderStatusEnum.PENDING.getStatus())) { - throw exception(RECEIPT_ORDER_STATUS_NOT_PENDING); - } - } - - private List validateReceiptOrderDetailExists(Long id) { - List details = receiptOrderDetailService.getReceiptOrderDetailList(id); - if (CollUtil.isEmpty(details)) { - throw exception(RECEIPT_ORDER_DETAIL_REQUIRED); + /** + * 校验入库单存在且为草稿状态 + * + * @param id 入库单编号 + * @return 入库单 + */ + private WmsReceiptOrderDO validateReceiptOrderPrepare(Long id) { + WmsReceiptOrderDO order = validateReceiptOrderExists(id); + if (ObjectUtil.notEqual(order.getStatus(), WmsOrderStatusEnum.PREPARE.getStatus())) { + throw exception(RECEIPT_ORDER_STATUS_NOT_PREPARE); } - return details; + return order; } private void validateReceiptOrderMerchant(Long merchantId) { if (merchantId == null) { return; } - WmsMerchantDO merchant = merchantService.validateMerchantExists(merchantId); - if (ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.SUPPLIER.getType()) - && ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.CUSTOMER_SUPPLIER.getType())) { - throw exception(RECEIPT_ORDER_MERCHANT_NOT_SUPPLIER); - } - } - - private List buildReceiptOrderDetailList(WmsReceiptOrderSaveReqVO reqVO, boolean required) { - if (CollUtil.isEmpty(reqVO.getDetails())) { - if (required) { - throw exception(RECEIPT_ORDER_DETAIL_REQUIRED); - } - return ListUtil.of(); - } - return convertList(reqVO.getDetails(), detail -> { - itemSkuService.validateItemSkuExists(detail.getSkuId()); - WmsReceiptOrderDetailDO detailDO = BeanUtils.toBean(detail, WmsReceiptOrderDetailDO.class); - detailDO.setWarehouseId(reqVO.getWarehouseId()); - detailDO.setAreaId(normalizeAreaId(detail.getAreaId() == null ? reqVO.getAreaId() : detail.getAreaId(), - reqVO.getWarehouseId(), required)); - return detailDO; - }); - } - - private Long normalizeAreaId(Long areaId, Long warehouseId, boolean required) { - if (!wmsProperties.isAreaEnabled()) { - return EMPTY_AREA_ID; - } - if (areaId == null || ObjectUtil.equal(areaId, EMPTY_AREA_ID)) { - if (required) { - throw exception(RECEIPT_ORDER_AREA_REQUIRED); - } - return EMPTY_AREA_ID; - } - WmsWarehouseAreaDO area = warehouseAreaService.validateWarehouseAreaExists(areaId); - if (ObjectUtil.notEqual(area.getWarehouseId(), warehouseId)) { - throw exception(RECEIPT_ORDER_AREA_NOT_MATCH_WAREHOUSE); - } - return areaId; - } - - // DONE @AI:保留手工总金额优先;未填写时按明细金额汇总回填。 - // TODO @AI:前端自动计算。 - private void fillReceiptOrderTotal(WmsReceiptOrderDO order, List details) { - BigDecimal totalQuantity = BigDecimal.ZERO; - BigDecimal totalAmount = BigDecimal.ZERO; - for (WmsReceiptOrderDetailDO detail : details) { - totalQuantity = totalQuantity.add(detail.getQuantity()); - totalAmount = totalAmount.add(detail.getAmount() == null ? BigDecimal.ZERO : detail.getAmount()); - } - order.setTotalQuantity(totalQuantity); - if (order.getTotalAmount() == null) { - order.setTotalAmount(totalAmount); - } + merchantService.validateSupplierMerchantExists(merchantId); } private void createInventory(WmsReceiptOrderDO order, List details) { - List items = convertList(details, detail -> new WmsInventoryChangeReqDTO.Item() - .setSkuId(detail.getSkuId()).setWarehouseId(detail.getWarehouseId()).setAreaId(detail.getAreaId()) - .setQuantity(detail.getQuantity()).setBatchNo(detail.getBatchNo()) - .setProductionDate(detail.getProductionDate()).setExpirationDate(detail.getExpirationDate()) - .setAmount(detail.getAmount()).setRemark(detail.getRemark())); + List items = convertList(details, + detail -> BeanUtils.toBean(detail, WmsInventoryChangeReqDTO.Item.class)); inventoryService.changeInventory(new WmsInventoryChangeReqDTO() .setOrderId(order.getId()).setOrderNo(order.getNo()) .setOrderType(WmsInventoryOrderTypeEnum.RECEIPT.getType()).setItems(items)); diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java index fc4b2ed..33ac70b 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java @@ -1,11 +1,19 @@ package cn.iocoder.yudao.module.wms.service.order.receipt; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.detail.WmsReceiptOrderDetailSaveReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; +import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; +import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; +import cn.iocoder.yudao.module.wms.service.md.item.WmsItemSkuService; +import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseAreaService; import jakarta.annotation.Resource; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.math.BigDecimal; import java.util.List; @@ -15,8 +23,10 @@ import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER 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.when; -@Import(WmsReceiptOrderDetailServiceImpl.class) +@Import({WmsReceiptOrderDetailServiceImpl.class, WmsProperties.class}) public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { @Resource @@ -25,15 +35,27 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { @Resource private WmsReceiptOrderDetailMapper receiptOrderDetailMapper; + @MockitoBean + private WmsItemSkuService itemSkuService; + @MockitoBean + private WmsWarehouseAreaService warehouseAreaService; + + @BeforeEach + public void setUp() { + when(warehouseAreaService.validateAndNormalizeWarehouseAreaId(any(), any())) + .thenReturn(WmsWarehouseAreaDO.ID_EMPTY); + } + @Test public void testCreateReceiptOrderDetailList_success() { // mock 数据 Long orderId = 10L; - WmsReceiptOrderDetailDO detail01 = createReceiptOrderDetail(null, 1001L, "1.00"); - WmsReceiptOrderDetailDO detail02 = createReceiptOrderDetail(null, 1002L, "2.00"); + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( + createReceiptOrderDetailReqVO(null, 1001L, "1.00"), + createReceiptOrderDetailReqVO(null, 1002L, "2.00")); // 调用 - receiptOrderDetailService.createReceiptOrderDetailList(orderId, List.of(detail01, detail02)); + receiptOrderDetailService.createReceiptOrderDetailList(orderId, reqVO); // 断言 List details = receiptOrderDetailMapper.selectListByOrderId(orderId); @@ -43,14 +65,19 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { } @Test - public void testCreateReceiptOrderDetailList_detailNotExists() { + public void testCreateReceiptOrderDetailList_ignoreId() { // mock 数据 - WmsReceiptOrderDetailDO detail = createReceiptOrderDetail(null, 1001L, "1.00"); - detail.setId(999L); + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( + createReceiptOrderDetailReqVO(999L, 1001L, "1.00")); - // 调用,并断言 - assertServiceException(() -> receiptOrderDetailService.createReceiptOrderDetailList(10L, List.of(detail)), - RECEIPT_ORDER_DETAIL_NOT_EXISTS); + // 调用 + receiptOrderDetailService.createReceiptOrderDetailList(10L, reqVO); + + // 断言 + List details = receiptOrderDetailMapper.selectListByOrderId(10L); + assertEquals(1, details.size()); + assertNotNull(details.get(0).getId()); + assertEquals(1001L, details.get(0).getSkuId()); } @Test @@ -61,12 +88,12 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { WmsReceiptOrderDetailDO detail02 = createReceiptOrderDetail(orderId, 1002L, "2.00"); receiptOrderDetailMapper.insert(detail01); receiptOrderDetailMapper.insert(detail02); - WmsReceiptOrderDetailDO updateDetail = createReceiptOrderDetail(999L, 2001L, "11.00"); - updateDetail.setId(detail01.getId()); - WmsReceiptOrderDetailDO createDetail = createReceiptOrderDetail(null, 2002L, "22.00"); + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( + createReceiptOrderDetailReqVO(detail01.getId(), 2001L, "11.00"), + createReceiptOrderDetailReqVO(null, 2002L, "22.00")); // 调用 - receiptOrderDetailService.updateReceiptOrderDetailList(orderId, List.of(updateDetail, createDetail)); + receiptOrderDetailService.updateReceiptOrderDetailList(orderId, reqVO); // 断言:修改 WmsReceiptOrderDetailDO dbUpdateDetail = receiptOrderDetailMapper.selectById(detail01.getId()); @@ -90,14 +117,32 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { @Test public void testUpdateReceiptOrderDetailList_detailNotExists() { // mock 数据 - WmsReceiptOrderDetailDO detail = createReceiptOrderDetail(10L, 1001L, "1.00"); - detail.setId(999L); + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( + createReceiptOrderDetailReqVO(999L, 1001L, "1.00")); // 调用,并断言 - assertServiceException(() -> receiptOrderDetailService.updateReceiptOrderDetailList(10L, List.of(detail)), + assertServiceException(() -> receiptOrderDetailService.updateReceiptOrderDetailList(10L, reqVO), RECEIPT_ORDER_DETAIL_NOT_EXISTS); } + private static WmsReceiptOrderSaveReqVO createReceiptOrderReqVO(WmsReceiptOrderDetailSaveReqVO... details) { + WmsReceiptOrderSaveReqVO reqVO = new WmsReceiptOrderSaveReqVO(); + reqVO.setWarehouseId(100L); + reqVO.setAreaId(0L); + reqVO.setDetails(List.of(details)); + return reqVO; + } + + private static WmsReceiptOrderDetailSaveReqVO createReceiptOrderDetailReqVO(Long id, Long skuId, String quantity) { + WmsReceiptOrderDetailSaveReqVO reqVO = new WmsReceiptOrderDetailSaveReqVO(); + reqVO.setId(id); + reqVO.setSkuId(skuId); + reqVO.setAreaId(0L); + reqVO.setQuantity(new BigDecimal(quantity)); + reqVO.setAmount(new BigDecimal("100.00")); + return reqVO; + } + private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, String quantity) { return WmsReceiptOrderDetailDO.builder() .orderId(orderId) diff --git a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java index f80e624..efb8afc 100644 --- a/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java +++ b/yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImplTest.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderD import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderMapper; import cn.iocoder.yudao.module.wms.enums.inventory.WmsInventoryOrderTypeEnum; -import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderStatusEnum; +import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum; import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService; @@ -23,6 +23,9 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; 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 org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -58,7 +61,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { Long skuId = 200L; WmsReceiptOrderDO order = createReceiptOrder(warehouseId); receiptOrderMapper.insert(order); - receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), skuId, warehouseId)); + receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), skuId, warehouseId, 300L)); // 调用 receiptOrderService.completeReceiptOrder(order.getId()); @@ -66,7 +69,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { // 断言:入库单 WmsReceiptOrderDO dbOrder = receiptOrderMapper.selectById(order.getId()); assertNotNull(dbOrder); - assertEquals(WmsReceiptOrderStatusEnum.COMPLETED.getStatus(), dbOrder.getStatus()); + assertEquals(WmsOrderStatusEnum.FINISHED.getStatus(), dbOrder.getStatus()); // 断言:库存变更 ArgumentCaptor captor = ArgumentCaptor.forClass(WmsInventoryChangeReqDTO.class); verify(inventoryService).changeInventory(captor.capture()); @@ -81,6 +84,31 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { } @Test + public void testCompleteReceiptOrder_detailRequired() { + // mock 数据 + WmsReceiptOrderDO order = createReceiptOrder(100L); + receiptOrderMapper.insert(order); + + // 调用,并断言 + assertServiceException(() -> receiptOrderService.completeReceiptOrder(order.getId()), + RECEIPT_ORDER_DETAIL_REQUIRED); + verify(inventoryService, never()).changeInventory(any()); + } + + @Test + public void testCompleteReceiptOrder_areaRequired() { + // mock 数据 + WmsReceiptOrderDO order = createReceiptOrder(100L); + receiptOrderMapper.insert(order); + receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), 200L, 100L, 0L)); + + // 调用,并断言 + assertServiceException(() -> receiptOrderService.completeReceiptOrder(order.getId()), + RECEIPT_ORDER_AREA_REQUIRED); + verify(inventoryService, never()).changeInventory(any()); + } + + @Test public void testCancelReceiptOrder_success() { // mock 数据 WmsReceiptOrderDO order = createReceiptOrder(100L); @@ -92,7 +120,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { // 断言 WmsReceiptOrderDO dbOrder = receiptOrderMapper.selectById(order.getId()); assertNotNull(dbOrder); - assertEquals(WmsReceiptOrderStatusEnum.CANCELED.getStatus(), dbOrder.getStatus()); + assertEquals(WmsOrderStatusEnum.CANCELED.getStatus(), dbOrder.getStatus()); verify(inventoryService, never()).changeInventory(any()); } @@ -100,19 +128,20 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { return new WmsReceiptOrderDO() .setNo("RK202605120001") .setType(WmsReceiptOrderTypeEnum.PURCHASE.getType()) - .setStatus(WmsReceiptOrderStatusEnum.PENDING.getStatus()) + .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) .setWarehouseId(warehouseId) .setAreaId(0L) .setTotalQuantity(new BigDecimal("2.00")) .setTotalAmount(new BigDecimal("20.00")); } - private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, Long warehouseId) { + private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, Long warehouseId, + Long areaId) { return WmsReceiptOrderDetailDO.builder() .orderId(orderId) .skuId(skuId) .warehouseId(warehouseId) - .areaId(0L) + .areaId(areaId) .quantity(new BigDecimal("2.00")) .amount(new BigDecimal("20.00")) .build();