From a488088a18a9b8808bc57124681cee8c4ada7299 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 17:23:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 174a19a..60635d3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -276,7 +276,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R generateWavesOrderAuto(GenWaveParams params,String stationId) {
+ public R generateWavesOrderAuto(GenWaveParams params,String stationId,String locCode) {
if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -320,6 +320,7 @@
double sum1 = waveItems.stream().mapToDouble(WaveItem::getAnfme).sum();
wave.setAnfme(sum1).setGroupQty(waveItems.size());
wave.setStationId(stationId);
+ wave.setLocCode(locCode);
if (!waveService.saveOrUpdate(wave)) {
throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
}
--
Gitblit v1.9.1