From 07cdd2d370db314d237acb828c76283f1d1f4afd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 31 十二月 2024 20:25:41 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index b5b2641..5a132a0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -793,13 +793,21 @@
throw new CoolException("鏈敓鎴愭尝娆�");
}
+ Wave wave = waveService.getById(dto.getWaveId());
+ if (Objects.isNull(wave)) {
+ throw new CoolException("娉㈡涓嶅瓨鍦�");
+ }
+
List<OrderOutMergeParam> params = dto.getList();
if (params.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- Long waveId = dto.getWaveId();
+
+
+// Long waveId = dto.getWaveId();
+// String waveNo = dto.getw
List<Long> filterParamsList = new ArrayList<>();
List<OrderOutMergeParam> filterParams = new ArrayList<>();
@@ -814,7 +822,7 @@
HashMap<String, Double> stockMap = new HashMap<>();
for (OrderOutMergeParam param : filterParams) {
String matUniqueKey = Utils.getMatUniqueKey(param.getMatnr(), param.getBatch(), param.getFieldParams());
- WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
+ WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, wave.getId()));
if(waveDetl == null){
throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦�");
}
@@ -912,7 +920,8 @@
taskDetl.setTaskNo(task.getTaskNo());
taskDetl.setAnfme(merge.getAnfme());
taskDetl.setStock(locDetl.getAnfme());
- taskDetl.setWaveId(waveId);
+ taskDetl.setWaveId(wave.getId());
+ taskDetl.setWaveNo(wave.getWaveNo());
taskDetl.setOrderId(null);
taskDetl.setOrderNo(null);
if (!taskDetlService.save(taskDetl)) {
@@ -935,7 +944,7 @@
//TODO 纭鍚庯紝闇�灏嗘敞閲婃墦寮�
String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());
// WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
- WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId), false);
+ WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, wave.getId()), false);
if (waveDetl == null) {
throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦�");
}
@@ -946,12 +955,12 @@
}
}
-// //搴撳瓨鏇存柊閫昏緫
- List<Long> orderIds = dto.getList().stream().findFirst().get().getOrderIds();
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, orderIds));
- orderDetls.forEach(orderDetl -> {
- orderUtils.updateWorkQty(orderDetl.getId(), orderDetl.getAnfme());
- });
+ //鍑哄簱搴撳瓨鏇存柊閫昏緫
+// List<Long> orderIds = dto.getList().stream().findFirst().get().getOrderIds();
+// List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, orderIds));
+// orderDetls.forEach(orderDetl -> {
+// orderUtils.updateWorkQty(orderDetl.getId(), orderDetl.getAnfme());
+// });
//搴撲綅F => R
loc.setLocStsId(LocStsType.R.val());
@@ -962,10 +971,10 @@
}
}
- Wave wave = waveService.getById(waveId);
- if (wave == null) {
- throw new CoolException("娉㈡涓嶅瓨鍦�");
- }
+// Wave wave = waveService.getById(dto.getWaveId());
+// if (wave == null) {
+// throw new CoolException("娉㈡涓嶅瓨鍦�");
+// }
wave.setWaveStatus(WaveStatusType.GENERATE.id);
wave.setUpdateTime(new Date());
--
Gitblit v1.9.1