diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java
index bbd9100..dc34273 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java
@@ -25,6 +25,7 @@ import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc;
 import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc;
 import feign.Response;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +74,7 @@ public class Oms2cWarehouseInController extends BaseController
     }
 
 
+    @Log(title = "进仓单列表", businessType = BusinessType.OTHER)
     @GetMapping("/listSimple")
     public AjaxResult listSimple(EmisWarehouseIn emisWarehouseIn)
     {
@@ -83,7 +85,9 @@ public class Oms2cWarehouseInController extends BaseController
         String customerCode=getLoginUser().getUser().getCustomerCode();
         emisWarehouseIn.setCustomerCode(customerCode);
 
-        return iRpcWarehouseInSvc.listSimple(emisWarehouseIn,pageNum,pageSize);
+        String queryStatusType= MapUtils.getString(emisWarehouseIn.getParams(),"queryStatusType","");
+
+        return iRpcWarehouseInSvc.listSimple(customerCode,queryStatusType,emisWarehouseIn.getSearchValue(),pageNum,pageSize);
     }
 
     /**
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java
index 811d95d..5f35481 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java
@@ -26,20 +26,14 @@ public interface IRpcWarehouseInSvc {
                            @RequestParam("pageSize") Integer pageSize);
 
 
-    @GetMapping("/apiweb/emisWarehouseIn/listSimple1")
-    public AjaxResult listSimple1(
+    @GetMapping("/apiweb/emisWarehouseIn/listSimple")
+    public AjaxResult listSimple(
                             @RequestParam("customerCode") String customerCode,
-                            @RequestParam("params") Map<String,Object> params,
+                            @RequestParam("queryStatusType") String queryStatusType,
                             @RequestParam("searchValue") String searchValue,
                            @RequestParam("pageNum") Integer pageNum,
                            @RequestParam("pageSize") Integer pageSize);
 
-    @GetMapping("/apiweb/emisWarehouseIn/listSimple")
-    public AjaxResult listSimple(
-            @SpringQueryMap EmisWarehouseIn emisWarehouseIn,
-            @RequestParam("pageNum") Integer pageNum,
-            @RequestParam("pageSize") Integer pageSize);
-
 
     @GetMapping("/apiweb/emisWarehouseIn/getWarehouseInByInNo")
     public AjaxResult getWarehouseInByInNo(@RequestParam("customerCode") String customerCode,@RequestParam("inNo")String inNo);