diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java index ed8c8aa..323a8e0 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java @@ -57,6 +57,9 @@ public class ItemPageReqVO extends PageParam { @Schema(description = "价格", example = "4") private BigDecimal price; + @Schema(description = "0:正常查询1查询的库位不包含已存在台账信息") + private String flag; + @Schema(description = "描述") private String describes; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java index 4573fb1..bab8f4c 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java @@ -25,11 +25,15 @@ import java.util.Map; public interface ItemMapper extends BaseMapperX { default PageResult selectPage(ItemPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ItemDO::getNumber, reqVO.getNumber()) - .eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable()) - .likeIfPresent(ItemDO::getName, reqVO.getName()) - .orderByDesc(ItemDO::getId)); + LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); + wrapperX.eqIfPresent(ItemDO::getNumber, reqVO.getNumber()); + wrapperX.eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable()); + wrapperX.likeIfPresent(ItemDO::getName, reqVO.getName()); + if("1".equals(reqVO.getFlag())){//查询排除有台账的备件 + wrapperX.notInSql(ItemDO::getNumber,"select DISTINCT a.item_number from basic_item_accounts a where a.available = 'TRUE' and a.deleted = 0"); + } + wrapperX.orderByDesc(ItemDO::getId); + return selectPage(reqVO,wrapperX); } default List selectList(ItemExportReqVO reqVO) {