From 8ad9e8d6879b5150f67e91842fdee7e88495ad81 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 09:00:09 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 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 4318dad..b4401af 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
@@ -19,8 +19,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -104,9 +102,9 @@
}
List<Long> orderIds = waveItems.stream().map(WaveItem::getOrderId).collect(Collectors.toList());
/**淇敼鍑哄簱鍗曠姸鎬�*/
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
- .in(AsnOrder::getId, orderIds))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
+ .in(WkOrder::getId, orderIds))) {
throw new CoolException("鍑哄簱鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
return R.ok();
@@ -131,11 +129,13 @@
throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�");
}
for (Wave wave : waves) {
- if (wave.getExceStatus() >= WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) {
+ if (wave.getExceStatus() > WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) {
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("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -205,13 +205,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::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("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
}
@@ -244,7 +260,7 @@
}
List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, orderIds));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, orderIds));
orderItems.forEach(asnOrderItem -> {
asnOrderItem.setWorkQty(0.0);
if (!asnOrderItemService.updateById(asnOrderItem)) {
@@ -253,10 +269,10 @@
});
List<Long> orders = orderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getWorkQty, 0.0)
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .in(AsnOrder::getId, orders))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getWorkQty, 0.0)
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .in(WkOrder::getId, orders))) {
throw new CoolException("鍗曟嵁鏇存柊澶辫触锛�!");
}
--
Gitblit v1.9.1