From 228b881e5a893ec010a194ac42011a4169d0c590 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 14:24:15 +0800
Subject: [PATCH] 料箱码查询优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 a022854..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
@@ -448,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<>());
@@ -462,6 +464,30 @@
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))));
+ }
+
/**
* 鑾峰彇鍑哄叆搴撹秼鍔�
* @return
--
Gitblit v1.9.1