From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java b/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java
index e504be8..d02dcc2 100644
--- a/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ErpAccessTokenHandler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.exception.CoolException;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.ErpAccessTokenScheduler;
import com.zy.common.utils.HttpHandler;
@@ -16,15 +17,13 @@
private String erpIp = "http://10.100.221.19:81";
-
-
public void getAccessToken() {
JSONObject appTokenJson = new JSONObject();
- appTokenJson.put("appId","ESB");
- appTokenJson.put("appSecuret","123456789");
- appTokenJson.put("tenantid","ierp");
- appTokenJson.put("accountId","1492035591649364992");
- appTokenJson.put("language","zh_CN");
+ appTokenJson.put("appId", "ESB");
+ appTokenJson.put("appSecuret", "123456789");
+ appTokenJson.put("tenantid", "ierp");
+ appTokenJson.put("accountId", "1492035591649364992");
+ appTokenJson.put("language", "zh_CN");
JSONObject appTokenResp;
@@ -37,18 +36,31 @@
.build()
.doPost());
} catch (IOException e) {
- throw new RuntimeException(e);
+ log.info("杩炴帴erp鏈嶅姟鍣ㄨ秴鏃�");
+ return;
}
- JSONObject data = (JSONObject) appTokenResp.get("data");
+ JSONObject data = null;
+ try {
+ data = (JSONObject) appTokenResp.get("data");
+ } catch (Exception e) {
+ System.out.println("鑾峰彇appToken涓虹┖");
+ throw new CoolException(e);
+ }
+ if(data == null){
+ return;
+ }
+ if (data == null) {
+ return;
+ }
//鑾峰彇access_token
if ((boolean) data.get("success")) {
JSONObject accessTokenJson = new JSONObject();
- accessTokenJson.put("user","13800000000");
- accessTokenJson.put("apptoken",(String) data.get("app_token"));
- accessTokenJson.put("tenantid","ierp");
- accessTokenJson.put("accountId","1492035591649364992");
- accessTokenJson.put("usertype","Mobile");
+ accessTokenJson.put("user", "13800000000");
+ accessTokenJson.put("apptoken", (String) data.get("app_token"));
+ accessTokenJson.put("tenantid", "ierp");
+ accessTokenJson.put("accountId", "1492035591649364992");
+ accessTokenJson.put("usertype", "Mobile");
JSONObject accessTokenResp;
//鑾峰彇app_token锛岀敤app_token鑾峰彇access_token
@@ -62,14 +74,20 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- JSONObject accessTokenData = (JSONObject) accessTokenResp.get("data");
- if ((boolean)accessTokenData.get("success")) {
- ErpAccessTokenScheduler.accessToken = (String)accessTokenData.get("access_token");
- log.info("鏇存柊access_token, 鏂皌oken涓�:" + (String)accessTokenData.get("access_token"));
+ JSONObject accessTokenData = null;
+ try {
+ accessTokenData = (JSONObject) accessTokenResp.get("data");
+ } catch (Exception e) {
+ System.out.println("鑾峰彇accessToken涓虹┖");
+ throw new CoolException(e);
+ }
+
+ if ((boolean) accessTokenData.get("success")) {
+ ErpAccessTokenScheduler.accessToken = (String) accessTokenData.get("access_token");
+ log.info("鏇存柊access_token, 鏂皌oken涓�:" + (String) accessTokenData.get("access_token"));
}
}
-
}
--
Gitblit v1.9.1