From d8cbd9c0b6ae133dc0cf09488f124d66296e70ee Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 21 四月 2025 08:44:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderReportHander.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java b/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java
index 149d301..568c966 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java
@@ -33,11 +33,11 @@
//绔彛
private String URL;
- @Value("${erp.address.inaddressSave}")
- //涓婃姤鍏ュ簱鍦板潃
- private String inaddressSave;
+// @Value("${erp.address.inaddressSave}")
+// //涓婃姤鍏ュ簱鍦板潃
+// private String inaddressSave;
@Value("${erp.address.outaddressSave}")
- //涓婃姤鍑哄簱鍦板潃
+ //涓婃姤鍑哄叆搴撳湴鍧�
private String outaddressSave;
@Autowired
private OrderService orderService;
@@ -70,12 +70,15 @@
// 濡傛灉鏈夌鍚堟潯浠剁殑鏁版嵁锛屾墽琛屼笂鎶�
if (!toReportList.isEmpty()) {
- reportPakIn(toReportList);
-
- for (OrderDetl detl : toReportList) {
- detl.setMemo("1");
- orderDetlService.updateById(detl);
- log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ boolean flag = reportPakIn(toReportList);
+ if(flag){
+ for (OrderDetl detl : toReportList) {
+ detl.setMemo("1");
+ orderDetlService.updateById(detl);
+ log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ }
+ } else {
+ log.warn("鍏ュ簱涓婃姤澶辫触锛屾湭鏇存柊鏄庣粏 memo 鏍囧織");
}
}
}
@@ -83,7 +86,7 @@
return SUCCESS;
}
- private void reportPakIn(List<OrderDetl> orderDetls) {
+ private boolean reportPakIn(List<OrderDetl> orderDetls) {
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -126,7 +129,7 @@
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(inaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
+ .setPath(outaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
.setJson(requestBody.toJSONString())
.build()
.doPost();
@@ -144,7 +147,7 @@
try {
apiLogService.save(
"鍏ュ簱涓婃姤",
- URL + inaddressSave,
+ URL + outaddressSave,
null,
"127.0.0.1",
requestBody.toJSONString(),
@@ -155,6 +158,7 @@
log.error("鏃ュ織淇濆瓨澶辫触", e);
}
}
+ return success;
}
public ReturnT<String> startPakOut() {
@@ -177,12 +181,15 @@
// 濡傛灉鏈夌鍚堟潯浠剁殑鏁版嵁锛屾墽琛屼笂鎶�
if (!toReportList.isEmpty()) {
- reportPakOut(toReportList);
-
- for (OrderDetl detl : toReportList) {
- detl.setMemo("1");
- orderDetlService.updateById(detl);
- log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ boolean flag = reportPakOut(toReportList);
+ if(flag){
+ for (OrderDetl detl : toReportList) {
+ detl.setMemo("1");
+ orderDetlService.updateById(detl);
+ log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ }
+ } else {
+ log.warn("鍑哄簱涓婃姤澶辫触锛屾湭鏇存柊鏄庣粏 memo 鏍囧織");
}
}
}
@@ -190,7 +197,7 @@
return SUCCESS;
}
- private void reportPakOut(List<OrderDetl> orderDetls) {
+ private boolean reportPakOut(List<OrderDetl> orderDetls) {
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -233,7 +240,7 @@
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(inaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
+ .setPath(outaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
.setJson(requestBody.toJSONString())
.build()
.doPost();
@@ -262,6 +269,7 @@
log.error("鏃ュ織淇濆瓨澶辫触", e);
}
}
+ return success;
}
public static Object findValueByKey(JSONObject json, String key) {
--
Gitblit v1.9.1