From 93860dbc9e47ef9886c1347ce0bf14e9f0438b2a Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 05 一月 2026 17:20:14 +0800
Subject: [PATCH] 备货派工单优化 库存调整反馈优化
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 28 ++++++++++++++--------------
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 13 ++++++++++---
src/main/java/com/zy/asrs/entity/CheckOrder.java | 4 ++++
4 files changed, 29 insertions(+), 18 deletions(-)
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 99dcfe4..c565ee8 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -589,22 +589,22 @@
if (Objects.isNull(response) || response.trim().isEmpty()) {
return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
}
- JSONObject jsonObject = JSONObject.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (!Objects.isNull(code) && code.equals(200)) {
-// if (!Objects.isNull(order)) {
-// order.setReportOnce(5);
-// orderService.updateById(order);
-// }
+ XSR jsonObject = JSONObject.parseObject(response, XSR.class);
+ if (jsonObject.getSuccess()) {
+ if (!Objects.isNull(order)) {
+ order.setReportOnce(5);
+ order.setSettle(5L);
+ checkOrderService.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");
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce ++;
+ order.setReportOnce(reportOnce);
+ checkOrderService.updateById(order);
+ }
+ String msg = jsonObject.getMessage();
return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/entity/CheckOrder.java b/src/main/java/com/zy/asrs/entity/CheckOrder.java
index 9fdffdc..2b7940d 100644
--- a/src/main/java/com/zy/asrs/entity/CheckOrder.java
+++ b/src/main/java/com/zy/asrs/entity/CheckOrder.java
@@ -265,6 +265,10 @@
@TableField("move_status")
private Integer moveStatus;
+ @ApiModelProperty("涓婃姤娆℃暟")
+ @TableField("report_once")
+ private Integer reportOnce;
+
/**
* 鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級
*/
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index e666b22..fd63a1e 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -128,7 +128,7 @@
}
/**鎹熸孩鍗曞畬缁撲笂鎶� */
-// @Scheduled(cron = "0/15 * * * * ?")
+ @Scheduled(cron = "0/15 * * * * ?")
@Async("orderThreadPool")
public void completeCheckOrderReport() {
if (!ErpReportOld){
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 0b400ae..00029b3 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -549,8 +549,8 @@
adjustParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
.setType(0 + "")
- .setUpdate_time(order.getUpdateTime$())
- .setKopen_id(order.getDefNumber());
+ .setUpdate_time(order.getUpdateTime$());
+// .setKopen_id(order.getDefNumber());
adjustParam.setBsby_no(order.getOrderNo())
.setReason("")
@@ -577,7 +577,14 @@
adjustParams.add(adjustParam);
- XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+ if (order.getReportOnce() < 3) {
+ XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+ if (response.getSuccess()) {
+ return SUCCESS;
+ } else {
+ return FAIL;
+ }
+ }
return SUCCESS;
// TODO Auto-generated method stub
--
Gitblit v1.9.1