From fc634e5b62b85396196e2dd8f51bfe5ba7337522 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 15:02:14 +0800
Subject: [PATCH] 站点优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 1f39b07..74af066 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -381,9 +382,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R removeOrders(List<Long> ids) {
+ long existOrderCnt = this.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
+ if (existOrderCnt == 0) {
+ return R.ok("鍗曟嵁宸蹭笉瀛樺湪鎴栧凡鍒犻櫎");
+ }
// 宸茬粍鎵樹笉鍙垹闄わ紝闇�鍏堣В闄ょ粍鎵�
long palletizedCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
- .in(WaitPakinItem::getAsnId, ids));
+ .in(WaitPakinItem::getAsnId, ids).eq(WaitPakinItem::getDeleted, 0));
if (palletizedCount > 0) {
throw new CoolException("鍗曟嵁宸茬粍鎵橈紝璇峰厛瑙ｉ櫎缁勬墭鍚庡啀鍒犻櫎锛侊紒");
}
@@ -443,11 +448,13 @@
DashboardDto dto = new DashboardDto();
//鑾峰彇鍏ュ簱鏁伴噺
DashboardDto trandDto = this.baseMapper.getDashbord(OrderType.ORDER_IN.type, TaskType.TASK_TYPE_IN.type + "");
- dto.setInAnf(trandDto.getAnfme()).setTaskIn(trandDto.getRealAnfme()).setTotalIn(trandDto.getAnfme() + trandDto.getRealAnfme());
+ dto.setInAnf(trandDto.getAnfme()).setTaskIn(trandDto.getRealAnfme()).setWaitIn(countPendingInOrders())
+ .setTotalIn(trandDto.getAnfme() + trandDto.getRealAnfme());
//鑾峰彇鍑哄簱鍗曟暟閲�
DashboardDto outTrand = this.baseMapper.getDashbord(OrderType.ORDER_OUT.type, TaskType.TASK_TYPE_OUT.type + "");
- dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());
+ dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setWaitOut(countPendingOutOrders())
+ .setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());
//鑾峰彇鎵ц涓换鍔℃暟閲�
List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
@@ -455,6 +462,30 @@
dto.setTaskQty(tasks.size());
}
return R.ok().add(dto);
+ }
+
+ /** 鏈畬鎴愬叆搴撳崟锛氶潪宸插畬鎴�/鍙栨秷/鍏抽棴 */
+ private int countPendingInOrders() {
+ return Math.toIntExact(this.count(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .eq(WkOrder::getDeleted, 0)
+ .and(w -> w.isNull(WkOrder::getExceStatus).or()
+ .notIn(WkOrder::getExceStatus,
+ AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val,
+ AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val,
+ AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val))));
+ }
+
+ /** 鏈畬鎴愬嚭搴撳崟锛氶潪宸插畬鎴�/鍙栨秷/鍏抽棴 */
+ private int countPendingOutOrders() {
+ return Math.toIntExact(this.count(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .eq(WkOrder::getDeleted, 0)
+ .and(w -> w.isNull(WkOrder::getExceStatus).or()
+ .notIn(WkOrder::getExceStatus,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val,
+ AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val,
+ AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val))));
}
/**
@@ -560,4 +591,26 @@
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
}
+
+ @Override
+ public void fillPalletQty(List<WkOrder> orders) {
+ if (orders == null || orders.isEmpty()) {
+ return;
+ }
+ List<Long> orderIds = orders.stream().map(WkOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
+ if (orderIds.isEmpty()) {
+ return;
+ }
+ List<WaitPakinItem> allItems = waitPakinItemService.list(
+ new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getAsnId, orderIds).eq(WaitPakinItem::getDeleted, 0));
+ Map<Long, Double> sumByAsnId = allItems.stream()
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnId,
+ Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
+ sumByAsnId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+ for (WkOrder order : orders) {
+ if (order.getId() != null) {
+ order.setPalletQty(sumByAsnId.getOrDefault(order.getId(), 0.0));
+ }
+ }
+ }
}
--
Gitblit v1.9.1