From c9db22f6ccb6a6d66e38dec09807e88b160f29e8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 11:20:50 +0800
Subject: [PATCH] 销售订单-修改2
---
mes-plan/src/main/java/com/chinaztt/mes/plan/util/CustomerOrderUtil.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/util/CustomerOrderUtil.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/util/CustomerOrderUtil.java
index b18d0b3..14b9837 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/util/CustomerOrderUtil.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/util/CustomerOrderUtil.java
@@ -16,6 +16,8 @@
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -56,20 +58,17 @@
/**
* OTC 闄勪欢鑾峰彇
*
- * @param contractNumber
+ * @param orderNo
*/
- public R getOtcCustomerOrderFileList(String contractNumber) {
+ public R getOtcCustomerOrderFileList(String orderNo) {
try {
String token = getToken();
- Map<String, Object> map = new HashMap<>();
- map.put("orderNo", contractNumber);
- map.put("size", 1000);
- JSONObject result = JSONObject.parseObject(HttpRequest.get(customerOrderClientConfigure.getOtcHost() + customerOrderClientConfigure.getOtcFileUrl())
- .contentType("application/json")
- .header("Authorization", "Bearer " + token).form(map).execute().body());
+ String encode = URLEncoder.encode(orderNo);
+ System.out.println("url缂栫爜--------------------------"+encode);
+ JSONObject result = JSONObject.parseObject(HttpRequest.get(customerOrderClientConfigure.getOtcHost() + customerOrderClientConfigure.getOtcFileUrl() + orderNo)
+ .header("Authorization", "Bearer " + token).execute().body());
if (result.getInteger("code") == 0) {
- JSONObject jsonObject = result.getJSONObject("data");
- JSONArray jsonArray = jsonObject.getJSONArray("records");
+ JSONArray jsonArray = result.getJSONArray("data");
return R.ok(jsonArray);
} else {
return R.failed("鑾峰彇澶辫触锛�" + result.getString("msg"));
@@ -78,7 +77,6 @@
return R.failed("鑾峰彇寮傚父:"+ e.getMessage());
}
}
-
public CustomerOrder updateCustomerOrderLine(CustomerOrder customerOrder) {
if (StringUtils.isBlank(customerOrder.getOtcLineNo())) {
--
Gitblit v1.9.3