From b5bfe8b7992a5daebcb99ac6ba0fb1b8024caf57 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 10 三月 2026 10:49:14 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 11d03b4..1f991ca 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -94,7 +94,7 @@
.setWaveId(item.getWaveId());
params.add(locParams);
}
- List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null);
+ List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null,waves.getStationId());
generateOutTask(results, loginUserId, waves);
} catch (Exception e) {
log.error(e.getMessage());
@@ -161,7 +161,7 @@
.setWaveId(item.getWaveId());
params.add(locParams);
}
- List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
+ List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule,wave.getStationId());
if (results.isEmpty()) {
wave.setUpdateBy(loginUserId).setUpdateTime(new Date());
if (wave.getAnfme().compareTo(wave.getWorkQty()) == 0) {
@@ -304,6 +304,7 @@
taskParams.setItems(itemDto.getLocItemList())
.setSiteNo(itemDto.getSiteNo())
.setTargSiteAreaList(itemDto.getTargSiteAreaList())
+ .setTargSiteAreaNow(itemDto.getTargSiteAreaNow())
.setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
.setSourceId(wave.getId())
.setTarLoc(loc.getCode());
--
Gitblit v1.9.1