From ffa9b04fbb25726c77458da5607c1b43bdd62603 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:25:46 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index ee4cf92..cc537cf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -41,7 +41,7 @@
* @time 2025/3/7 08:02
*/
@Service("outStockServiceImpl")
-public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements OutStockService {
+public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements OutStockService {
public Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -87,7 +87,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
@@ -121,7 +121,7 @@
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder order = this.getById(id);
+ WkOrder order = this.getById(id);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -152,7 +152,7 @@
}
}
- if (!this.remove(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, id))) {
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id))) {
@@ -181,7 +181,7 @@
if (Objects.isNull(delivery)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
BeanUtils.copyProperties(delivery, order);
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
if (StringUtils.isBlank(ruleCode)) {
@@ -280,14 +280,14 @@
if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .in(AsnOrder::getId, params.getIds()));
+ List<WkOrder> orders = this.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .in(WkOrder::getId, params.getIds()));
if (orders.isEmpty()) {
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷笉鑳芥墽琛屾尝娆＄敓鎴愭搷浣滐紒锛�");
}
- Double sum = orders.stream().mapToDouble(AsnOrder::getAnfme).sum();
- Double workQty = orders.stream().mapToDouble(AsnOrder::getWorkQty).sum();
+ Double sum = orders.stream().mapToDouble(WkOrder::getAnfme).sum();
+ Double workQty = orders.stream().mapToDouble(WkOrder::getWorkQty).sum();
Double anfme = Math.round((sum - workQty) * 10000) / 10000.0;
Wave wave = new Wave();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_TYPE, null);
@@ -303,7 +303,7 @@
throw new CoolException("娉㈡淇濆瓨澶辫触锛侊紒");
}
- List<Long> list = orders.stream().map(AsnOrder::getId).collect(Collectors.toList());
+ List<Long> list = orders.stream().map(WkOrder::getId).collect(Collectors.toList());
List<AsnOrderItem> orderItems = asnOrderItemService
.list(new LambdaQueryWrapper<AsnOrderItem>()
.in(AsnOrderItem::getAsnId, list).apply("anfme > work_qty"));
@@ -352,13 +352,13 @@
if (!asnOrderItemService.saveOrUpdateBatch(orderItems)) {
throw new CoolException("鍑哄簱鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
}
- for (AsnOrder order : orders) {
+ for (WkOrder order : orders) {
Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 10000) / 10000.0;
- if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getWaveId, wave.getId())
- .set(AsnOrder::getWorkQty, wkQty)
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
- .eq(AsnOrder::getId, order.getId()))) {
+ if (!this.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getWaveId, wave.getId())
+ .set(WkOrder::getWorkQty, wkQty)
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
+ .eq(WkOrder::getId, order.getId()))) {
throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
}
}
@@ -379,7 +379,7 @@
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (StringUtils.isBlank(orders.getWkType())) {
throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
@@ -417,7 +417,7 @@
*/
@Override
public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
@@ -529,7 +529,7 @@
Double sum = Items.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
//鏇存柊鍑哄簱鍗曟槑缁嗗強涓诲崟
- AsnOrder outOrder = outStockService.getById(outId);
+ WkOrder outOrder = outStockService.getById(outId);
if (Objects.isNull(outOrder)) {
throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -564,7 +564,7 @@
public R cancelOutOrderByItems(List<AsnOrderItem> orderItems) {
Map<Long, List<AsnOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
for (Long key : listMap.keySet()) {
- AsnOrder order = this.getById(key);
+ WkOrder order = this.getById(key);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -589,7 +589,7 @@
}
}
- if (!this.remove(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, key))) {
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, key))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
--
Gitblit v1.9.1