diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml
new file mode 100644
index 0000000..c52f866
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-oms-biz-web/emis-oms-biz-web.iml b/emis-oms-biz-web/emis-oms-biz-web.iml
index 04c9be4..47d2bd1 100644
--- a/emis-oms-biz-web/emis-oms-biz-web.iml
+++ b/emis-oms-biz-web/emis-oms-biz-web.iml
@@ -271,5 +271,6 @@
+
\ No newline at end of file
diff --git a/emis-oms-biz/emis-oms-biz.iml b/emis-oms-biz/emis-oms-biz.iml
index c8c03ba..d5ce80c 100644
--- a/emis-oms-biz/emis-oms-biz.iml
+++ b/emis-oms-biz/emis-oms-biz.iml
@@ -220,6 +220,7 @@
+
diff --git a/emis-oms-biz/pom.xml b/emis-oms-biz/pom.xml
index c21c0ab..40c5429 100644
--- a/emis-oms-biz/pom.xml
+++ b/emis-oms-biz/pom.xml
@@ -82,6 +82,14 @@
3.1.7
+
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.1.0
+
+
com.github.binarywang
weixin-java-miniapp
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
index 5571861..361248f 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
@@ -5,6 +5,7 @@ import com.xdadan.erp.oms.common.core.domain.AjaxResult;
import com.xdadan.erp.oms.domain.EmisSettleBill;
import com.xdadan.erp.oms.domain.EmisWarehouseIn;
import com.xdadan.erp.oms.domain.vo.WaybillOrder;
+import feign.QueryMap;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -22,15 +23,26 @@ import java.util.Map;
public interface IRpcSettleBillSvc {
+// @GetMapping("/apiweb/emisSettleBill/listSimple")
+// public AjaxResult listSimple(
+// @RequestParam("customerCode") String customerCode,
+// @RequestParam("params") Map params,
+// @RequestParam("searchValue") String searchValue,
+// @RequestParam("pageNum") Integer pageNum,
+// @RequestParam("pageSize") Integer pageSize);
+
+
@GetMapping("/apiweb/emisSettleBill/listSimple")
public AjaxResult listSimple(
@RequestParam("customerCode") String customerCode,
- @RequestParam("params") Map params,
- @RequestParam("searchValue") String searchValue,
+ @QueryMap Map queryMap,
@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize);
+
+
+
@GetMapping("/apiweb/emisSettleBill/getInfoBySettleBillNo")
public AjaxResult getInfoBySettleBillNo(@RequestParam("customerCode") String customerCode, @RequestParam("settleBillNo") String settleBillNo);