diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java index 0c9ec46..cf8d062 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockListReqVO.java @@ -23,7 +23,9 @@ public class MesWmMaterialStockListReqVO { @Schema(description = "批次编号") private Long batchId; - // TODO @芋艿:后面看看,要不要 batchCode + + @Schema(description = "批次号") + private String batchCode; @Schema(description = "开始时间(动态盘点用)") private LocalDateTime startTime; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java index 0d64e09..a85023c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java @@ -77,16 +77,17 @@ public interface MesWmMaterialStockMapper extends BaseMapperX selectListForStockTaking(MesWmMaterialStockListReqVO reqVO) { + default List selectList(MesWmMaterialStockListReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId()) .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId()) .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId()) .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getItemId()) .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId()) + .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode()) .geIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getStartTime()) .leIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getEndTime()) - .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO) // TODO @芋艿:需要在考虑下,要不要支持; + .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO) .orderByAsc(MesWmMaterialStockDO::getReceiptTime)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java index 6bfe925..e134441 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java @@ -123,7 +123,7 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService @Override public List getMaterialStockList(MesWmMaterialStockListReqVO reqVO) { - return materialStockMapper.selectListForStockTaking(reqVO); + return materialStockMapper.selectList(reqVO); } @Override