From ed4d6474cd902bab8fa99cd00361b42bbfe55ebd Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 13 十一月 2025 22:23:44 +0800
Subject: [PATCH] #新增 1. 单据上报功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 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..582c8af 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,39 +551,40 @@
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) {
- for (TaskItem taskItem : taskItems) {
- if (Objects.isNull(taskItem.getOrderId())) {
- continue;
- }
- WkOrder order = asnOrderService.getById(taskItem.getOrderId());
- if (Objects.isNull(order)) {
- continue;
- }
- //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
- WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId())
- .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
- if (Objects.isNull(wkOrderItem)) {
- throw new CoolException("鏁版嵁閿欒锛屽崟鎹槑缁嗕笉瀛樺湪鎴栧凡瀹屾垚锛侊紒");
- }
- /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
- reportMsgService.reportOrderItem(wkOrderItem);
+
+ for (TaskItem taskItem : taskItems) {
+ if (Objects.isNull(taskItem.getOrderId())) {
+ continue;
}
+ WkOrder order = asnOrderService.getById(taskItem.getOrderId());
+ if (Objects.isNull(order)) {
+ continue;
+ }
+ //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
+ WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId())
+ .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
+ if (Objects.isNull(wkOrderItem)) {
+ throw new CoolException("鏁版嵁閿欒锛屽崟鎹槑缁嗕笉瀛樺湪鎴栧凡瀹屾垚锛侊紒");
+ }
+ /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
+ reportMsgService.reportOrderItem(wkOrderItem);
+ }
+
+ if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {
+
} else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
//鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
try {
reportStationStatus(task);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new CoolException(e.getMessage());
}
}
@@ -635,7 +636,8 @@
}
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());
--
Gitblit v1.9.1