diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/controller/PurchaseController.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/controller/PurchaseController.java
index 7730155..d4c856e 100644
--- a/book-ware/src/main/java/com/bookstore/bookmall/ware/controller/PurchaseController.java
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/controller/PurchaseController.java
@@ -5,11 +5,7 @@ import java.util.Map;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.bookstore.bookmall.ware.entity.PurchaseEntity;
 import com.bookstore.bookmall.ware.service.PurchaseService;
@@ -31,6 +27,26 @@ public class PurchaseController {
     @Autowired
     private PurchaseService purchaseService;
 
+    //合并采购需求
+    // /ware/purchase/merge
+    @PostMapping("/ware/purchase/merge")
+    //@RequiresPermissions("ware:purchase:list")
+    public R unreceivelist(@RequestParam Map<String, Object> params){
+        PageUtils page = purchaseService.queryPageUnreceivePurchase(params);
+
+        return R.ok().put("page", page);
+    }
+
+    //查询采购单
+    // /unreceive/list
+    @RequestMapping("/unreceive/list")
+    //@RequiresPermissions("ware:purchase:list")
+    public R unreceivelist(@RequestParam Map<String, Object> params){
+        PageUtils page = purchaseService.queryPageUnreceivePurchase(params);
+
+        return R.ok().put("page", page);
+    }
+
     /**
      * 列表
      */
diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/PurchaseService.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/PurchaseService.java
index a3b6a3f..11a5d44 100644
--- a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/PurchaseService.java
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/PurchaseService.java
@@ -16,5 +16,7 @@ import java.util.Map;
 public interface PurchaseService extends IService<PurchaseEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    PageUtils queryPageUnreceivePurchase(Map<String, Object> params);
 }
 
diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseDetailServiceImpl.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseDetailServiceImpl.java
index 2b0768e..b4d57c9 100644
--- a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseDetailServiceImpl.java
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseDetailServiceImpl.java
@@ -1,5 +1,7 @@
 package com.bookstore.bookmall.ware.service.impl;
 
+import com.bookstore.bookmall.ware.entity.WareSkuEntity;
+import com.mysql.cj.util.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +20,34 @@ public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailDao, Pu
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+
+        //        key: "华为" //检索关键字
+        //        status: 1,
+        //        wareId: 2,
+
+        QueryWrapper<PurchaseDetailEntity> queryWrapper = new QueryWrapper<>();
+
+        String key = (String)params.get("key");
+        if (!StringUtils.isNullOrEmpty(key)) {
+            queryWrapper.and((w)->{
+                w.eq("purchase_id", key).or().eq("sku_id",key);
+            });
+        }
+
+        String status = (String)params.get("status");
+        if (!StringUtils.isNullOrEmpty(status)) {
+            queryWrapper.eq("status", status);
+        }
+
+        String wareId = (String)params.get("wareId");
+        if (!StringUtils.isNullOrEmpty(wareId)) {
+            queryWrapper.eq("ware_id", wareId);
+        }
+
         IPage<PurchaseDetailEntity> page = this.page(
                 new Query<PurchaseDetailEntity>().getPage(params),
-                new QueryWrapper<PurchaseDetailEntity>()
+                queryWrapper
         );
 
         return new PageUtils(page);
diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseServiceImpl.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseServiceImpl.java
index d25fff0..a782498 100644
--- a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseServiceImpl.java
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/PurchaseServiceImpl.java
@@ -16,8 +16,12 @@ import com.bookstore.bookmall.ware.service.PurchaseService;
 @Service("purchaseService")
 public class PurchaseServiceImpl extends ServiceImpl<PurchaseDao, PurchaseEntity> implements PurchaseService {
 
+
+
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
         IPage<PurchaseEntity> page = this.page(
                 new Query<PurchaseEntity>().getPage(params),
                 new QueryWrapper<PurchaseEntity>()
@@ -26,4 +30,17 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseDao, PurchaseEntity
         return new PageUtils(page);
     }
 
+    @Override
+    public PageUtils queryPageUnreceivePurchase(Map<String, Object> params) {
+
+
+        IPage<PurchaseEntity> page = this.page(
+                new Query<PurchaseEntity>().getPage(params),
+                new QueryWrapper<PurchaseEntity>().eq("status", 0)
+                        .or().eq("status", 1)
+        );
+
+        return new PageUtils(page);
+    }
+
 }
\ No newline at end of file
diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareInfoServiceImpl.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareInfoServiceImpl.java
index 86e9c44..27069be 100644
--- a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareInfoServiceImpl.java
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bookstore.bookmall.ware.service.impl;
 
+import com.mysql.cj.util.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,21 @@ public class WareInfoServiceImpl extends ServiceImpl<WareInfoDao, WareInfoEntity
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+
+        QueryWrapper<WareInfoEntity> wrapper = new QueryWrapper<>();
+        String key = (String) params.get("key");
+        if (!StringUtils.isNullOrEmpty(key)) {
+            wrapper.eq("id", key)
+                    .or().like("name", key)
+                    .or().like("address", key)
+                    .or().eq("areacode",key);
+            };
+
+
         IPage<WareInfoEntity> page = this.page(
                 new Query<WareInfoEntity>().getPage(params),
-                new QueryWrapper<WareInfoEntity>()
+                wrapper
         );
 
         return new PageUtils(page);
diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareSkuServiceImpl.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareSkuServiceImpl.java
index 1f991a4..1a156fe 100644
--- a/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareSkuServiceImpl.java
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/service/impl/WareSkuServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bookstore.bookmall.ware.service.impl;
 
+import com.mysql.cj.util.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,25 @@ public class WareSkuServiceImpl extends ServiceImpl<WareSkuDao, WareSkuEntity> i
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        /*
+            skuId: ,//商品id
+            wareId: ,//仓库id
+        * */
+        QueryWrapper<WareSkuEntity> wareSkuEntityQueryWrapper = new QueryWrapper<>();
+        String skuId = (String)params.get("skuId");
+        if (!StringUtils.isNullOrEmpty(skuId)) {
+            wareSkuEntityQueryWrapper.eq("sku_id", skuId);
+        }
+
+        String wareId = (String)params.get("wareId");
+        if (!StringUtils.isNullOrEmpty(wareId)) {
+            wareSkuEntityQueryWrapper.eq("ware_id", wareId);
+        }
+
         IPage<WareSkuEntity> page = this.page(
                 new Query<WareSkuEntity>().getPage(params),
-                new QueryWrapper<WareSkuEntity>()
+                wareSkuEntityQueryWrapper
         );
 
         return new PageUtils(page);
diff --git a/book-ware/src/main/java/com/bookstore/bookmall/ware/vo/MergeVo.java b/book-ware/src/main/java/com/bookstore/bookmall/ware/vo/MergeVo.java
new file mode 100644
index 0000000..5b303ac
--- /dev/null
+++ b/book-ware/src/main/java/com/bookstore/bookmall/ware/vo/MergeVo.java
@@ -0,0 +1,5 @@
+package com.bookstore.bookmall.ware.vo;
+
+
+public class MergeVo {
+}
diff --git a/book-ware/src/main/resources/application.yml b/book-ware/src/main/resources/application.yml
index 736edac..739061c 100644
--- a/book-ware/src/main/resources/application.yml
+++ b/book-ware/src/main/resources/application.yml
@@ -18,4 +18,8 @@ mybatis-plus:
       id-type: auto #主键自增
 
 server:
-  port: 11000
\ No newline at end of file
+  port: 11000
+
+logging:
+  level:
+    com.bookstore: debug
\ No newline at end of file