Commit 8f9433ece875a5a6b8c37411b70f6f8851ae9f88
1 parent
55426245
feat(wms):进一步优化入库单的后端实现(对齐 mes)
Showing
17 changed files
with
268 additions
and
222 deletions
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; | @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| 5 | -import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderStatusEnum; | 5 | +import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum; |
| 6 | import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; | 6 | import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; |
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 8 | import lombok.Data; |
| @@ -25,7 +25,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam { | @@ -25,7 +25,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam { | ||
| 25 | private String no; | 25 | private String no; |
| 26 | 26 | ||
| 27 | @Schema(description = "单据状态", example = "0") | 27 | @Schema(description = "单据状态", example = "0") |
| 28 | - @InEnum(WmsReceiptOrderStatusEnum.class) | 28 | + @InEnum(WmsOrderStatusEnum.class) |
| 29 | private Integer status; | 29 | private Integer status; |
| 30 | 30 | ||
| 31 | @Schema(description = "仓库编号", example = "1024") | 31 | @Schema(description = "仓库编号", example = "1024") |
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 { | @@ -32,7 +32,7 @@ public class WmsReceiptOrderRespVO { | ||
| 32 | 32 | ||
| 33 | @Schema(description = "入库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") | 33 | @Schema(description = "入库状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") |
| 34 | @ExcelProperty(value = "入库状态", converter = DictConvert.class) | 34 | @ExcelProperty(value = "入库状态", converter = DictConvert.class) |
| 35 | - @DictFormat(DictTypeConstants.RECEIPT_ORDER_STATUS) | 35 | + @DictFormat(DictTypeConstants.ORDER_STATUS) |
| 36 | private Integer status; | 36 | private Integer status; |
| 37 | 37 | ||
| 38 | @Schema(description = "业务单号", example = "PO202605110001") | 38 | @Schema(description = "业务单号", example = "PO202605110001") |
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 { | @@ -48,7 +48,8 @@ public class WmsReceiptOrderSaveReqVO { | ||
| 48 | @Schema(description = "库区编号", example = "1024") | 48 | @Schema(description = "库区编号", example = "1024") |
| 49 | private Long areaId; | 49 | private Long areaId; |
| 50 | 50 | ||
| 51 | - @Schema(description = "入库数量", example = "100.00") | 51 | + @Schema(description = "入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") |
| 52 | + @NotNull(message = "入库数量不能为空") | ||
| 52 | private BigDecimal totalQuantity; | 53 | private BigDecimal totalQuantity; |
| 53 | 54 | ||
| 54 | @Schema(description = "总金额", example = "1000.00") | 55 | @Schema(description = "总金额", example = "1000.00") |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/warehouse/WmsWarehouseAreaDO.java
| @@ -22,6 +22,11 @@ import lombok.*; | @@ -22,6 +22,11 @@ import lombok.*; | ||
| 22 | public class WmsWarehouseAreaDO extends BaseDO { | 22 | public class WmsWarehouseAreaDO extends BaseDO { |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | + * 空库区编号 | ||
| 26 | + */ | ||
| 27 | + public static final Long ID_EMPTY = 0L; | ||
| 28 | + | ||
| 29 | + /** | ||
| 25 | * 主键编号 | 30 | * 主键编号 |
| 26 | */ | 31 | */ |
| 27 | @TableId | 32 | @TableId |
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 { | @@ -45,7 +45,7 @@ public class WmsReceiptOrderDO extends BaseDO { | ||
| 45 | /** | 45 | /** |
| 46 | * 入库状态 | 46 | * 入库状态 |
| 47 | * | 47 | * |
| 48 | - * 字典 {@link DictTypeConstants#RECEIPT_ORDER_STATUS} | 48 | + * 字典 {@link DictTypeConstants#ORDER_STATUS} |
| 49 | */ | 49 | */ |
| 50 | private Integer status; | 50 | private Integer status; |
| 51 | /** | 51 | /** |
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; | @@ -8,7 +8,7 @@ package cn.iocoder.yudao.module.wms.enums; | ||
| 8 | public interface DictTypeConstants { | 8 | public interface DictTypeConstants { |
| 9 | 9 | ||
| 10 | String MERCHANT_TYPE = "merchant_type"; | 10 | String MERCHANT_TYPE = "merchant_type"; |
| 11 | - String RECEIPT_ORDER_STATUS = "wms_receipt_order_status"; | 11 | + String ORDER_STATUS = "wms_order_status"; |
| 12 | String RECEIPT_ORDER_TYPE = "wms_receipt_order_type"; | 12 | String RECEIPT_ORDER_TYPE = "wms_receipt_order_type"; |
| 13 | String SHIPMENT_STATUS = "wms_shipment_status"; | 13 | String SHIPMENT_STATUS = "wms_shipment_status"; |
| 14 | String SHIPMENT_TYPE = "wms_shipment_type"; | 14 | String SHIPMENT_TYPE = "wms_shipment_type"; |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java
| @@ -22,6 +22,7 @@ public interface ErrorCodeConstants { | @@ -22,6 +22,7 @@ public interface ErrorCodeConstants { | ||
| 22 | ErrorCode WAREHOUSE_AREA_NOT_EXISTS = new ErrorCode(1_060_101_000, "库区不存在"); | 22 | ErrorCode WAREHOUSE_AREA_NOT_EXISTS = new ErrorCode(1_060_101_000, "库区不存在"); |
| 23 | ErrorCode WAREHOUSE_AREA_NAME_DUPLICATE = new ErrorCode(1_060_101_001, "库区名称重复"); | 23 | ErrorCode WAREHOUSE_AREA_NAME_DUPLICATE = new ErrorCode(1_060_101_001, "库区名称重复"); |
| 24 | ErrorCode WAREHOUSE_AREA_CODE_DUPLICATE = new ErrorCode(1_060_101_002, "库区编号重复"); | 24 | ErrorCode WAREHOUSE_AREA_CODE_DUPLICATE = new ErrorCode(1_060_101_002, "库区编号重复"); |
| 25 | + ErrorCode WAREHOUSE_AREA_NOT_MATCH_WAREHOUSE = new ErrorCode(1_060_101_003, "库区不属于仓库"); | ||
| 25 | 26 | ||
| 26 | // ========== WMS 基础数据-商品分类 1-060-102-000 ========== | 27 | // ========== WMS 基础数据-商品分类 1-060-102-000 ========== |
| 27 | ErrorCode ITEM_CATEGORY_NOT_EXISTS = new ErrorCode(1_060_102_000, "商品分类不存在"); | 28 | ErrorCode ITEM_CATEGORY_NOT_EXISTS = new ErrorCode(1_060_102_000, "商品分类不存在"); |
| @@ -46,16 +47,14 @@ public interface ErrorCodeConstants { | @@ -46,16 +47,14 @@ public interface ErrorCodeConstants { | ||
| 46 | 47 | ||
| 47 | // ========== WMS 基础数据-往来企业 1-060-105-000 ========== | 48 | // ========== WMS 基础数据-往来企业 1-060-105-000 ========== |
| 48 | ErrorCode MERCHANT_NOT_EXISTS = new ErrorCode(1_060_105_000, "往来企业不存在"); | 49 | ErrorCode MERCHANT_NOT_EXISTS = new ErrorCode(1_060_105_000, "往来企业不存在"); |
| 50 | + ErrorCode MERCHANT_NOT_SUPPLIER = new ErrorCode(1_060_105_001, "往来企业必须是供应商或客户/供应商类型"); | ||
| 49 | 51 | ||
| 50 | // ========== WMS 入库单 1-060-200-000 ========== | 52 | // ========== WMS 入库单 1-060-200-000 ========== |
| 51 | ErrorCode RECEIPT_ORDER_NOT_EXISTS = new ErrorCode(1_060_200_000, "入库单不存在"); | 53 | ErrorCode RECEIPT_ORDER_NOT_EXISTS = new ErrorCode(1_060_200_000, "入库单不存在"); |
| 52 | ErrorCode RECEIPT_ORDER_NO_DUPLICATE = new ErrorCode(1_060_200_001, "入库单号重复"); | 54 | ErrorCode RECEIPT_ORDER_NO_DUPLICATE = new ErrorCode(1_060_200_001, "入库单号重复"); |
| 53 | - ErrorCode RECEIPT_ORDER_STATUS_NOT_PENDING = new ErrorCode(1_060_200_002, "入库单状态不是暂存,不能操作"); | 55 | + ErrorCode RECEIPT_ORDER_STATUS_NOT_PREPARE = new ErrorCode(1_060_200_002, "入库单状态不是草稿,不能操作"); |
| 54 | ErrorCode RECEIPT_ORDER_DETAIL_REQUIRED = new ErrorCode(1_060_200_003, "入库单至少包含一条明细"); | 56 | ErrorCode RECEIPT_ORDER_DETAIL_REQUIRED = new ErrorCode(1_060_200_003, "入库单至少包含一条明细"); |
| 55 | ErrorCode RECEIPT_ORDER_AREA_REQUIRED = new ErrorCode(1_060_200_004, "库区模式下,入库单库区不能为空"); | 57 | ErrorCode RECEIPT_ORDER_AREA_REQUIRED = new ErrorCode(1_060_200_004, "库区模式下,入库单库区不能为空"); |
| 56 | - ErrorCode RECEIPT_ORDER_AREA_NOT_MATCH_WAREHOUSE = new ErrorCode(1_060_200_005, "库区不属于入库仓库"); | ||
| 57 | - ErrorCode RECEIPT_ORDER_COMPLETED_CANNOT_DELETE = new ErrorCode(1_060_200_006, "入库单已完成,不能删除"); | ||
| 58 | ErrorCode RECEIPT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_200_007, "入库单明细不存在"); | 58 | ErrorCode RECEIPT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_060_200_007, "入库单明细不存在"); |
| 59 | - ErrorCode RECEIPT_ORDER_MERCHANT_NOT_SUPPLIER = new ErrorCode(1_060_200_008, "入库单供应商必须选择供应商或客户/供应商类型的往来企业"); | ||
| 60 | 59 | ||
| 61 | } | 60 | } |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderStatusEnum.java deleted
| 1 | -package cn.iocoder.yudao.module.wms.enums.order; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.common.core.ArrayValuable; | ||
| 4 | -import lombok.AllArgsConstructor; | ||
| 5 | -import lombok.Getter; | ||
| 6 | - | ||
| 7 | -import java.util.Arrays; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * WMS 入库单状态枚举 | ||
| 11 | - * | ||
| 12 | - * @author 芋道源码 | ||
| 13 | - */ | ||
| 14 | -@Getter | ||
| 15 | -@AllArgsConstructor | ||
| 16 | -public enum WmsReceiptOrderStatusEnum implements ArrayValuable<Integer> { | ||
| 17 | - | ||
| 18 | - CANCELED(-1, "作废"), | ||
| 19 | - PENDING(0, "暂存"), | ||
| 20 | - COMPLETED(1, "完成入库"); | ||
| 21 | - | ||
| 22 | - public static final Integer[] ARRAYS = Arrays.stream(values()).map(WmsReceiptOrderStatusEnum::getStatus).toArray(Integer[]::new); | ||
| 23 | - | ||
| 24 | - /** | ||
| 25 | - * 状态 | ||
| 26 | - */ | ||
| 27 | - private final Integer status; | ||
| 28 | - /** | ||
| 29 | - * 名称 | ||
| 30 | - */ | ||
| 31 | - private final String name; | ||
| 32 | - | ||
| 33 | - @Override | ||
| 34 | - public Integer[] array() { | ||
| 35 | - return ARRAYS; | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | -} |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java
| @@ -50,6 +50,14 @@ public interface WmsMerchantService { | @@ -50,6 +50,14 @@ public interface WmsMerchantService { | ||
| 50 | WmsMerchantDO validateMerchantExists(Long id); | 50 | WmsMerchantDO validateMerchantExists(Long id); |
| 51 | 51 | ||
| 52 | /** | 52 | /** |
| 53 | + * 校验供应商存在 | ||
| 54 | + * | ||
| 55 | + * @param id 编号 | ||
| 56 | + * @return 往来企业 | ||
| 57 | + */ | ||
| 58 | + WmsMerchantDO validateSupplierMerchantExists(Long id); | ||
| 59 | + | ||
| 60 | + /** | ||
| 53 | * 获得往来企业 | 61 | * 获得往来企业 |
| 54 | * | 62 | * |
| 55 | * @param id 编号 | 63 | * @param id 编号 |
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; | @@ -2,12 +2,14 @@ package cn.iocoder.yudao.module.wms.service.md.merchant; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.collection.ListUtil; | 4 | import cn.hutool.core.collection.ListUtil; |
| 5 | +import cn.hutool.core.util.ObjectUtil; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 7 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 7 | import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO; | 8 | import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO; |
| 8 | import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO; | 9 | import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO; |
| 9 | import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO; | 10 | import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO; |
| 10 | import cn.iocoder.yudao.module.wms.dal.mysql.md.merchant.WmsMerchantMapper; | 11 | import cn.iocoder.yudao.module.wms.dal.mysql.md.merchant.WmsMerchantMapper; |
| 12 | +import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum; | ||
| 11 | import jakarta.annotation.Resource; | 13 | import jakarta.annotation.Resource; |
| 12 | import org.springframework.stereotype.Service; | 14 | import org.springframework.stereotype.Service; |
| 13 | import org.springframework.validation.annotation.Validated; | 15 | import org.springframework.validation.annotation.Validated; |
| @@ -16,7 +18,7 @@ import java.util.Collection; | @@ -16,7 +18,7 @@ import java.util.Collection; | ||
| 16 | import java.util.List; | 18 | import java.util.List; |
| 17 | 19 | ||
| 18 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 20 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 19 | -import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.MERCHANT_NOT_EXISTS; | 21 | +import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; |
| 20 | 22 | ||
| 21 | /** | 23 | /** |
| 22 | * WMS 往来企业 Service 实现类 | 24 | * WMS 往来企业 Service 实现类 |
| @@ -67,6 +69,16 @@ public class WmsMerchantServiceImpl implements WmsMerchantService { | @@ -67,6 +69,16 @@ public class WmsMerchantServiceImpl implements WmsMerchantService { | ||
| 67 | } | 69 | } |
| 68 | 70 | ||
| 69 | @Override | 71 | @Override |
| 72 | + public WmsMerchantDO validateSupplierMerchantExists(Long id) { | ||
| 73 | + WmsMerchantDO merchant = validateMerchantExists(id); | ||
| 74 | + if (ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.SUPPLIER.getType()) | ||
| 75 | + && ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.CUSTOMER_SUPPLIER.getType())) { | ||
| 76 | + throw exception(MERCHANT_NOT_SUPPLIER); | ||
| 77 | + } | ||
| 78 | + return merchant; | ||
| 79 | + } | ||
| 80 | + | ||
| 81 | + @Override | ||
| 70 | public WmsMerchantDO getMerchant(Long id) { | 82 | public WmsMerchantDO getMerchant(Long id) { |
| 71 | return merchantMapper.selectById(id); | 83 | return merchantMapper.selectById(id); |
| 72 | } | 84 | } |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaService.java
| @@ -50,6 +50,15 @@ public interface WmsWarehouseAreaService { | @@ -50,6 +50,15 @@ public interface WmsWarehouseAreaService { | ||
| 50 | WmsWarehouseAreaDO validateWarehouseAreaExists(Long id); | 50 | WmsWarehouseAreaDO validateWarehouseAreaExists(Long id); |
| 51 | 51 | ||
| 52 | /** | 52 | /** |
| 53 | + * 校验并标准化库区编号 | ||
| 54 | + * | ||
| 55 | + * @param id 库区编号 | ||
| 56 | + * @param warehouseId 仓库编号 | ||
| 57 | + * @return 库区编号;未启用库区模式或为空时,返回 {@link WmsWarehouseAreaDO#ID_EMPTY} | ||
| 58 | + */ | ||
| 59 | + Long validateAndNormalizeWarehouseAreaId(Long id, Long warehouseId); | ||
| 60 | + | ||
| 61 | + /** | ||
| 53 | * 获得库区 | 62 | * 获得库区 |
| 54 | * | 63 | * |
| 55 | * @param id 编号 | 64 | * @param id 编号 |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/warehouse/WmsWarehouseAreaServiceImpl.java
| 1 | package cn.iocoder.yudao.module.wms.service.md.warehouse; | 1 | package cn.iocoder.yudao.module.wms.service.md.warehouse; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.hutool.core.util.ObjUtil; | 4 | +import cn.hutool.core.util.ObjectUtil; |
| 5 | import cn.hutool.core.util.StrUtil; | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 7 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 8 | +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 8 | import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWarehouseAreaPageReqVO; | 9 | import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWarehouseAreaPageReqVO; |
| 9 | import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWarehouseAreaSaveReqVO; | 10 | import cn.iocoder.yudao.module.wms.controller.admin.md.warehouse.vo.area.WmsWarehouseAreaSaveReqVO; |
| 10 | import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; | 11 | import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; |
| @@ -74,7 +75,7 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { | @@ -74,7 +75,7 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { | ||
| 74 | if (area == null) { | 75 | if (area == null) { |
| 75 | return; | 76 | return; |
| 76 | } | 77 | } |
| 77 | - if (ObjUtil.notEqual(area.getId(), id)) { | 78 | + if (ObjectUtil.notEqual(area.getId(), id)) { |
| 78 | throw exception(WAREHOUSE_AREA_NAME_DUPLICATE); | 79 | throw exception(WAREHOUSE_AREA_NAME_DUPLICATE); |
| 79 | } | 80 | } |
| 80 | } | 81 | } |
| @@ -87,7 +88,7 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { | @@ -87,7 +88,7 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { | ||
| 87 | if (area == null) { | 88 | if (area == null) { |
| 88 | return; | 89 | return; |
| 89 | } | 90 | } |
| 90 | - if (ObjUtil.notEqual(area.getId(), id)) { | 91 | + if (ObjectUtil.notEqual(area.getId(), id)) { |
| 91 | throw exception(WAREHOUSE_AREA_CODE_DUPLICATE); | 92 | throw exception(WAREHOUSE_AREA_CODE_DUPLICATE); |
| 92 | } | 93 | } |
| 93 | } | 94 | } |
| @@ -113,6 +114,21 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { | @@ -113,6 +114,21 @@ public class WmsWarehouseAreaServiceImpl implements WmsWarehouseAreaService { | ||
| 113 | } | 114 | } |
| 114 | 115 | ||
| 115 | @Override | 116 | @Override |
| 117 | + public Long validateAndNormalizeWarehouseAreaId(Long id, Long warehouseId) { | ||
| 118 | + if (!wmsProperties.isAreaEnabled()) { | ||
| 119 | + return WmsWarehouseAreaDO.ID_EMPTY; | ||
| 120 | + } | ||
| 121 | + if (ObjectUtils.equalsAny(id, null, WmsWarehouseAreaDO.ID_EMPTY)) { | ||
| 122 | + return WmsWarehouseAreaDO.ID_EMPTY; | ||
| 123 | + } | ||
| 124 | + WmsWarehouseAreaDO area = validateWarehouseAreaExists(id); | ||
| 125 | + if (ObjectUtil.notEqual(area.getWarehouseId(), warehouseId)) { | ||
| 126 | + throw exception(WAREHOUSE_AREA_NOT_MATCH_WAREHOUSE); | ||
| 127 | + } | ||
| 128 | + return id; | ||
| 129 | + } | ||
| 130 | + | ||
| 131 | + @Override | ||
| 116 | public WmsWarehouseAreaDO getWarehouseArea(Long id) { | 132 | public WmsWarehouseAreaDO getWarehouseArea(Long id) { |
| 117 | validateAreaEnabled(); | 133 | validateAreaEnabled(); |
| 118 | return warehouseAreaMapper.selectById(id); | 134 | return warehouseAreaMapper.selectById(id); |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailService.java
| 1 | package cn.iocoder.yudao.module.wms.service.order.receipt; | 1 | package cn.iocoder.yudao.module.wms.service.order.receipt; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; | ||
| 3 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; | 4 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; |
| 4 | 5 | ||
| 5 | import java.util.Collection; | 6 | import java.util.Collection; |
| @@ -16,17 +17,17 @@ public interface WmsReceiptOrderDetailService { | @@ -16,17 +17,17 @@ public interface WmsReceiptOrderDetailService { | ||
| 16 | * 创建入库单明细列表 | 17 | * 创建入库单明细列表 |
| 17 | * | 18 | * |
| 18 | * @param orderId 入库单编号 | 19 | * @param orderId 入库单编号 |
| 19 | - * @param list 明细列表 | 20 | + * @param reqVO 入库单保存信息 |
| 20 | */ | 21 | */ |
| 21 | - void createReceiptOrderDetailList(Long orderId, List<WmsReceiptOrderDetailDO> list); | 22 | + void createReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO); |
| 22 | 23 | ||
| 23 | /** | 24 | /** |
| 24 | * 更新入库单明细列表 | 25 | * 更新入库单明细列表 |
| 25 | * | 26 | * |
| 26 | * @param orderId 入库单编号 | 27 | * @param orderId 入库单编号 |
| 27 | - * @param list 明细列表 | 28 | + * @param reqVO 入库单保存信息 |
| 28 | */ | 29 | */ |
| 29 | - void updateReceiptOrderDetailList(Long orderId, List<WmsReceiptOrderDetailDO> list); | 30 | + void updateReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO); |
| 30 | 31 | ||
| 31 | /** | 32 | /** |
| 32 | * 按入库单编号删除明细列表 | 33 | * 按入库单编号删除明细列表 |
| @@ -51,4 +52,12 @@ public interface WmsReceiptOrderDetailService { | @@ -51,4 +52,12 @@ public interface WmsReceiptOrderDetailService { | ||
| 51 | */ | 52 | */ |
| 52 | List<WmsReceiptOrderDetailDO> getReceiptOrderDetailList(Collection<Long> orderIds); | 53 | List<WmsReceiptOrderDetailDO> getReceiptOrderDetailList(Collection<Long> orderIds); |
| 53 | 54 | ||
| 55 | + /** | ||
| 56 | + * 校验入库单明细列表存在 | ||
| 57 | + * | ||
| 58 | + * @param orderId 入库单编号 | ||
| 59 | + * @return 明细列表 | ||
| 60 | + */ | ||
| 61 | + List<WmsReceiptOrderDetailDO> validateReceiptOrderDetailListExists(Long orderId); | ||
| 62 | + | ||
| 54 | } | 63 | } |
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; | @@ -2,8 +2,15 @@ package cn.iocoder.yudao.module.wms.service.order.receipt; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.collection.ListUtil; | 4 | import cn.hutool.core.collection.ListUtil; |
| 5 | +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | ||
| 6 | +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 7 | +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; | ||
| 8 | +import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; | ||
| 5 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; | 9 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; |
| 6 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; | 10 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; |
| 11 | +import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; | ||
| 12 | +import cn.iocoder.yudao.module.wms.service.md.item.WmsItemSkuService; | ||
| 13 | +import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseAreaService; | ||
| 7 | import jakarta.annotation.Resource; | 14 | import jakarta.annotation.Resource; |
| 8 | import org.springframework.stereotype.Service; | 15 | import org.springframework.stereotype.Service; |
| 9 | import org.springframework.transaction.annotation.Transactional; | 16 | import org.springframework.transaction.annotation.Transactional; |
| @@ -15,7 +22,7 @@ import java.util.List; | @@ -15,7 +22,7 @@ import java.util.List; | ||
| 15 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 22 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 16 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; | 23 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; |
| 17 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; | 24 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; |
| 18 | -import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_NOT_EXISTS; | 25 | +import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; |
| 19 | 26 | ||
| 20 | /** | 27 | /** |
| 21 | * WMS 入库单明细 Service 实现类 | 28 | * WMS 入库单明细 Service 实现类 |
| @@ -28,25 +35,30 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe | @@ -28,25 +35,30 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe | ||
| 28 | 35 | ||
| 29 | @Resource | 36 | @Resource |
| 30 | private WmsReceiptOrderDetailMapper receiptOrderDetailMapper; | 37 | private WmsReceiptOrderDetailMapper receiptOrderDetailMapper; |
| 38 | + @Resource | ||
| 39 | + private WmsItemSkuService itemSkuService; | ||
| 40 | + @Resource | ||
| 41 | + private WmsWarehouseAreaService warehouseAreaService; | ||
| 42 | + @Resource | ||
| 43 | + private WmsProperties wmsProperties; | ||
| 31 | 44 | ||
| 32 | @Override | 45 | @Override |
| 33 | @Transactional(rollbackFor = Exception.class) | 46 | @Transactional(rollbackFor = Exception.class) |
| 34 | - public void createReceiptOrderDetailList(Long orderId, List<WmsReceiptOrderDetailDO> list) { | 47 | + public void createReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO) { |
| 48 | + List<WmsReceiptOrderDetailDO> list = buildReceiptOrderDetailList(reqVO); | ||
| 35 | if (CollUtil.isEmpty(list)) { | 49 | if (CollUtil.isEmpty(list)) { |
| 36 | return; | 50 | return; |
| 37 | } | 51 | } |
| 38 | - if (CollUtil.isNotEmpty(convertList(list, WmsReceiptOrderDetailDO::getId))) { | ||
| 39 | - throw exception(RECEIPT_ORDER_DETAIL_NOT_EXISTS); | ||
| 40 | - } | ||
| 41 | - list.forEach(detail -> detail.setOrderId(orderId)); | 52 | + list.forEach(detail -> detail.setId(null).setOrderId(orderId)); |
| 42 | receiptOrderDetailMapper.insertBatch(list); | 53 | receiptOrderDetailMapper.insertBatch(list); |
| 43 | } | 54 | } |
| 44 | 55 | ||
| 45 | @Override | 56 | @Override |
| 46 | @Transactional(rollbackFor = Exception.class) | 57 | @Transactional(rollbackFor = Exception.class) |
| 47 | - public void updateReceiptOrderDetailList(Long orderId, List<WmsReceiptOrderDetailDO> list) { | 58 | + public void updateReceiptOrderDetailList(Long orderId, WmsReceiptOrderSaveReqVO reqVO) { |
| 48 | // 第一步,对比新老数据,获得添加、修改、删除的列表 | 59 | // 第一步,对比新老数据,获得添加、修改、删除的列表 |
| 49 | List<WmsReceiptOrderDetailDO> oldList = receiptOrderDetailMapper.selectListByOrderId(orderId); | 60 | List<WmsReceiptOrderDetailDO> oldList = receiptOrderDetailMapper.selectListByOrderId(orderId); |
| 61 | + List<WmsReceiptOrderDetailDO> list = buildReceiptOrderDetailList(reqVO); | ||
| 50 | List<WmsReceiptOrderDetailDO> newList = CollUtil.isEmpty(list) ? ListUtil.of() : list; | 62 | List<WmsReceiptOrderDetailDO> newList = CollUtil.isEmpty(list) ? ListUtil.of() : list; |
| 51 | List<List<WmsReceiptOrderDetailDO>> diffList = diffList(oldList, newList, // id 不同,就认为是不同的记录 | 63 | List<List<WmsReceiptOrderDetailDO>> diffList = diffList(oldList, newList, // id 不同,就认为是不同的记录 |
| 52 | (oldVal, newVal) -> oldVal.getId().equals(newVal.getId())); | 64 | (oldVal, newVal) -> oldVal.getId().equals(newVal.getId())); |
| @@ -86,4 +98,33 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe | @@ -86,4 +98,33 @@ public class WmsReceiptOrderDetailServiceImpl implements WmsReceiptOrderDetailSe | ||
| 86 | return receiptOrderDetailMapper.selectListByOrderIds(orderIds); | 98 | return receiptOrderDetailMapper.selectListByOrderIds(orderIds); |
| 87 | } | 99 | } |
| 88 | 100 | ||
| 101 | + @Override | ||
| 102 | + public List<WmsReceiptOrderDetailDO> validateReceiptOrderDetailListExists(Long orderId) { | ||
| 103 | + List<WmsReceiptOrderDetailDO> details = receiptOrderDetailMapper.selectListByOrderId(orderId); | ||
| 104 | + if (CollUtil.isEmpty(details)) { | ||
| 105 | + throw exception(RECEIPT_ORDER_DETAIL_REQUIRED); | ||
| 106 | + } | ||
| 107 | + if (wmsProperties.isAreaEnabled() && details.stream() | ||
| 108 | + .anyMatch(detail -> ObjectUtils.equalsAny(detail.getAreaId(), null, WmsWarehouseAreaDO.ID_EMPTY))) { | ||
| 109 | + throw exception(RECEIPT_ORDER_AREA_REQUIRED); | ||
| 110 | + } | ||
| 111 | + return details; | ||
| 112 | + } | ||
| 113 | + | ||
| 114 | + private List<WmsReceiptOrderDetailDO> buildReceiptOrderDetailList(WmsReceiptOrderSaveReqVO reqVO) { | ||
| 115 | + if (CollUtil.isEmpty(reqVO.getDetails())) { | ||
| 116 | + return ListUtil.of(); | ||
| 117 | + } | ||
| 118 | + return convertList(reqVO.getDetails(), detail -> { | ||
| 119 | + // 校验 SKU 存在 | ||
| 120 | + itemSkuService.validateItemSkuExists(detail.getSkuId()); | ||
| 121 | + // 校验仓库区域存在,并且属于当前仓库 | ||
| 122 | + Long areaId = warehouseAreaService.validateAndNormalizeWarehouseAreaId( | ||
| 123 | + detail.getAreaId() == null ? reqVO.getAreaId() : detail.getAreaId(), reqVO.getWarehouseId()); | ||
| 124 | + // 构建对象 | ||
| 125 | + return BeanUtils.toBean(detail, WmsReceiptOrderDetailDO.class) | ||
| 126 | + .setWarehouseId(reqVO.getWarehouseId()).setAreaId(areaId); | ||
| 127 | + }); | ||
| 128 | + } | ||
| 129 | + | ||
| 89 | } | 130 | } |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderServiceImpl.java
| 1 | package cn.iocoder.yudao.module.wms.service.order.receipt; | 1 | package cn.iocoder.yudao.module.wms.service.order.receipt; |
| 2 | 2 | ||
| 3 | -import cn.hutool.core.collection.CollUtil; | ||
| 4 | -import cn.hutool.core.collection.ListUtil; | ||
| 5 | import cn.hutool.core.util.ObjectUtil; | 3 | import cn.hutool.core.util.ObjectUtil; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 5 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 8 | import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderPageReqVO; | 6 | import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderPageReqVO; |
| 9 | import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; | 7 | import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; |
| 10 | -import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO; | ||
| 11 | -import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; | ||
| 12 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDO; | 8 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDO; |
| 13 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; | 9 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; |
| 14 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderMapper; | 10 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderMapper; |
| 15 | import cn.iocoder.yudao.module.wms.enums.inventory.WmsInventoryOrderTypeEnum; | 11 | import cn.iocoder.yudao.module.wms.enums.inventory.WmsInventoryOrderTypeEnum; |
| 16 | -import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum; | ||
| 17 | -import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderStatusEnum; | ||
| 18 | -import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; | 12 | +import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum; |
| 19 | import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService; | 13 | import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService; |
| 20 | import cn.iocoder.yudao.module.wms.service.inventory.dto.WmsInventoryChangeReqDTO; | 14 | import cn.iocoder.yudao.module.wms.service.inventory.dto.WmsInventoryChangeReqDTO; |
| 21 | -import cn.iocoder.yudao.module.wms.service.md.item.WmsItemSkuService; | ||
| 22 | import cn.iocoder.yudao.module.wms.service.md.merchant.WmsMerchantService; | 15 | import cn.iocoder.yudao.module.wms.service.md.merchant.WmsMerchantService; |
| 23 | -import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseAreaService; | ||
| 24 | import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseService; | 16 | import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseService; |
| 25 | import jakarta.annotation.Resource; | 17 | import jakarta.annotation.Resource; |
| 26 | import org.springframework.stereotype.Service; | 18 | import org.springframework.stereotype.Service; |
| 27 | import org.springframework.transaction.annotation.Transactional; | 19 | import org.springframework.transaction.annotation.Transactional; |
| 28 | import org.springframework.validation.annotation.Validated; | 20 | import org.springframework.validation.annotation.Validated; |
| 29 | 21 | ||
| 30 | -import java.math.BigDecimal; | ||
| 31 | import java.util.List; | 22 | import java.util.List; |
| 32 | 23 | ||
| 33 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 24 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| @@ -43,8 +34,6 @@ import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; | @@ -43,8 +34,6 @@ import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; | ||
| 43 | @Validated | 34 | @Validated |
| 44 | public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | 35 | public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { |
| 45 | 36 | ||
| 46 | - private static final Long EMPTY_AREA_ID = 0L; | ||
| 47 | - | ||
| 48 | @Resource | 37 | @Resource |
| 49 | private WmsReceiptOrderMapper receiptOrderMapper; | 38 | private WmsReceiptOrderMapper receiptOrderMapper; |
| 50 | @Resource | 39 | @Resource |
| @@ -52,85 +41,77 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | @@ -52,85 +41,77 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | ||
| 52 | @Resource | 41 | @Resource |
| 53 | private WmsWarehouseService warehouseService; | 42 | private WmsWarehouseService warehouseService; |
| 54 | @Resource | 43 | @Resource |
| 55 | - private WmsWarehouseAreaService warehouseAreaService; | ||
| 56 | - @Resource | ||
| 57 | private WmsMerchantService merchantService; | 44 | private WmsMerchantService merchantService; |
| 58 | @Resource | 45 | @Resource |
| 59 | - private WmsItemSkuService itemSkuService; | ||
| 60 | - @Resource | ||
| 61 | private WmsInventoryService inventoryService; | 46 | private WmsInventoryService inventoryService; |
| 62 | - @Resource | ||
| 63 | - private WmsProperties wmsProperties; | ||
| 64 | 47 | ||
| 65 | @Override | 48 | @Override |
| 66 | @Transactional(rollbackFor = Exception.class) | 49 | @Transactional(rollbackFor = Exception.class) |
| 67 | public Long createReceiptOrder(WmsReceiptOrderSaveReqVO createReqVO) { | 50 | public Long createReceiptOrder(WmsReceiptOrderSaveReqVO createReqVO) { |
| 68 | - return createReceiptOrder(createReqVO, false).getId(); | ||
| 69 | - } | ||
| 70 | - | ||
| 71 | - // TODO @AI:不需要 detailRequired 参数呀。。。(对齐 mes 的做法) | ||
| 72 | - private WmsReceiptOrderDO createReceiptOrder(WmsReceiptOrderSaveReqVO createReqVO, boolean detailRequired) { | ||
| 73 | // 1. 校验入库单保存数据 | 51 | // 1. 校验入库单保存数据 |
| 74 | validateReceiptOrderSaveData(createReqVO); | 52 | validateReceiptOrderSaveData(createReqVO); |
| 75 | - // TODO @AI:是不是(对齐 mes 的做法) | ||
| 76 | - List<WmsReceiptOrderDetailDO> details = buildReceiptOrderDetailList(createReqVO, detailRequired); | ||
| 77 | 53 | ||
| 78 | // 2.1 插入入库单 | 54 | // 2.1 插入入库单 |
| 79 | WmsReceiptOrderDO order = BeanUtils.toBean(createReqVO, WmsReceiptOrderDO.class); | 55 | WmsReceiptOrderDO order = BeanUtils.toBean(createReqVO, WmsReceiptOrderDO.class); |
| 80 | - order.setStatus(WmsReceiptOrderStatusEnum.PENDING.getStatus()); | ||
| 81 | - fillReceiptOrderTotal(order, details); | 56 | + order.setStatus(WmsOrderStatusEnum.PREPARE.getStatus()); |
| 82 | receiptOrderMapper.insert(order); | 57 | receiptOrderMapper.insert(order); |
| 83 | // 2.2 插入入库单明细 | 58 | // 2.2 插入入库单明细 |
| 84 | - receiptOrderDetailService.createReceiptOrderDetailList(order.getId(), details); | ||
| 85 | - return order; | 59 | + receiptOrderDetailService.createReceiptOrderDetailList(order.getId(), createReqVO); |
| 60 | + return order.getId(); | ||
| 86 | } | 61 | } |
| 87 | 62 | ||
| 88 | @Override | 63 | @Override |
| 89 | @Transactional(rollbackFor = Exception.class) | 64 | @Transactional(rollbackFor = Exception.class) |
| 90 | public void updateReceiptOrder(WmsReceiptOrderSaveReqVO updateReqVO) { | 65 | public void updateReceiptOrder(WmsReceiptOrderSaveReqVO updateReqVO) { |
| 91 | - updateReceiptOrder(updateReqVO, false); | 66 | + // 1. 校验入库单保存数据 |
| 67 | + validateReceiptOrderPrepare(updateReqVO.getId()); | ||
| 68 | + validateReceiptOrderSaveData(updateReqVO); | ||
| 69 | + | ||
| 70 | + // 2.1 更新入库单 | ||
| 71 | + WmsReceiptOrderDO updateObj = BeanUtils.toBean(updateReqVO, WmsReceiptOrderDO.class) | ||
| 72 | + .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()); | ||
| 73 | + receiptOrderMapper.updateById(updateObj); | ||
| 74 | + // 2.2 更新入库单明细 | ||
| 75 | + receiptOrderDetailService.updateReceiptOrderDetailList(updateReqVO.getId(), updateReqVO); | ||
| 92 | } | 76 | } |
| 93 | 77 | ||
| 94 | @Override | 78 | @Override |
| 95 | @Transactional(rollbackFor = Exception.class) | 79 | @Transactional(rollbackFor = Exception.class) |
| 96 | public void deleteReceiptOrder(Long id) { | 80 | public void deleteReceiptOrder(Long id) { |
| 97 | - // 1. 校验存在,且暂存 | ||
| 98 | - WmsReceiptOrderDO order = validateReceiptOrderExists(id); | ||
| 99 | - // TODO @AI:只有未“COMPLETED”不允许删除。 | ||
| 100 | - validateReceiptOrderPending(order); | 81 | + // 1. 校验存在,且草稿 |
| 82 | + validateReceiptOrderPrepare(id); | ||
| 101 | 83 | ||
| 102 | // 2.1 删除入库单 | 84 | // 2.1 删除入库单 |
| 103 | receiptOrderMapper.deleteById(id); | 85 | receiptOrderMapper.deleteById(id); |
| 104 | - // 2.1 删除入库单明细 | 86 | + // 2.2 删除入库单明细 |
| 105 | receiptOrderDetailService.deleteReceiptOrderDetailListByOrderId(id); | 87 | receiptOrderDetailService.deleteReceiptOrderDetailListByOrderId(id); |
| 106 | } | 88 | } |
| 107 | 89 | ||
| 108 | @Override | 90 | @Override |
| 109 | @Transactional(rollbackFor = Exception.class) | 91 | @Transactional(rollbackFor = Exception.class) |
| 110 | public void completeReceiptOrder(Long id) { | 92 | public void completeReceiptOrder(Long id) { |
| 111 | - // 1.1 校验存在,且未完成 | ||
| 112 | - WmsReceiptOrderDO order = validateReceiptOrderExists(id); | ||
| 113 | - validateReceiptOrderPending(order); | 93 | + // 1.1 校验存在,且草稿 |
| 94 | + WmsReceiptOrderDO order = validateReceiptOrderPrepare(id); | ||
| 114 | // 1.2 校验入库单明细存在 | 95 | // 1.2 校验入库单明细存在 |
| 115 | - List<WmsReceiptOrderDetailDO> details = validateReceiptOrderDetailExists(id); | 96 | + List<WmsReceiptOrderDetailDO> details = receiptOrderDetailService.validateReceiptOrderDetailListExists(id); |
| 116 | 97 | ||
| 117 | - // 2.1 完成入库单 | ||
| 118 | - WmsReceiptOrderDO updateObj = new WmsReceiptOrderDO().setId(id).setStatus(WmsReceiptOrderStatusEnum.COMPLETED.getStatus()); | ||
| 119 | - receiptOrderMapper.updateById(updateObj); | ||
| 120 | - // 2.2 写入库存 | 98 | + // 2. 完成入库单 |
| 99 | + receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id) | ||
| 100 | + .setStatus(WmsOrderStatusEnum.FINISHED.getStatus())); | ||
| 101 | + | ||
| 102 | + // 3. 写入库存 | ||
| 121 | createInventory(order, details); | 103 | createInventory(order, details); |
| 122 | } | 104 | } |
| 123 | 105 | ||
| 124 | @Override | 106 | @Override |
| 125 | @Transactional(rollbackFor = Exception.class) | 107 | @Transactional(rollbackFor = Exception.class) |
| 126 | public void cancelReceiptOrder(Long id) { | 108 | public void cancelReceiptOrder(Long id) { |
| 127 | - // 1. 校验存在,且未完成 | ||
| 128 | - WmsReceiptOrderDO order = validateReceiptOrderExists(id); | ||
| 129 | - validateReceiptOrderPending(order); | 109 | + // 1. 校验存在,且草稿 |
| 110 | + validateReceiptOrderPrepare(id); | ||
| 130 | 111 | ||
| 131 | // 2. 作废入库单 | 112 | // 2. 作废入库单 |
| 132 | receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id) | 113 | receiptOrderMapper.updateById(new WmsReceiptOrderDO().setId(id) |
| 133 | - .setStatus(WmsReceiptOrderStatusEnum.CANCELED.getStatus())); | 114 | + .setStatus(WmsOrderStatusEnum.CANCELED.getStatus())); |
| 134 | } | 115 | } |
| 135 | 116 | ||
| 136 | @Override | 117 | @Override |
| @@ -143,28 +124,13 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | @@ -143,28 +124,13 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | ||
| 143 | return receiptOrderMapper.selectPage(pageReqVO); | 124 | return receiptOrderMapper.selectPage(pageReqVO); |
| 144 | } | 125 | } |
| 145 | 126 | ||
| 146 | - private WmsReceiptOrderDO updateReceiptOrder(WmsReceiptOrderSaveReqVO updateReqVO, boolean detailRequired) { | ||
| 147 | - // 1. 校验入库单保存数据 | ||
| 148 | - WmsReceiptOrderDO oldOrder = validateReceiptOrderExists(updateReqVO.getId()); | ||
| 149 | - validateReceiptOrderPending(oldOrder); | ||
| 150 | - validateReceiptOrderSaveData(updateReqVO); | ||
| 151 | - List<WmsReceiptOrderDetailDO> details = buildReceiptOrderDetailList(updateReqVO, detailRequired); | ||
| 152 | - | ||
| 153 | - // 2.1 更新入库单 | ||
| 154 | - WmsReceiptOrderDO updateObj = BeanUtils.toBean(updateReqVO, WmsReceiptOrderDO.class) | ||
| 155 | - .setStatus(WmsReceiptOrderStatusEnum.PENDING.getStatus()); | ||
| 156 | - fillReceiptOrderTotal(updateObj, details); | ||
| 157 | - receiptOrderMapper.updateById(updateObj); | ||
| 158 | - // 2.2 更新入库单明细 | ||
| 159 | - receiptOrderDetailService.updateReceiptOrderDetailList(updateReqVO.getId(), details); | ||
| 160 | - return updateObj; | ||
| 161 | - } | ||
| 162 | - | ||
| 163 | private void validateReceiptOrderSaveData(WmsReceiptOrderSaveReqVO reqVO) { | 127 | private void validateReceiptOrderSaveData(WmsReceiptOrderSaveReqVO reqVO) { |
| 128 | + // 校验入库单号唯一 | ||
| 164 | validateReceiptOrderNoUnique(reqVO.getId(), reqVO.getNo()); | 129 | validateReceiptOrderNoUnique(reqVO.getId(), reqVO.getNo()); |
| 130 | + // 校验仓库存在 | ||
| 165 | warehouseService.validateWarehouseExists(reqVO.getWarehouseId()); | 131 | warehouseService.validateWarehouseExists(reqVO.getWarehouseId()); |
| 132 | + // 校验供应商类型 | ||
| 166 | validateReceiptOrderMerchant(reqVO.getMerchantId()); | 133 | validateReceiptOrderMerchant(reqVO.getMerchantId()); |
| 167 | - reqVO.setAreaId(normalizeAreaId(reqVO.getAreaId(), reqVO.getWarehouseId(), false)); | ||
| 168 | } | 134 | } |
| 169 | 135 | ||
| 170 | private void validateReceiptOrderNoUnique(Long id, String no) { | 136 | private void validateReceiptOrderNoUnique(Long id, String no) { |
| @@ -185,86 +151,30 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | @@ -185,86 +151,30 @@ public class WmsReceiptOrderServiceImpl implements WmsReceiptOrderService { | ||
| 185 | return order; | 151 | return order; |
| 186 | } | 152 | } |
| 187 | 153 | ||
| 188 | - private void validateReceiptOrderPending(WmsReceiptOrderDO order) { | ||
| 189 | - if (ObjectUtil.notEqual(order.getStatus(), WmsReceiptOrderStatusEnum.PENDING.getStatus())) { | ||
| 190 | - throw exception(RECEIPT_ORDER_STATUS_NOT_PENDING); | ||
| 191 | - } | ||
| 192 | - } | ||
| 193 | - | ||
| 194 | - private List<WmsReceiptOrderDetailDO> validateReceiptOrderDetailExists(Long id) { | ||
| 195 | - List<WmsReceiptOrderDetailDO> details = receiptOrderDetailService.getReceiptOrderDetailList(id); | ||
| 196 | - if (CollUtil.isEmpty(details)) { | ||
| 197 | - throw exception(RECEIPT_ORDER_DETAIL_REQUIRED); | 154 | + /** |
| 155 | + * 校验入库单存在且为草稿状态 | ||
| 156 | + * | ||
| 157 | + * @param id 入库单编号 | ||
| 158 | + * @return 入库单 | ||
| 159 | + */ | ||
| 160 | + private WmsReceiptOrderDO validateReceiptOrderPrepare(Long id) { | ||
| 161 | + WmsReceiptOrderDO order = validateReceiptOrderExists(id); | ||
| 162 | + if (ObjectUtil.notEqual(order.getStatus(), WmsOrderStatusEnum.PREPARE.getStatus())) { | ||
| 163 | + throw exception(RECEIPT_ORDER_STATUS_NOT_PREPARE); | ||
| 198 | } | 164 | } |
| 199 | - return details; | 165 | + return order; |
| 200 | } | 166 | } |
| 201 | 167 | ||
| 202 | private void validateReceiptOrderMerchant(Long merchantId) { | 168 | private void validateReceiptOrderMerchant(Long merchantId) { |
| 203 | if (merchantId == null) { | 169 | if (merchantId == null) { |
| 204 | return; | 170 | return; |
| 205 | } | 171 | } |
| 206 | - WmsMerchantDO merchant = merchantService.validateMerchantExists(merchantId); | ||
| 207 | - if (ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.SUPPLIER.getType()) | ||
| 208 | - && ObjectUtil.notEqual(merchant.getType(), WmsMerchantTypeEnum.CUSTOMER_SUPPLIER.getType())) { | ||
| 209 | - throw exception(RECEIPT_ORDER_MERCHANT_NOT_SUPPLIER); | ||
| 210 | - } | ||
| 211 | - } | ||
| 212 | - | ||
| 213 | - private List<WmsReceiptOrderDetailDO> buildReceiptOrderDetailList(WmsReceiptOrderSaveReqVO reqVO, boolean required) { | ||
| 214 | - if (CollUtil.isEmpty(reqVO.getDetails())) { | ||
| 215 | - if (required) { | ||
| 216 | - throw exception(RECEIPT_ORDER_DETAIL_REQUIRED); | ||
| 217 | - } | ||
| 218 | - return ListUtil.of(); | ||
| 219 | - } | ||
| 220 | - return convertList(reqVO.getDetails(), detail -> { | ||
| 221 | - itemSkuService.validateItemSkuExists(detail.getSkuId()); | ||
| 222 | - WmsReceiptOrderDetailDO detailDO = BeanUtils.toBean(detail, WmsReceiptOrderDetailDO.class); | ||
| 223 | - detailDO.setWarehouseId(reqVO.getWarehouseId()); | ||
| 224 | - detailDO.setAreaId(normalizeAreaId(detail.getAreaId() == null ? reqVO.getAreaId() : detail.getAreaId(), | ||
| 225 | - reqVO.getWarehouseId(), required)); | ||
| 226 | - return detailDO; | ||
| 227 | - }); | ||
| 228 | - } | ||
| 229 | - | ||
| 230 | - private Long normalizeAreaId(Long areaId, Long warehouseId, boolean required) { | ||
| 231 | - if (!wmsProperties.isAreaEnabled()) { | ||
| 232 | - return EMPTY_AREA_ID; | ||
| 233 | - } | ||
| 234 | - if (areaId == null || ObjectUtil.equal(areaId, EMPTY_AREA_ID)) { | ||
| 235 | - if (required) { | ||
| 236 | - throw exception(RECEIPT_ORDER_AREA_REQUIRED); | ||
| 237 | - } | ||
| 238 | - return EMPTY_AREA_ID; | ||
| 239 | - } | ||
| 240 | - WmsWarehouseAreaDO area = warehouseAreaService.validateWarehouseAreaExists(areaId); | ||
| 241 | - if (ObjectUtil.notEqual(area.getWarehouseId(), warehouseId)) { | ||
| 242 | - throw exception(RECEIPT_ORDER_AREA_NOT_MATCH_WAREHOUSE); | ||
| 243 | - } | ||
| 244 | - return areaId; | ||
| 245 | - } | ||
| 246 | - | ||
| 247 | - // DONE @AI:保留手工总金额优先;未填写时按明细金额汇总回填。 | ||
| 248 | - // TODO @AI:前端自动计算。 | ||
| 249 | - private void fillReceiptOrderTotal(WmsReceiptOrderDO order, List<WmsReceiptOrderDetailDO> details) { | ||
| 250 | - BigDecimal totalQuantity = BigDecimal.ZERO; | ||
| 251 | - BigDecimal totalAmount = BigDecimal.ZERO; | ||
| 252 | - for (WmsReceiptOrderDetailDO detail : details) { | ||
| 253 | - totalQuantity = totalQuantity.add(detail.getQuantity()); | ||
| 254 | - totalAmount = totalAmount.add(detail.getAmount() == null ? BigDecimal.ZERO : detail.getAmount()); | ||
| 255 | - } | ||
| 256 | - order.setTotalQuantity(totalQuantity); | ||
| 257 | - if (order.getTotalAmount() == null) { | ||
| 258 | - order.setTotalAmount(totalAmount); | ||
| 259 | - } | 172 | + merchantService.validateSupplierMerchantExists(merchantId); |
| 260 | } | 173 | } |
| 261 | 174 | ||
| 262 | private void createInventory(WmsReceiptOrderDO order, List<WmsReceiptOrderDetailDO> details) { | 175 | private void createInventory(WmsReceiptOrderDO order, List<WmsReceiptOrderDetailDO> details) { |
| 263 | - List<WmsInventoryChangeReqDTO.Item> items = convertList(details, detail -> new WmsInventoryChangeReqDTO.Item() | ||
| 264 | - .setSkuId(detail.getSkuId()).setWarehouseId(detail.getWarehouseId()).setAreaId(detail.getAreaId()) | ||
| 265 | - .setQuantity(detail.getQuantity()).setBatchNo(detail.getBatchNo()) | ||
| 266 | - .setProductionDate(detail.getProductionDate()).setExpirationDate(detail.getExpirationDate()) | ||
| 267 | - .setAmount(detail.getAmount()).setRemark(detail.getRemark())); | 176 | + List<WmsInventoryChangeReqDTO.Item> items = convertList(details, |
| 177 | + detail -> BeanUtils.toBean(detail, WmsInventoryChangeReqDTO.Item.class)); | ||
| 268 | inventoryService.changeInventory(new WmsInventoryChangeReqDTO() | 178 | inventoryService.changeInventory(new WmsInventoryChangeReqDTO() |
| 269 | .setOrderId(order.getId()).setOrderNo(order.getNo()) | 179 | .setOrderId(order.getId()).setOrderNo(order.getNo()) |
| 270 | .setOrderType(WmsInventoryOrderTypeEnum.RECEIPT.getType()).setItems(items)); | 180 | .setOrderType(WmsInventoryOrderTypeEnum.RECEIPT.getType()).setItems(items)); |
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/order/receipt/WmsReceiptOrderDetailServiceImplTest.java
| 1 | package cn.iocoder.yudao.module.wms.service.order.receipt; | 1 | package cn.iocoder.yudao.module.wms.service.order.receipt; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | 3 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; |
| 4 | +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.detail.WmsReceiptOrderDetailSaveReqVO; | ||
| 5 | +import cn.iocoder.yudao.module.wms.controller.admin.order.receipt.vo.order.WmsReceiptOrderSaveReqVO; | ||
| 6 | +import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO; | ||
| 4 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; | 7 | import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderDetailDO; |
| 5 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; | 8 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; |
| 9 | +import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; | ||
| 10 | +import cn.iocoder.yudao.module.wms.service.md.item.WmsItemSkuService; | ||
| 11 | +import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseAreaService; | ||
| 6 | import jakarta.annotation.Resource; | 12 | import jakarta.annotation.Resource; |
| 13 | +import org.junit.jupiter.api.BeforeEach; | ||
| 7 | import org.junit.jupiter.api.Test; | 14 | import org.junit.jupiter.api.Test; |
| 8 | import org.springframework.context.annotation.Import; | 15 | import org.springframework.context.annotation.Import; |
| 16 | +import org.springframework.test.context.bean.override.mockito.MockitoBean; | ||
| 9 | 17 | ||
| 10 | import java.math.BigDecimal; | 18 | import java.math.BigDecimal; |
| 11 | import java.util.List; | 19 | import java.util.List; |
| @@ -15,8 +23,10 @@ import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER | @@ -15,8 +23,10 @@ import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER | ||
| 15 | import static org.junit.jupiter.api.Assertions.assertEquals; | 23 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 16 | import static org.junit.jupiter.api.Assertions.assertNotNull; | 24 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 17 | import static org.junit.jupiter.api.Assertions.assertNull; | 25 | import static org.junit.jupiter.api.Assertions.assertNull; |
| 26 | +import static org.mockito.ArgumentMatchers.any; | ||
| 27 | +import static org.mockito.Mockito.when; | ||
| 18 | 28 | ||
| 19 | -@Import(WmsReceiptOrderDetailServiceImpl.class) | 29 | +@Import({WmsReceiptOrderDetailServiceImpl.class, WmsProperties.class}) |
| 20 | public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | 30 | public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { |
| 21 | 31 | ||
| 22 | @Resource | 32 | @Resource |
| @@ -25,15 +35,27 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | @@ -25,15 +35,27 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | ||
| 25 | @Resource | 35 | @Resource |
| 26 | private WmsReceiptOrderDetailMapper receiptOrderDetailMapper; | 36 | private WmsReceiptOrderDetailMapper receiptOrderDetailMapper; |
| 27 | 37 | ||
| 38 | + @MockitoBean | ||
| 39 | + private WmsItemSkuService itemSkuService; | ||
| 40 | + @MockitoBean | ||
| 41 | + private WmsWarehouseAreaService warehouseAreaService; | ||
| 42 | + | ||
| 43 | + @BeforeEach | ||
| 44 | + public void setUp() { | ||
| 45 | + when(warehouseAreaService.validateAndNormalizeWarehouseAreaId(any(), any())) | ||
| 46 | + .thenReturn(WmsWarehouseAreaDO.ID_EMPTY); | ||
| 47 | + } | ||
| 48 | + | ||
| 28 | @Test | 49 | @Test |
| 29 | public void testCreateReceiptOrderDetailList_success() { | 50 | public void testCreateReceiptOrderDetailList_success() { |
| 30 | // mock 数据 | 51 | // mock 数据 |
| 31 | Long orderId = 10L; | 52 | Long orderId = 10L; |
| 32 | - WmsReceiptOrderDetailDO detail01 = createReceiptOrderDetail(null, 1001L, "1.00"); | ||
| 33 | - WmsReceiptOrderDetailDO detail02 = createReceiptOrderDetail(null, 1002L, "2.00"); | 53 | + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( |
| 54 | + createReceiptOrderDetailReqVO(null, 1001L, "1.00"), | ||
| 55 | + createReceiptOrderDetailReqVO(null, 1002L, "2.00")); | ||
| 34 | 56 | ||
| 35 | // 调用 | 57 | // 调用 |
| 36 | - receiptOrderDetailService.createReceiptOrderDetailList(orderId, List.of(detail01, detail02)); | 58 | + receiptOrderDetailService.createReceiptOrderDetailList(orderId, reqVO); |
| 37 | 59 | ||
| 38 | // 断言 | 60 | // 断言 |
| 39 | List<WmsReceiptOrderDetailDO> details = receiptOrderDetailMapper.selectListByOrderId(orderId); | 61 | List<WmsReceiptOrderDetailDO> details = receiptOrderDetailMapper.selectListByOrderId(orderId); |
| @@ -43,14 +65,19 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | @@ -43,14 +65,19 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | ||
| 43 | } | 65 | } |
| 44 | 66 | ||
| 45 | @Test | 67 | @Test |
| 46 | - public void testCreateReceiptOrderDetailList_detailNotExists() { | 68 | + public void testCreateReceiptOrderDetailList_ignoreId() { |
| 47 | // mock 数据 | 69 | // mock 数据 |
| 48 | - WmsReceiptOrderDetailDO detail = createReceiptOrderDetail(null, 1001L, "1.00"); | ||
| 49 | - detail.setId(999L); | 70 | + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( |
| 71 | + createReceiptOrderDetailReqVO(999L, 1001L, "1.00")); | ||
| 50 | 72 | ||
| 51 | - // 调用,并断言 | ||
| 52 | - assertServiceException(() -> receiptOrderDetailService.createReceiptOrderDetailList(10L, List.of(detail)), | ||
| 53 | - RECEIPT_ORDER_DETAIL_NOT_EXISTS); | 73 | + // 调用 |
| 74 | + receiptOrderDetailService.createReceiptOrderDetailList(10L, reqVO); | ||
| 75 | + | ||
| 76 | + // 断言 | ||
| 77 | + List<WmsReceiptOrderDetailDO> details = receiptOrderDetailMapper.selectListByOrderId(10L); | ||
| 78 | + assertEquals(1, details.size()); | ||
| 79 | + assertNotNull(details.get(0).getId()); | ||
| 80 | + assertEquals(1001L, details.get(0).getSkuId()); | ||
| 54 | } | 81 | } |
| 55 | 82 | ||
| 56 | @Test | 83 | @Test |
| @@ -61,12 +88,12 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | @@ -61,12 +88,12 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | ||
| 61 | WmsReceiptOrderDetailDO detail02 = createReceiptOrderDetail(orderId, 1002L, "2.00"); | 88 | WmsReceiptOrderDetailDO detail02 = createReceiptOrderDetail(orderId, 1002L, "2.00"); |
| 62 | receiptOrderDetailMapper.insert(detail01); | 89 | receiptOrderDetailMapper.insert(detail01); |
| 63 | receiptOrderDetailMapper.insert(detail02); | 90 | receiptOrderDetailMapper.insert(detail02); |
| 64 | - WmsReceiptOrderDetailDO updateDetail = createReceiptOrderDetail(999L, 2001L, "11.00"); | ||
| 65 | - updateDetail.setId(detail01.getId()); | ||
| 66 | - WmsReceiptOrderDetailDO createDetail = createReceiptOrderDetail(null, 2002L, "22.00"); | 91 | + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( |
| 92 | + createReceiptOrderDetailReqVO(detail01.getId(), 2001L, "11.00"), | ||
| 93 | + createReceiptOrderDetailReqVO(null, 2002L, "22.00")); | ||
| 67 | 94 | ||
| 68 | // 调用 | 95 | // 调用 |
| 69 | - receiptOrderDetailService.updateReceiptOrderDetailList(orderId, List.of(updateDetail, createDetail)); | 96 | + receiptOrderDetailService.updateReceiptOrderDetailList(orderId, reqVO); |
| 70 | 97 | ||
| 71 | // 断言:修改 | 98 | // 断言:修改 |
| 72 | WmsReceiptOrderDetailDO dbUpdateDetail = receiptOrderDetailMapper.selectById(detail01.getId()); | 99 | WmsReceiptOrderDetailDO dbUpdateDetail = receiptOrderDetailMapper.selectById(detail01.getId()); |
| @@ -90,14 +117,32 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | @@ -90,14 +117,32 @@ public class WmsReceiptOrderDetailServiceImplTest extends BaseDbUnitTest { | ||
| 90 | @Test | 117 | @Test |
| 91 | public void testUpdateReceiptOrderDetailList_detailNotExists() { | 118 | public void testUpdateReceiptOrderDetailList_detailNotExists() { |
| 92 | // mock 数据 | 119 | // mock 数据 |
| 93 | - WmsReceiptOrderDetailDO detail = createReceiptOrderDetail(10L, 1001L, "1.00"); | ||
| 94 | - detail.setId(999L); | 120 | + WmsReceiptOrderSaveReqVO reqVO = createReceiptOrderReqVO( |
| 121 | + createReceiptOrderDetailReqVO(999L, 1001L, "1.00")); | ||
| 95 | 122 | ||
| 96 | // 调用,并断言 | 123 | // 调用,并断言 |
| 97 | - assertServiceException(() -> receiptOrderDetailService.updateReceiptOrderDetailList(10L, List.of(detail)), | 124 | + assertServiceException(() -> receiptOrderDetailService.updateReceiptOrderDetailList(10L, reqVO), |
| 98 | RECEIPT_ORDER_DETAIL_NOT_EXISTS); | 125 | RECEIPT_ORDER_DETAIL_NOT_EXISTS); |
| 99 | } | 126 | } |
| 100 | 127 | ||
| 128 | + private static WmsReceiptOrderSaveReqVO createReceiptOrderReqVO(WmsReceiptOrderDetailSaveReqVO... details) { | ||
| 129 | + WmsReceiptOrderSaveReqVO reqVO = new WmsReceiptOrderSaveReqVO(); | ||
| 130 | + reqVO.setWarehouseId(100L); | ||
| 131 | + reqVO.setAreaId(0L); | ||
| 132 | + reqVO.setDetails(List.of(details)); | ||
| 133 | + return reqVO; | ||
| 134 | + } | ||
| 135 | + | ||
| 136 | + private static WmsReceiptOrderDetailSaveReqVO createReceiptOrderDetailReqVO(Long id, Long skuId, String quantity) { | ||
| 137 | + WmsReceiptOrderDetailSaveReqVO reqVO = new WmsReceiptOrderDetailSaveReqVO(); | ||
| 138 | + reqVO.setId(id); | ||
| 139 | + reqVO.setSkuId(skuId); | ||
| 140 | + reqVO.setAreaId(0L); | ||
| 141 | + reqVO.setQuantity(new BigDecimal(quantity)); | ||
| 142 | + reqVO.setAmount(new BigDecimal("100.00")); | ||
| 143 | + return reqVO; | ||
| 144 | + } | ||
| 145 | + | ||
| 101 | private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, String quantity) { | 146 | private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, String quantity) { |
| 102 | return WmsReceiptOrderDetailDO.builder() | 147 | return WmsReceiptOrderDetailDO.builder() |
| 103 | .orderId(orderId) | 148 | .orderId(orderId) |
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 | @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.wms.dal.dataobject.order.receipt.WmsReceiptOrderD | ||
| 6 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; | 6 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderDetailMapper; |
| 7 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderMapper; | 7 | import cn.iocoder.yudao.module.wms.dal.mysql.order.receipt.WmsReceiptOrderMapper; |
| 8 | import cn.iocoder.yudao.module.wms.enums.inventory.WmsInventoryOrderTypeEnum; | 8 | import cn.iocoder.yudao.module.wms.enums.inventory.WmsInventoryOrderTypeEnum; |
| 9 | -import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderStatusEnum; | 9 | +import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum; |
| 10 | import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; | 10 | import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; |
| 11 | import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; | 11 | import cn.iocoder.yudao.module.wms.framework.config.WmsProperties; |
| 12 | import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService; | 12 | import cn.iocoder.yudao.module.wms.service.inventory.WmsInventoryService; |
| @@ -23,6 +23,9 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; | @@ -23,6 +23,9 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; | ||
| 23 | 23 | ||
| 24 | import java.math.BigDecimal; | 24 | import java.math.BigDecimal; |
| 25 | 25 | ||
| 26 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | ||
| 27 | +import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_AREA_REQUIRED; | ||
| 28 | +import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.RECEIPT_ORDER_DETAIL_REQUIRED; | ||
| 26 | import static org.junit.jupiter.api.Assertions.assertEquals; | 29 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 27 | import static org.junit.jupiter.api.Assertions.assertNotNull; | 30 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 28 | import static org.mockito.ArgumentMatchers.any; | 31 | import static org.mockito.ArgumentMatchers.any; |
| @@ -58,7 +61,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | @@ -58,7 +61,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | ||
| 58 | Long skuId = 200L; | 61 | Long skuId = 200L; |
| 59 | WmsReceiptOrderDO order = createReceiptOrder(warehouseId); | 62 | WmsReceiptOrderDO order = createReceiptOrder(warehouseId); |
| 60 | receiptOrderMapper.insert(order); | 63 | receiptOrderMapper.insert(order); |
| 61 | - receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), skuId, warehouseId)); | 64 | + receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), skuId, warehouseId, 300L)); |
| 62 | 65 | ||
| 63 | // 调用 | 66 | // 调用 |
| 64 | receiptOrderService.completeReceiptOrder(order.getId()); | 67 | receiptOrderService.completeReceiptOrder(order.getId()); |
| @@ -66,7 +69,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | @@ -66,7 +69,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | ||
| 66 | // 断言:入库单 | 69 | // 断言:入库单 |
| 67 | WmsReceiptOrderDO dbOrder = receiptOrderMapper.selectById(order.getId()); | 70 | WmsReceiptOrderDO dbOrder = receiptOrderMapper.selectById(order.getId()); |
| 68 | assertNotNull(dbOrder); | 71 | assertNotNull(dbOrder); |
| 69 | - assertEquals(WmsReceiptOrderStatusEnum.COMPLETED.getStatus(), dbOrder.getStatus()); | 72 | + assertEquals(WmsOrderStatusEnum.FINISHED.getStatus(), dbOrder.getStatus()); |
| 70 | // 断言:库存变更 | 73 | // 断言:库存变更 |
| 71 | ArgumentCaptor<WmsInventoryChangeReqDTO> captor = ArgumentCaptor.forClass(WmsInventoryChangeReqDTO.class); | 74 | ArgumentCaptor<WmsInventoryChangeReqDTO> captor = ArgumentCaptor.forClass(WmsInventoryChangeReqDTO.class); |
| 72 | verify(inventoryService).changeInventory(captor.capture()); | 75 | verify(inventoryService).changeInventory(captor.capture()); |
| @@ -81,6 +84,31 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | @@ -81,6 +84,31 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | ||
| 81 | } | 84 | } |
| 82 | 85 | ||
| 83 | @Test | 86 | @Test |
| 87 | + public void testCompleteReceiptOrder_detailRequired() { | ||
| 88 | + // mock 数据 | ||
| 89 | + WmsReceiptOrderDO order = createReceiptOrder(100L); | ||
| 90 | + receiptOrderMapper.insert(order); | ||
| 91 | + | ||
| 92 | + // 调用,并断言 | ||
| 93 | + assertServiceException(() -> receiptOrderService.completeReceiptOrder(order.getId()), | ||
| 94 | + RECEIPT_ORDER_DETAIL_REQUIRED); | ||
| 95 | + verify(inventoryService, never()).changeInventory(any()); | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + @Test | ||
| 99 | + public void testCompleteReceiptOrder_areaRequired() { | ||
| 100 | + // mock 数据 | ||
| 101 | + WmsReceiptOrderDO order = createReceiptOrder(100L); | ||
| 102 | + receiptOrderMapper.insert(order); | ||
| 103 | + receiptOrderDetailMapper.insert(createReceiptOrderDetail(order.getId(), 200L, 100L, 0L)); | ||
| 104 | + | ||
| 105 | + // 调用,并断言 | ||
| 106 | + assertServiceException(() -> receiptOrderService.completeReceiptOrder(order.getId()), | ||
| 107 | + RECEIPT_ORDER_AREA_REQUIRED); | ||
| 108 | + verify(inventoryService, never()).changeInventory(any()); | ||
| 109 | + } | ||
| 110 | + | ||
| 111 | + @Test | ||
| 84 | public void testCancelReceiptOrder_success() { | 112 | public void testCancelReceiptOrder_success() { |
| 85 | // mock 数据 | 113 | // mock 数据 |
| 86 | WmsReceiptOrderDO order = createReceiptOrder(100L); | 114 | WmsReceiptOrderDO order = createReceiptOrder(100L); |
| @@ -92,7 +120,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | @@ -92,7 +120,7 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | ||
| 92 | // 断言 | 120 | // 断言 |
| 93 | WmsReceiptOrderDO dbOrder = receiptOrderMapper.selectById(order.getId()); | 121 | WmsReceiptOrderDO dbOrder = receiptOrderMapper.selectById(order.getId()); |
| 94 | assertNotNull(dbOrder); | 122 | assertNotNull(dbOrder); |
| 95 | - assertEquals(WmsReceiptOrderStatusEnum.CANCELED.getStatus(), dbOrder.getStatus()); | 123 | + assertEquals(WmsOrderStatusEnum.CANCELED.getStatus(), dbOrder.getStatus()); |
| 96 | verify(inventoryService, never()).changeInventory(any()); | 124 | verify(inventoryService, never()).changeInventory(any()); |
| 97 | } | 125 | } |
| 98 | 126 | ||
| @@ -100,19 +128,20 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | @@ -100,19 +128,20 @@ public class WmsReceiptOrderServiceImplTest extends BaseDbUnitTest { | ||
| 100 | return new WmsReceiptOrderDO() | 128 | return new WmsReceiptOrderDO() |
| 101 | .setNo("RK202605120001") | 129 | .setNo("RK202605120001") |
| 102 | .setType(WmsReceiptOrderTypeEnum.PURCHASE.getType()) | 130 | .setType(WmsReceiptOrderTypeEnum.PURCHASE.getType()) |
| 103 | - .setStatus(WmsReceiptOrderStatusEnum.PENDING.getStatus()) | 131 | + .setStatus(WmsOrderStatusEnum.PREPARE.getStatus()) |
| 104 | .setWarehouseId(warehouseId) | 132 | .setWarehouseId(warehouseId) |
| 105 | .setAreaId(0L) | 133 | .setAreaId(0L) |
| 106 | .setTotalQuantity(new BigDecimal("2.00")) | 134 | .setTotalQuantity(new BigDecimal("2.00")) |
| 107 | .setTotalAmount(new BigDecimal("20.00")); | 135 | .setTotalAmount(new BigDecimal("20.00")); |
| 108 | } | 136 | } |
| 109 | 137 | ||
| 110 | - private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, Long warehouseId) { | 138 | + private static WmsReceiptOrderDetailDO createReceiptOrderDetail(Long orderId, Long skuId, Long warehouseId, |
| 139 | + Long areaId) { | ||
| 111 | return WmsReceiptOrderDetailDO.builder() | 140 | return WmsReceiptOrderDetailDO.builder() |
| 112 | .orderId(orderId) | 141 | .orderId(orderId) |
| 113 | .skuId(skuId) | 142 | .skuId(skuId) |
| 114 | .warehouseId(warehouseId) | 143 | .warehouseId(warehouseId) |
| 115 | - .areaId(0L) | 144 | + .areaId(areaId) |
| 116 | .quantity(new BigDecimal("2.00")) | 145 | .quantity(new BigDecimal("2.00")) |
| 117 | .amount(new BigDecimal("20.00")) | 146 | .amount(new BigDecimal("20.00")) |
| 118 | .build(); | 147 | .build(); |