feat（wms）：增加供应商 select 组件

YunaiV
1 parent 8f9433ec
Showing 7 changed files with 17 additions and 6 deletions
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantPageReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.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<Integer> types;
+
 }
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -22,6 +22,7 @@ public interface WmsMerchantMapper extends BaseMapperX&lt;WmsMerchantDO&gt; {
                 .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&lt;WmsMerchantDO&gt; {
                 .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode())
                 .likeIfPresent(WmsMerchantDO::getName, reqVO.getName())
                 .eqIfPresent(WmsMerchantDO::getType, reqVO.getType())
+                .inIfPresent(WmsMerchantDO::getType, reqVO.getTypes())
                 .orderByDesc(WmsMerchantDO::getId));
     }
@@ -15,9 +15,10 @@ import java.util.Arrays;
 @AllArgsConstructor
 public enum WmsReceiptOrderTypeEnum implements ArrayValuable<Integer> {
-    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);