From 43fb93554a1b530bd3ade363adc0a3aad7b1daf5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 02 一月 2025 12:36:43 +0800
Subject: [PATCH] #容器到达后流程修改
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
index e36b3d9..9f57b6e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
@@ -134,18 +134,18 @@
if (!taskService.updateById(task)) {
throw new CoolException("搴撳瓨鏇存柊澶辫触");
} else {
- //CacheSite 閲婃斁宸茶鍗犵敤鐨勯�氶亾
- List<TaskDetl> detls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()));
- if (!Collections.isEmpty(detls)) {
- List<Long> waveIds = detls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
- List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
- List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
- cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
- .in(CacheSite::getOrderId, orderIds)
- .set(CacheSite::getSiteStatus, 0)
- .set(CacheSite::getOrderId, null)
- .set(CacheSite::getOrderNo, null));
- }
+ //CacheSite 閲婃斁宸茶鍗犵敤鐨勯�氶亾 //fixme 鎾鍔熻兘瀹屾垚鍚庯紝闇�瑕佸皢杩欓噷娉ㄩ噴鎺�
+// List<TaskDetl> detls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()));
+// if (!Collections.isEmpty(detls)) {
+// List<Long> waveIds = detls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
+// List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
+// List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
+// cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
+// .in(CacheSite::getOrderId, orderIds)
+// .set(CacheSite::getSiteStatus, 0)
+// .set(CacheSite::getOrderId, null)
+// .set(CacheSite::getOrderNo, null));
+// }
}
}
} catch (Exception e) {
@@ -159,11 +159,8 @@
//鍏ュ簱
private void executeTask1(Task task) {
Long hostId = task.getHostId();
- //fixme 鏆傛椂鍏抽棴HOSTID
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
if (loc == null) {
- log.info("搴撲綅涓嶅瓨鍦�" + "=======>" + task.getTargetLoc());
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
@@ -223,6 +220,7 @@
for (WaitPakin waitPakin : waitPakins) {
WaitPakinLog waitPakinLog = new WaitPakinLog();
waitPakinLog.sync(waitPakin);
+ waitPakinLog.setId(null);
if (!waitPakinLogService.save(waitPakinLog)) {
throw new CoolException("缁勬墭閫氱煡妗ｈ浆鍘嗗彶妗ｅけ璐�");
}
--
Gitblit v1.9.1