From 79effb0e6001fad6df93a504ed813fe0a40898d8 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 9 Dec 2025 13:13:38 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20OMS=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E5=AF=B9=E8=B4=A7=E7=AE=A1=E7=90=86=20-=E8=BF=9B=E4=BB=93?=
 =?UTF-8?q?=E5=AF=B9=E8=B4=A7=20-=20=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BF=90=E5=8D=95=E5=8F=B7/=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=93=E5=8D=95=E5=8F=B7/=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4/=E7=A1=AE=E8=AE=A4=E7=8A=B6=E6=80=81/=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=93=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/apiweb/WarehouseInController.java     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

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);
     }