diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/StockWarnQueryDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/StockWarnQueryDTO.java deleted file mode 100644 index 91a321431..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/StockWarnQueryDTO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.bsd.pjcloud.supermarket.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * 库存预警查询DTO - * - * @author zjf - * @date 2025-01-27 - */ -@Data -@Schema(description = "库存预警查询DTO") -public class StockWarnQueryDTO { - - /** - * 商品货号 - */ - @Schema(description = "商品货号") - private String productCode; - - /** - * 商品条码 - */ - @Schema(description = "商品条码") - private String barcode; - - /** - * 商品名称 - */ - @Schema(description = "商品名称") - private String productName; - - /** - * 预警类型:1=库存不足 2=库存超额 - */ - @Schema(description = "预警类型:1=库存不足 2=库存超额") - private String warnType; - - /** - * 分类ID - */ - @Schema(description = "分类ID") - private Long categoryId; -} - - diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index c7ac48451..923d6f28f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -12,7 +12,7 @@ import com.bsd.pjcloud.common.excel.annotation.RequestExcel; import com.bsd.pjcloud.common.idempotent.annotation.Idempotent; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.util.SecurityUtils; -import com.bsd.pjcloud.supermarket.dto.StockWarnQueryDTO; + import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockByCodeReqDTO; @@ -22,6 +22,7 @@ import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportPDNewDto; import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuPageDto; import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportNewDto; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.*; +import com.bsd.pjcloud.supermarket.dto.stockwarn.StockWarnQueryDTO; import com.bsd.pjcloud.supermarket.entity.*; import com.bsd.pjcloud.supermarket.service.*; import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpStockMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpStockMapper.java index 118b0e07c..0147ed8fd 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpStockMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpStockMapper.java @@ -3,7 +3,7 @@ package com.bsd.pjcloud.supermarket.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; -import com.bsd.pjcloud.supermarket.dto.StockWarnQueryDTO; +import com.bsd.pjcloud.supermarket.dto.stockwarn.StockWarnQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity; import com.bsd.pjcloud.supermarket.vo.stockwarn.StockWarnVO; import org.apache.ibatis.annotations.Param; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpStockService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpStockService.java index 5a28226da..d678ccc24 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpStockService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpStockService.java @@ -3,8 +3,8 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.bsd.pjcloud.supermarket.dto.StockWarnQueryDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.UpdateStockDTO; +import com.bsd.pjcloud.supermarket.dto.stockwarn.StockWarnQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity; import com.bsd.pjcloud.supermarket.vo.stockwarn.StockWarnVO; import com.github.houbb.heaven.annotation.reflect.Param; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpStockServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpStockServiceImpl.java index fe329b3d4..fc13e9d2f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpStockServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpStockServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bsd.pjcloud.supermarket.dto.StockWarnQueryDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordSaveItemDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.UpdateStockDTO; import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity; @@ -18,7 +17,7 @@ import com.bsd.pjcloud.supermarket.vo.stockwarn.StockWarnVO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - +import com.bsd.pjcloud.supermarket.dto.stockwarn.StockWarnQueryDTO; import java.util.List; /**