From 02686110a20d0ab23fa33315c855f1cfa76cc57e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 17:40:07 +0800
Subject: [PATCH] 波次下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 6c8faf2..8f8db24 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -134,7 +134,9 @@
throw new CoolException("褰撳墠鐘舵�佹棤娉曚笅鍙戞墽琛岋紒锛�");
}
- List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>().eq(WaveItem::getWaveId, wave.getId()));
+ List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>()
+ .le(WaveItem::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
+ .eq(WaveItem::getWaveId, wave.getId()));
if (items.isEmpty()) {
throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -187,7 +189,7 @@
}
for (TaskItem item : taskItems) {
WaveItem waveItem = waveItemService.getById(item.getSource());
- Double workQty = Math.round((waveItem.getWorkQty() + item.getAnfme()) * 100) / 100.0;
+ Double workQty = Math.round((waveItem.getWorkQty() + item.getAnfme()) * 1000000) / 1000000.0;
waveItem.setWorkQty(workQty);
if (workQty.compareTo(waveItem.getAnfme()) < 0) {
waveItem.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
@@ -204,14 +206,29 @@
throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
}
}
- if (!waveService.update(new LambdaUpdateWrapper<Wave>()
- .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
- .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
- .set(Wave::getUpdateBy, loginUserId)
- .set(Wave::getMemo, null)
- .set(Wave::getUpdateTime, new Date())
- .eq(Wave::getId, wave.getId()))) {
- throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+
+ Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
+ Double v = Math.round((wave.getWorkQty() + sum) * 1000000) / 1000000.0;
+ if (wave.getAnfme().compareTo(v) == 0) {
+ if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
+ .set(Wave::getWorkQty, v)
+ .set(Wave::getUpdateBy, loginUserId)
+ .set(Wave::getMemo, null)
+ .set(Wave::getUpdateTime, new Date())
+ .eq(Wave::getId, wave.getId()))) {
+ throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+ if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
+ .set(Wave::getWorkQty, v)
+ .set(Wave::getUpdateBy, loginUserId)
+ .set(Wave::getMemo, null)
+ .set(Wave::getUpdateTime, new Date())
+ .eq(Wave::getId, wave.getId()))) {
+ throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
}
@@ -281,7 +298,7 @@
public void generateOutTask(List<OrderOutItemDto> itemParams, Long loginUserId, Wave wave) throws Exception {
Map<Long, List<OrderOutItemDto>> listMap = itemParams.stream().collect(Collectors.groupingBy(OrderOutItemDto::getLocId));
listMap.keySet().forEach(id -> {
- double sum = listMap.get(id).stream().mapToDouble(OrderOutItemDto::getAnfme).sum();
+// double sum = listMap.get(id).stream().mapToDouble(OrderOutItemDto::getAnfme).sum();
List<LocItem> items = new ArrayList<>();
//鐢熸垚鏄庣粏
listMap.get(id).forEach(orderOutItemDto -> {
@@ -290,7 +307,7 @@
//鑾峰彇涓嶄负绌虹珯鐐�
List<OrderOutItemDto> itemDtos = listMap.get(id).stream().filter(orderOutItemDto -> !Objects.isNull(orderOutItemDto.getSitesNo())).collect(Collectors.toList());
OrderOutItemDto itemDto = itemDtos.stream().findFirst().get();
- itemDto.setAnfme(sum);
+// itemDto.setAnfme(sum);
LocToTaskParams taskParams = new LocToTaskParams();
Loc loc = locService.getById(itemDto.getLocId());
taskParams.setItems(items)
--
Gitblit v1.9.1