From a7a6f62fdcfde8bad76e39b0afc5615461bc1583 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 14 十一月 2023 12:03:20 +0800
Subject: [PATCH] 销售订单
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 8 ++++----
mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java | 4 ++--
mes-plan/src/main/java/com/chinaztt/mes/plan/util/CustomerOrderUtil.java | 11 +++--------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
index 5eb5aca..b01941a 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -304,14 +304,14 @@
/**
* 鍚屾otc璁㈠崟鏁版嵁
*
- * @param selectTime
- * @param pathCode 0:鍘熻矾寰�;1:璁㈠崟鎵�灞炲叕鍙镐负ZTKJ鐨勮鍗�
+ * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
+ * @param orderNo 璁㈠崟缂栧彿
* @return
*/
@GetMapping("/otcCustomerOrderSync")
- public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("pathCode") String pathCode) {
+ public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
log.info("---------------->"+selectTime);
- return customerOrderService.otcCustomerOrderSync(selectTime, pathCode);
+ return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
}
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java
index 908e90b..bfce325 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java
@@ -164,10 +164,10 @@
* 鍚屾otc鎺ュ彛
*
* @param selectTime
- * @param pathCode 0:鍘熻矾寰�;1:璁㈠崟鎵�灞炲叕鍙镐负ZTKJ鐨勮鍗�
+ * @param orderNo
* @return
*/
- R otcCustomerOrderSync(String selectTime, String pathCode);
+ R otcCustomerOrderSync(String selectTime, String orderNo);
/**
* 鑷姩鍚屾otc鎺ュ彛鐢ㄤ簬瀹氭椂浠诲姟姣忎釜灏忔椂1娆�
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..9cbedd7 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
@@ -61,15 +61,10 @@
public R getOtcCustomerOrderFileList(String contractNumber) {
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());
+ JSONObject result = JSONObject.parseObject(HttpRequest.get(customerOrderClientConfigure.getOtcHost() + customerOrderClientConfigure.getOtcFileUrl() + contractNumber)
+ .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"));
--
Gitblit v1.9.3