From 43f9cf624b83c9d3d0e2280a1404dcc52695a18d Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 29 十二月 2025 16:01:08 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 21 +++++++++++++++++++--
src/main/java/com/zy/api/service/KopenApiService.java | 5 ++++-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 7 +++++--
src/main/java/com/zy/api/controller/KopenApiController.java | 2 +-
src/main/java/com/zy/asrs/entity/Order.java | 4 ++++
5 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index f426e4a..6d7c2cf 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -86,7 +86,7 @@
// if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
// return XSR.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
// }
- return kopenApiService.getInDispatchResult(params);
+ return kopenApiService.getInDispatchResult(params, null);
}
/**
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index 1cdb3a5..c675754 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -9,6 +9,7 @@
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.entity.dto.XSR;
+import com.zy.asrs.entity.Order;
public interface KopenApiService {
@@ -41,10 +42,12 @@
/**
* 涓婃灦娲惧伐鍗曞弽棣�
+ *
* @param params
+ * @param order
* @return
*/
- XSR getInDispatchResult(List<ReportOrderParam> params);
+ XSR getInDispatchResult(List<ReportOrderParam> params, Order order);
/**
* 澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 11bfaae..ea5c884 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -101,11 +101,12 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public XSR getInDispatchResult(List<ReportOrderParam> params) {
+ public XSR getInDispatchResult(List<ReportOrderParam> params, Order order) {
if (Objects.isNull(params)) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
String response = null;
+
try {
response = new HttpHandler.Builder()
.setUri(url + ":" + port)
@@ -118,13 +119,29 @@
}
JSONObject jsonObject = JSONObject.parseObject(response);
Integer code = jsonObject.getInteger("code");
- if (!Objects.isNull(code) && code.equals(1)) {
+ if (!Objects.isNull(code) && code.equals(200)) {
+ if (!Objects.isNull(order)) {
+ order.setReportOnce(5);
+ orderService.updateById(order);
+ }
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
} else {
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce ++;
+ order.setReportOnce(reportOnce);
+ orderService.updateById(order);
+ }
String msg = jsonObject.getString("message");
return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
}
} catch (Exception e) {
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce ++;
+ order.setReportOnce(reportOnce);
+ orderService.updateById(order);
+ }
log.error(e.getMessage(), e);
return XSR.error(e.getMessage());
}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 75d5e71..48b034c 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -220,6 +220,10 @@
@TableField("ship_code")
private String shipCode;
+ @ApiModelProperty("涓婃姤娆℃暟")
+ @TableField("report_once")
+ private Integer reportOnce;
+
/**
* 璁㈠崟鐘舵��
*/
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index e6d49a4..e951ac0 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -309,8 +309,11 @@
try {
List<ReportOrderParam> orderParams = new ArrayList<>();
orderParams.add(orderParam);
- response = kopenApiService.getInDispatchResult(orderParams);
-
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.getInDispatchResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
// if (true) {
// success = true;
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
--
Gitblit v1.9.1