diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java index 4181a5c5c..a2e2c28ff 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java @@ -41,6 +41,9 @@ public class MoldBrandPageReqVO extends PageParam { @Schema(description = "状态", example = "0") private Integer status; + @Schema(description = "排除状态", example = "4") + private Integer excludeStatus; + @Schema(description = "当前位置", example = "一号机台") private String currentPosition; diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java index 1c87021bc..0795a310f 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java @@ -31,6 +31,7 @@ public interface MoldBrandMapper extends BaseMapperX { .likeIfPresent(MoldBrandDO::getImages, reqVO.getImages()) .likeIfPresent(MoldBrandDO::getVersion, reqVO.getVersion()) .eqIfPresent(MoldBrandDO::getStatus, reqVO.getStatus()) + .neIfPresent(MoldBrandDO::getStatus, reqVO.getExcludeStatus()) .likeIfPresent(MoldBrandDO::getCurrentPosition, reqVO.getCurrentPosition()) .eqIfPresent(MoldBrandDO::getUseTime, reqVO.getUseTime()) .eqIfPresent(MoldBrandDO::getMaintainType, reqVO.getMaintainType()) diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/enums/MoldBrandStatusEnum.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/enums/MoldBrandStatusEnum.java index bd9ce43ea..1b120d588 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/enums/MoldBrandStatusEnum.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/enums/MoldBrandStatusEnum.java @@ -13,7 +13,8 @@ public enum MoldBrandStatusEnum implements IntArrayValuable { ON_MACHINE(0, "在机"), STANDBY(1, "待用"), REPAIRING(2, "维修"), - SCRAPPED(3, "报废"); + SCRAPPED(3, "报废"), + IN_STOCK(4, "在库"); public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MoldBrandStatusEnum::getStatus).toArray(); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandPageRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandPageRespVO.java index 96b5613f3..b42328b39 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandPageRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandPageRespVO.java @@ -20,6 +20,9 @@ public class MoldBrandPageRespVO { @Schema(description = "待用数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") private Long standbyCount; + @Schema(description = "在库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "8") + private Long inStockCount; + @Schema(description = "维修数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "5") private Long repairingCount; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandStatusStatisticsRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandStatusStatisticsRespVO.java index 3e8296bff..9e43f6fd9 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandStatusStatisticsRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandStatusStatisticsRespVO.java @@ -16,6 +16,9 @@ public class MoldBrandStatusStatisticsRespVO { @Schema(description = "待用数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") private Long standbyCount; + @Schema(description = "在库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "8") + private Long inStockCount; + @Schema(description = "维修数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "5") private Long repairingCount; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java index 1ee7ed9ad..1be5673a9 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java @@ -232,6 +232,7 @@ public class MoldBrandServiceImpl implements MoldBrandService { respVO.setAllCount(statistics.getAllCount()); respVO.setOnMachineCount(statistics.getOnMachineCount()); respVO.setStandbyCount(statistics.getStandbyCount()); + respVO.setInStockCount(statistics.getInStockCount()); respVO.setRepairingCount(statistics.getRepairingCount()); respVO.setScrappedCount(statistics.getScrappedCount()); return respVO; @@ -248,6 +249,7 @@ public class MoldBrandServiceImpl implements MoldBrandService { respVO.setAllCount((long) list.size()); respVO.setOnMachineCount(countByStatus(list, MoldBrandStatusEnum.ON_MACHINE.getStatus())); respVO.setStandbyCount(countByStatus(list, MoldBrandStatusEnum.STANDBY.getStatus())); + respVO.setInStockCount(countByStatus(list, MoldBrandStatusEnum.IN_STOCK.getStatus())); respVO.setRepairingCount(countByStatus(list, MoldBrandStatusEnum.REPAIRING.getStatus())); respVO.setScrappedCount(countByStatus(list, MoldBrandStatusEnum.SCRAPPED.getStatus())); return respVO;