diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
index 613a3c6..2aad11c 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
@@ -52,6 +52,7 @@ public class WarehouseInController extends BaseController
     /**
      * 查询进仓单列表
      */
+
     @GetMapping("/list")
     public TableDataInfo list(EmisWarehouseIn emisWarehouseIn)
     {
@@ -78,6 +79,7 @@ public class WarehouseInController extends BaseController
     }
 
 
+    @Log(title = "进仓单查询", businessType = BusinessType.OTHER)
     @JacksonFilter(include= {
             "inNo",
             "orderSn",
@@ -106,10 +108,12 @@ public class WarehouseInController extends BaseController
             "waybillDetail"
     },value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSimple")
-    public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn)
+    public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn,String queryStatusType)
     {
         startPage();
-        emisWarehouseIn.setUsedStatus("0");
+
+        emisWarehouseIn.getParams().put("queryStatusType",queryStatusType);
+
         List<EmisWarehouseIn> list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn);
         return getDataTable(list);
     }