From c77fe6d3ad5d9a90ec12fd3e87820f2ab9afc20e Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 13 May 2024 10:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=8F=B0=E8=B4=A6=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/controller/item/vo/ItemPageReqVO.java      |  3 +++
 .../win/module/eam/dal/mysql/item/ItemMapper.java  | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

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<ItemDO> {
 
     default PageResult<ItemDO> selectPage(ItemPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ItemDO>()
-                .eqIfPresent(ItemDO::getNumber, reqVO.getNumber())
-                .eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable())
-                .likeIfPresent(ItemDO::getName, reqVO.getName())
-                .orderByDesc(ItemDO::getId));
+        LambdaQueryWrapperX<ItemDO> 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<ItemDO> selectList(ItemExportReqVO reqVO) {