From 50c33b34f9e6ae19c003d305e4c0b86cea062bec Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:30:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 5a901ce..2d4054d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -39,6 +39,8 @@
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private WaveOrderRelaService waveOrderRelaService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -115,8 +117,13 @@
if (null == wave){
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
}
+ List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>().eq(WaveOrderRela::getWaveId, wave.getId()));
+ if (Cools.isEmpty(waveOrderRelas)){
+ throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
+ }
+ List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
ArrayList<AsnOrderItem> list = new ArrayList<>();
- List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));
+ List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
for (AsnOrder asnOrder : asnOrderList) {
AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, asnOrder.getId())
@@ -180,6 +187,7 @@
if (Cools.isEmpty(asnOrder)){
throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
}
+ asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
if (!asnOrderService.updateById(asnOrder)){
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
@@ -187,17 +195,17 @@
}
}
//妫�鏌ユ尝娆℃槸鍚﹀畬鎴�
- Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
- if (waveChecked){
- Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
- if (null == wave){
- throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
- }
- wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
- if (!waveService.updateById(wave)){
- throw new CoolException("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
- }
- }
+// Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
+// if (waveChecked){
+// Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
+// if (null == wave){
+// throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
+// }
+// wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
+// if (!waveService.updateById(wave)){
+// throw new CoolException("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
+// }
+// }
}
--
Gitblit v1.9.1