From 865d48080cd33ee051ee6296b5fc9a0ece98b60b Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期日, 01 六月 2025 13:45:55 +0800
Subject: [PATCH] 电子标签显示捡货数量
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
index 62bdf73..1f32782 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -73,14 +73,7 @@
if (taskDetls.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
- } else { //TODO 鍏堟洿鏂拌鍗曪紝鍚庡垹闄や换鍔℃槑缁嗐�備换鍔′负53鏃讹紝闇�鏇存柊鏄庣粏銆�
-// if (task.getTaskType() == 53L) {
-// List<Long> waveIds = taskDetls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
-// List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
-// orders.forEach(order -> {
-//
-// });
-// } else {
+ } else {
//浠诲姟绫诲瀷涓�53锛屾牴鎹甒aveId淇敼璁㈠崟鏄庣粏
for (TaskDetl taskDetl : taskDetls) {
if (taskDetl.getDetlId() == null) {
@@ -98,6 +91,7 @@
}
//妫�娴嬭鍗曟槸鍚﹀畬鎴�
boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());
+
if (checkOrderComplete) {
//璁㈠崟宸茬粡瀹屾垚
Order order = orderService.getById(orderDetl.getOrderId());
@@ -112,7 +106,6 @@
}
}
-// }
}
//鍒犻櫎浠诲姟鍘嗗彶妗ｆ
@@ -178,16 +171,16 @@
return;
}
- Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1));
- if (dict == null) {
- return;
- }
+// Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1));
+// if (dict == null) {
+// return;
+// }
for (Task task : list) {
- int diff = DateUtils.diff(task.getCreateTime(), new Date());
- int taskLogDiffDays = Integer.parseInt(dict.getValue());
- if (diff < taskLogDiffDays) {
- continue;
- }
+// int diff = DateUtils.diff(task.getCreateTime(), new Date());
+// int taskLogDiffDays = Integer.parseInt(dict.getValue());
+// if (diff < taskLogDiffDays) {
+// continue;
+// }
Long hostId = task.getHostId();
@@ -221,7 +214,7 @@
taskLog.setId(null);
if (!taskLogService.save(taskLog)) {
throw new CoolException("淇濆瓨浠诲姟鍘嗗彶妗ｅけ璐�");
- } else { //fixme 鍘嗗彶浠诲姟妗ｄ繚瀛樺悗锛屼慨鏀硅鍗曠姸鎬佷俊鎭悗锛屽啀鍒犻櫎浠诲姟妗�
+ } else {
//鏇存柊璁㈠崟淇℃伅
taskDetls.forEach(taskDetl -> {
if (taskDetl.getDetlId() != null) {
--
Gitblit v1.9.1