From 076de4008e924f68c9a715f982e0a74f817aef06 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 12 May 2026 23:34:45 +0800 Subject: [PATCH] feat（wms）：增加供应商 select 组件 --- yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java | 6 ++++++ yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java | 2 +- yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java | 2 +- yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java | 2 +- yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java | 2 ++ yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java | 2 ++ yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.java | 7 ++++--- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java index c8f9a8d..eb71ab0 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java @@ -8,6 +8,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.List; + @Schema(description = "管理后台 - WMS 往来企业分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @@ -24,4 +26,8 @@ public class WmsMerchantPageReqVO extends PageParam { @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}") private Integer type; + @Schema(description = "往来企业类型数组", example = "2,3") + @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}") + private List types; + } 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 ad60e25..c607a7b 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 @@ -50,7 +50,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam { @Schema(description = "最大总金额", example = "1000.00") private BigDecimal totalAmountMax; - @Schema(description = "入库类型", example = "1") + @Schema(description = "入库类型", example = "101") @InEnum(WmsReceiptOrderTypeEnum.class) private Integer type; 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 853dc19..431723d 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 @@ -25,7 +25,7 @@ public class WmsReceiptOrderRespVO { @ExcelProperty("入库单号") private String no; - @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "101") @ExcelProperty(value = "入库类型", converter = DictConvert.class) @DictFormat(DictTypeConstants.RECEIPT_ORDER_TYPE) private Integer type; 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 9c2f249..7ba3ee5 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 @@ -25,7 +25,7 @@ public class WmsReceiptOrderSaveReqVO { @Size(max = 64, message = "入库单号长度不能超过 64 个字符") private String no; - @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "101") @NotNull(message = "入库类型不能为空") @InEnum(WmsReceiptOrderTypeEnum.class) private Integer type; 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 575a9e5..37e56d2 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 @@ -5,6 +5,7 @@ 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.md.warehouse.WmsWarehouseDO; import cn.iocoder.yudao.module.wms.enums.DictTypeConstants; +import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -39,6 +40,7 @@ public class WmsReceiptOrderDO extends BaseDO { /** * 入库类型 * + * 枚举 {@link WmsReceiptOrderTypeEnum} * 字典 {@link DictTypeConstants#RECEIPT_ORDER_TYPE} */ private Integer type; diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java index 6deddee..47abdb8 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java @@ -22,6 +22,7 @@ public interface WmsMerchantMapper extends BaseMapperX { .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode()) .likeIfPresent(WmsMerchantDO::getName, reqVO.getName()) .eqIfPresent(WmsMerchantDO::getType, reqVO.getType()) + .inIfPresent(WmsMerchantDO::getType, reqVO.getTypes()) .orderByDesc(WmsMerchantDO::getId)); } @@ -30,6 +31,7 @@ public interface WmsMerchantMapper extends BaseMapperX { .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode()) .likeIfPresent(WmsMerchantDO::getName, reqVO.getName()) .eqIfPresent(WmsMerchantDO::getType, reqVO.getType()) + .inIfPresent(WmsMerchantDO::getType, reqVO.getTypes()) .orderByDesc(WmsMerchantDO::getId)); } diff --git a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.java b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.java index cd6e724..1ac21f4 100644 --- a/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.java +++ b/yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.java @@ -15,9 +15,10 @@ import java.util.Arrays; @AllArgsConstructor public enum WmsReceiptOrderTypeEnum implements ArrayValuable { - PURCHASE(1, "采购入库"), - OUTSOURCING(2, "外协入库"), - RETURN(3, "退货入库"); + PRODUCTION(WmsOrderTypeConstants.RECEIPT_PRODUCTION, "生产入库"), + PURCHASE(WmsOrderTypeConstants.RECEIPT_PURCHASE, "采购入库"), + RETURN(WmsOrderTypeConstants.RECEIPT_RETURN, "退货入库"), + GIVE_BACK(WmsOrderTypeConstants.RECEIPT_GIVE_BACK, "归还入库"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(WmsReceiptOrderTypeEnum::getType).toArray(Integer[]::new); -- libgit2 0.21.4