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 751ad7e..15243ef 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
@@ -1,11 +1,11 @@
 
-/** 
+/**
   * @Project: emis
   * @Title: EmisWarehouseInController.java
   * @author linfso
   * @date 2024-05-22 00:20:31
   * @Copyright: ShangHai Duta 2022 All rights reserved.
-  * @version v1.0  
+  * @version v1.0
   * @Description: <p> 进仓单 控制器 </p>
  */
 
@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * 进仓单Controller
- * 
+ *
  * @author linfso
  * @date 2024-05-22 00:20:31
  */
@@ -113,12 +113,25 @@ public class WarehouseInController extends BaseController
             "waybillDetail"
     },value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSimpleByOms")
-    public TableDataInfo listSimpleByOms(EmisWarehouseIn emisWarehouseIn,String queryStatusType)
+    public TableDataInfo listSimpleByOms(EmisWarehouseIn emisWarehouseIn)
     {
         startPage();
 
-        emisWarehouseIn.getParams().put("queryStatusType",queryStatusType);
+        if(!StringUtils.isEmpty(emisWarehouseIn.getBillCode())){
+            emisWarehouseIn.setBillCode( WaybillHelper.formatQueryValue(emisWarehouseIn.getBillCode()));
+            String[] billCodeSortList = emisWarehouseIn.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWarehouseIn.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
 
+        if(!StringUtils.isEmpty(emisWarehouseIn.getInNo())){
+            emisWarehouseIn.setInNo(WaybillHelper.formatQueryValue(emisWarehouseIn.getInNo()));
+            String[] inNoSortList = emisWarehouseIn.getInNo().split(",");
+            if(inNoSortList.length>1){
+                emisWarehouseIn.getParams().put("inNoSortList",Arrays.asList(inNoSortList));
+            }
+        }
         List<EmisWarehouseIn> list = emisWarehouseInService.selectEmisWarehouseInListByOms(emisWarehouseIn);
         return getDataTable(list);
     }