From 5e802e25e196adaf64487bd06103126b5e51187d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 03 一月 2025 10:00:50 +0800
Subject: [PATCH] 添加MES库存同步功能及配置
---
src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
index 139d6f1..0dd0a41 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
@@ -57,6 +57,9 @@
@Value("${mes.pakoutReportPath}")
private String pakoutReportPath;
+ @Value("${mes.stock}")
+ private String stock;
+
@Transactional
public ReturnT<String> start(ReportData data, Map<String, Object> mesTokenInfo) {
@@ -76,20 +79,21 @@
mesPath = orderReportPath;
break;
}
- doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1");
- reportDataService.deleteById(data.getId());
ReportDataLog reportDataLog = new ReportDataLog();
+ String result = doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1");
+ reportDataService.deleteById(data.getId());
BeanUtil.copyProperties(data, reportDataLog);
reportDataLog.setReportTime(new Date());
reportDataLog.setReportDataId(data.getId());
+ reportDataLog.setThreeCode(result);
reportDataLogService.insert(reportDataLog);
}
return SUCCESS;
}
- private JSONObject doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
- String response = "";
+ private String doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
+ String response = "fail";
boolean success = false;
try {
@@ -102,14 +106,22 @@
throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
- return jsonObject;
+ return null;
} catch (Exception e) {
- log.error(e.getMessage());
- throw new CoolException(e.getMessage());
+ log.error("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細{}", e.getMessage());
+ //throw new CoolException(e.getMessage());
} finally {
apiLogService.save(namespace, url + path, appkey, ip, requestParam, response, success);
}
+ return response;
+ }
+
+ @Transactional
+ public ReturnT<String> stock(Map<String, Object> mesTokenInfo) {
+ String result = doHttpRequest("{}", mesTokenInfo, "鍚屾MES搴撳瓨", url, stock, null, "127.0.0.1");
+
+ return SUCCESS;
}
}
--
Gitblit v1.9.1