BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 076de4008e924f68c9a715f982e0a74f817aef06

Authored by YunaiV
1 parent 8f9433ec

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

Inline Side-by-side
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
  View file @076de40
... ... @@ -8,6 +8,8 @@ import lombok.Data;
8 8 import lombok.EqualsAndHashCode;
9 9 import lombok.ToString;
10 10  
  11 +import java.util.List;
  12 +
11 13 @Schema(description = "管理后台 - WMS 往来企业分页 Request VO")
12 14 @Data
13 15 @EqualsAndHashCode(callSuper = true)
... ... @@ -24,4 +26,8 @@ public class WmsMerchantPageReqVO extends PageParam {
24 26 @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}")
25 27 private Integer type;
26 28  
  29 + @Schema(description = "往来企业类型数组", example = "2,3")
  30 + @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}")
  31 + private List<Integer> types;
  32 +
27 33 }
... ...
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderPageReqVO.java
  View file @076de40
... ... @@ -50,7 +50,7 @@ public class WmsReceiptOrderPageReqVO extends PageParam {
50 50 @Schema(description = "最大总金额", example = "1000.00")
51 51 private BigDecimal totalAmountMax;
52 52  
53   - @Schema(description = "入库类型", example = "1")
  53 + @Schema(description = "入库类型", example = "101")
54 54 @InEnum(WmsReceiptOrderTypeEnum.class)
55 55 private Integer type;
56 56  
... ...
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderRespVO.java
  View file @076de40
... ... @@ -25,7 +25,7 @@ public class WmsReceiptOrderRespVO {
25 25 @ExcelProperty("入库单号")
26 26 private String no;
27 27  
28   - @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  28 + @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "101")
29 29 @ExcelProperty(value = "入库类型", converter = DictConvert.class)
30 30 @DictFormat(DictTypeConstants.RECEIPT_ORDER_TYPE)
31 31 private Integer type;
... ...
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/order/receipt/vo/order/WmsReceiptOrderSaveReqVO.java
  View file @076de40
... ... @@ -25,7 +25,7 @@ public class WmsReceiptOrderSaveReqVO {
25 25 @Size(max = 64, message = "入库单号长度不能超过 64 个字符")
26 26 private String no;
27 27  
28   - @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  28 + @Schema(description = "入库类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "101")
29 29 @NotNull(message = "入库类型不能为空")
30 30 @InEnum(WmsReceiptOrderTypeEnum.class)
31 31 private Integer type;
... ...
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/order/receipt/WmsReceiptOrderDO.java
  View file @076de40
... ... @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
5 5 import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseAreaDO;
6 6 import cn.iocoder.yudao.module.wms.dal.dataobject.md.warehouse.WmsWarehouseDO;
7 7 import cn.iocoder.yudao.module.wms.enums.DictTypeConstants;
  8 +import cn.iocoder.yudao.module.wms.enums.order.WmsReceiptOrderTypeEnum;
8 9 import com.baomidou.mybatisplus.annotation.KeySequence;
9 10 import com.baomidou.mybatisplus.annotation.TableId;
10 11 import com.baomidou.mybatisplus.annotation.TableName;
... ... @@ -39,6 +40,7 @@ public class WmsReceiptOrderDO extends BaseDO {
39 40 /**
40 41 * 入库类型
41 42 *
  43 + * 枚举 {@link WmsReceiptOrderTypeEnum}
42 44 * 字典 {@link DictTypeConstants#RECEIPT_ORDER_TYPE}
43 45 */
44 46 private Integer type;
... ...
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java
  View file @076de40
... ... @@ -22,6 +22,7 @@ public interface WmsMerchantMapper extends BaseMapperX&lt;WmsMerchantDO&gt; {
22 22 .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode())
23 23 .likeIfPresent(WmsMerchantDO::getName, reqVO.getName())
24 24 .eqIfPresent(WmsMerchantDO::getType, reqVO.getType())
  25 + .inIfPresent(WmsMerchantDO::getType, reqVO.getTypes())
25 26 .orderByDesc(WmsMerchantDO::getId));
26 27 }
27 28  
... ... @@ -30,6 +31,7 @@ public interface WmsMerchantMapper extends BaseMapperX&lt;WmsMerchantDO&gt; {
30 31 .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode())
31 32 .likeIfPresent(WmsMerchantDO::getName, reqVO.getName())
32 33 .eqIfPresent(WmsMerchantDO::getType, reqVO.getType())
  34 + .inIfPresent(WmsMerchantDO::getType, reqVO.getTypes())
33 35 .orderByDesc(WmsMerchantDO::getId));
34 36 }
35 37  
... ...
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/order/WmsReceiptOrderTypeEnum.java
  View file @076de40
... ... @@ -15,9 +15,10 @@ import java.util.Arrays;
15 15 @AllArgsConstructor
16 16 public enum WmsReceiptOrderTypeEnum implements ArrayValuable<Integer> {
17 17  
18   - PURCHASE(1, "采购入库"),
19   - OUTSOURCING(2, "外协入库"),
20   - RETURN(3, "退货入库");
  18 + PRODUCTION(WmsOrderTypeConstants.RECEIPT_PRODUCTION, "生产入库"),
  19 + PURCHASE(WmsOrderTypeConstants.RECEIPT_PURCHASE, "采购入库"),
  20 + RETURN(WmsOrderTypeConstants.RECEIPT_RETURN, "退货入库"),
  21 + GIVE_BACK(WmsOrderTypeConstants.RECEIPT_GIVE_BACK, "归还入库");
21 22  
22 23 public static final Integer[] ARRAYS = Arrays.stream(values()).map(WmsReceiptOrderTypeEnum::getType).toArray(Integer[]::new);
23 24  
... ...