From 5213d5c3bf7c4b60fbb308fdadfb84f6d999c38b Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 14 十一月 2025 23:18:35 +0800
Subject: [PATCH] 出庫訂單完成上報功能優化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 169758d..7037a5e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -529,7 +529,7 @@
* @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
* @time 2025/4/3 12:54
*/
- @Scheduled(cron = "0 0/01 * * * ? ")
+ @Scheduled(cron = "0/15 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void taskLogUpdate() {
LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
@@ -551,15 +551,14 @@
tasks.forEach(task -> {
TaskLog taskLog = new TaskLog();
BeanUtils.copyProperties(task, taskLog);
- taskLog.setTaskId(task.getId())
- .setId(null);
+ taskLog.setTaskId(task.getId()).setId(null);
if (!taskLogService.save(taskLog)) {
throw new CoolException("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
-
//鍏ュ簱鍗曟嵁鏄庣粏涓婃姤
- if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {
+
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
for (TaskItem taskItem : taskItems) {
if (Objects.isNull(taskItem.getOrderId())) {
continue;
@@ -583,7 +582,7 @@
try {
reportStationStatus(task);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new CoolException(e.getMessage());
}
}
@@ -635,10 +634,9 @@
}
LocSiteParams locSiteParams = new LocSiteParams();
- locSiteParams.setStatus(LocStsType.getLocSts(LocStsType.LOC_STS_TYPE_O.type))
+ locSiteParams.setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
.setType("site")
.setCode(station.getStationName());
-
/**WMS鍩虹閰嶇疆閾炬帴*/
String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_SITE_STATUS;
log.info("涓婃姤宸插畬鎴愯鍗曪細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(locSiteParams));
@@ -649,6 +647,7 @@
HttpEntity httpEntity = new HttpEntity(locSiteParams, headers);
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
log.info("涓婃姤宸插畬鎴愯鍗曪紝杩斿洖缁撴灉锛� {}", exchange);
+
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("淇敼澶辫触锛侊紒");
} else {
@@ -661,7 +660,6 @@
throw new CoolException(e.getMessage());
}
}
-
}
}
--
Gitblit v1.9.1