From 49d97ee122ce0c71786e9e79ec4744f3dc0c6277 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:37:32 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..f9adffc 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("涓诲崟淇敼澶辫触锛侊紒");
}
@@ -703,9 +704,14 @@
.setSourceId(outId)
.setSiteNo(param.getSiteNo());
//澧炲姞澶囪揣鍑哄簱绫诲瀷鍒ゆ柇
- Short type = wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
- ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
- :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
+ Short type = null;
+ switch (wkOrder.getType()) {
+ case "preNot":
+ type = TaskResouceType.TASK_RESOUCE_STOCK_UP.val;
+ break;
+ default:
+ type = TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
+ }
try {
//鐢熸垚鍑哄簱浠诲姟
locItemService.generateTask(type, taskParams, loginUserId);
--
Gitblit v1.9.1