From 08cacefa4459c02e68633a2f2d8b362e5fb4648d Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 9 Dec 2025 13:12:42 +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

---
 .../oms/web/Oms2cWarehouseInController.java   | 34 ++++++++++++++++---
 .../oms/service/svc/IRpcWarehouseInSvc.java   |  8 ++---
 2 files changed, 31 insertions(+), 11 deletions(-)

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 994d8ba..840f138 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
@@ -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>
  */
 
@@ -28,6 +28,7 @@ import feign.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -37,10 +38,11 @@ import java.io.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 进仓单Controller
- * 
+ *
  * @author linfso
  * @date 2024-05-22 00:20:31
  */
@@ -84,9 +86,31 @@ public class Oms2cWarehouseInController extends BaseController
         String customerCode=getLoginUser().getUser().getCustomerCode();
         emisWarehouseIn.setCustomerCode(customerCode);
 
-        String queryStatusType= MapUtils.getString(emisWarehouseIn.getParams(),"queryStatusType","");
+        // 将对象转换为 Map，并处理 params 字段
+        Map<String, Object> queryMap = convertToQueryMap(emisWarehouseIn);
 
-        return iRpcWarehouseInSvc.listSimpleByOms(customerCode,queryStatusType,emisWarehouseIn.getSearchValue(),pageNum,pageSize);
+        return iRpcWarehouseInSvc.listSimpleByOms(queryMap, pageNum, pageSize);
+    }
+
+    /**
+     * 将 EmisWarehouseIn 转换为 Map，并处理 params 字段
+     */
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> convertToQueryMap(EmisWarehouseIn emisWarehouseIn) {
+        String jsonString = JSON.toJSONString(emisWarehouseIn);
+        Map<String, Object> queryMap = (Map<String, Object>) JSON.parseObject(jsonString, Map.class);
+
+        // 移除 params 字段，避免类型转换问题
+        queryMap.remove("params");
+
+        // 将 params 中的键值对转换为 params[key]=value 的形式
+        if (emisWarehouseIn.getParams() != null && emisWarehouseIn.getParams().size() > 0) {
+            for (Map.Entry<String, Object> entry : emisWarehouseIn.getParams().entrySet()) {
+                queryMap.put("params[" + entry.getKey() + "]", entry.getValue());
+            }
+        }
+
+        return queryMap;
     }
 
     /**
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 bb63c88..b63e6cb 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
@@ -4,7 +4,6 @@ package com.xdadan.erp.oms.service.svc;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.domain.EmisWarehouseIn;
 import com.xdadan.erp.oms.domain.EmisWarehouseInBatch;
-import com.xdadan.erp.oms.domain.vo.WaybillOrder;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -28,10 +27,7 @@ public interface IRpcWarehouseInSvc {
 
 
     @GetMapping("/apiweb/emisWarehouseIn/listSimpleByOms")
-    public AjaxResult listSimpleByOms(
-                            @RequestParam("customerCode") String customerCode,
-                            @RequestParam("queryStatusType") String queryStatusType,
-                            @RequestParam("searchValue") String searchValue,
+    public AjaxResult listSimpleByOms(@SpringQueryMap Map<String, Object> queryMap,
                            @RequestParam("pageNum") Integer pageNum,
                            @RequestParam("pageSize") Integer pageSize);
 
@@ -52,4 +48,4 @@ public interface IRpcWarehouseInSvc {
     public AjaxResult reportBatchWsInError(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch);
 
 
-}
\ No newline at end of file
+}