fix:添加仓库分类

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java

@@ -96,7 +96,8 @@ public class ErpWarehouseController {
     public CommonResult<List<ErpWarehouseRespVO>> getWarehouseSimpleList() {
         List<ErpWarehouseDO> list = warehouseService.getWarehouseListByStatus(CommonStatusEnum.ENABLE.getStatus());
         return success(convertList(list, warehouse -> new ErpWarehouseRespVO().setId(warehouse.getId())
-                .setName(warehouse.getName()).setDefaultStatus(warehouse.getDefaultStatus())));
+                .setName(warehouse.getName()).setCategoryType(warehouse.getCategoryType())
+                .setDefaultStatus(warehouse.getDefaultStatus())));
     }
 
     @GetMapping("/export-excel")

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/enums/ErpWarehouseCategoryEnum.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.erp.controller.admin.stock.enums;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@Getter
+@AllArgsConstructor
+public enum ErpWarehouseCategoryEnum implements IntArrayValuable {
+
+    PRODUCT(1, "产品"),
+    MATERIAL(2, "物料"),
+    SPARE_PART(3, "备件"),
+    OTHER(4, "其他");
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ErpWarehouseCategoryEnum::getCategory).toArray();
+
+    private final Integer category;
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInPageReqVO.java

@@ -31,7 +31,7 @@ public class ErpStockInPageReqVO extends PageParam {
     private LocalDateTime[] inTime;
 
     @Schema(description = "状态", example = "10")
-    @InEnum(ErpStockInStatusEnum.class)
+//    @InEnum(ErpStockInStatusEnum.class)
     private List<Integer> statusList;
 
     @Schema(description = "入库类型", example = "其它入库")

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutPageReqVO.java

@@ -40,7 +40,7 @@ public class ErpStockOutPageReqVO extends PageParam {
     private LocalDateTime[] outTime;
 
     @Schema(description = "状态", example = "10")
-    @InEnum(ErpStockOutStatusEnum.class)
+//    @InEnum(ErpStockOutStatusEnum.class)
     private List<Integer> statusList;
 
     @Schema(description = "审核人编号", example = "1")

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehousePageReqVO.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.enums.ErpWarehouseCategoryEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,10 +18,14 @@ public class ErpWarehousePageReqVO extends PageParam {
     @Schema(description = "仓库名称", example = "李四")
     private String name;
 
+    @Schema(description = "仓库分类", example = "1")
+    @InEnum(ErpWarehouseCategoryEnum.class)
+    private Integer categoryType;
+
     @Schema(description = "开启状态", example = "1")
     @InEnum(CommonStatusEnum.class)
     private Integer status;
 
     @Schema(description = "id集合导出用")
     private String ids;
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseRespVO.java

@@ -27,6 +27,10 @@ public class ErpWarehouseRespVO {
     @ExcelProperty("仓库名称")
     private String name;
 
+    @Schema(description = "仓库分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("仓库分类")
+    private Integer categoryType;
+
     @Schema(description = "仓库地址", example = "上海陆家嘴")
     @ExcelProperty("仓库地址")
     private String address;
@@ -78,5 +82,4 @@ public class ErpWarehouseRespVO {
     @Schema(description = "库位列表")
     private List<WarehouseLocationRespVO> locationList;
 
-
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseSaveReqVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.enums.ErpWarehouseCategoryEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -20,6 +21,11 @@ public class ErpWarehouseSaveReqVO {
     @NotEmpty(message = "仓库名称不能为空")
     private String name;
 
+    @Schema(description = "仓库分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "仓库分类不能为空")
+    @InEnum(ErpWarehouseCategoryEnum.class)
+    private Integer categoryType;
+
     @Schema(description = "仓库地址", example = "上海陆家嘴")
     private String address;
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpWarehouseDO.java

@@ -32,6 +32,10 @@ public class ErpWarehouseDO extends BaseDO {
      * 仓库名称
      */
     private String name;
+    /**
+     * 仓库分类
+     */
+    private Integer categoryType;
     /**
      * 仓库地址
      */
@@ -67,4 +71,4 @@ public class ErpWarehouseDO extends BaseDO {
      */
     private Boolean defaultStatus;
 
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpWarehouseMapper.java

@@ -24,6 +24,7 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
 
         LambdaQueryWrapperX<ErpWarehouseDO> erpWarehouseDOLambdaQueryWrapperX = new LambdaQueryWrapperX<ErpWarehouseDO>()
                 .likeIfPresent(ErpWarehouseDO::getName, reqVO.getName())
+                .eqIfPresent(ErpWarehouseDO::getCategoryType, reqVO.getCategoryType())
                 .eqIfPresent(ErpWarehouseDO::getStatus, reqVO.getStatus())
                 .orderByDesc(ErpWarehouseDO::getId);
 
@@ -47,4 +48,4 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
         return selectList(ErpWarehouseDO::getStatus, status);
     }
 
-}
+}