From 895c6c6f7e1e094a813e9b22aeae9b0c48859456 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 05 七月 2025 09:18:11 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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..056c630 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())
@@ -160,14 +167,22 @@
throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
}
for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
- AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
- if (Double.compare(orderItem.getDemandQty(), 0.0) == 0) {
+ if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
continue;
}
+ AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
- BigDecimal orderDemandQty = new BigDecimal(orderItem.getDemandQty().toString());
+ BigDecimal orderDemandQty = new BigDecimal(oldOrderItem.getDemandQty().toString());
if (num.compareTo(orderDemandQty) < 0){
throw new CoolException("鎾鏁伴噺澶т簬鍗曟嵁鍑哄簱鏁伴噺锛岃妫�鏌�");
+ }
+ AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
+ if (Cools.isEmpty(asnOrder)){
+ throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
+ }
+ asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
+ if (!asnOrderService.updateById(asnOrder)){
+ throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
}
orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
if (!asnOrderItemService.updateById(orderItem)){
@@ -176,10 +191,6 @@
//妫�鏌ュ崟鎹槸鍚﹀畬鎴�
Boolean orderChecked = checkOrderComplete(orderItem);
if (orderChecked){
- AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
- if (Cools.isEmpty(asnOrder)){
- throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
- }
asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
if (!asnOrderService.updateById(asnOrder)){
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
@@ -187,17 +198,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