From 9a73969b22a972c1ffe3c4e35f227b17ca040691 Mon Sep 17 00:00:00 2001
From: lty <1179749281@qq.com>
Date: Mon, 20 Feb 2023 16:42:32 +0800
Subject: [PATCH] 首页进日出入库根据时间来
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java
index 9e48fd9..351660e 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java
@@ -339,26 +339,30 @@ public class HomePageViewServiceImpl implements HomePageViewService {
String today = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis() - 1000 * 60 * 60 * 24).toString();
Map<String, Object> map = new HashMap<>();
+
+
// 今天入库量
- LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
- taskDetailLambdaQueryWrapper.select(TaskDetail::getTaskType, TaskDetail::getQty).gt(TaskDetail::getCreateTime, today);
- List<TaskDetail> taskDetails = taskDetailServiceImpl.list(taskDetailLambdaQueryWrapper);
+ LambdaQueryWrapper<InventoryTransaction> inventoryTransactionLambdaQueryWrapper = Wrappers.lambdaQuery();
+ inventoryTransactionLambdaQueryWrapper.select(InventoryTransaction::getType,InventoryTransaction::getQty).gt(InventoryTransaction::getCreateTime, today);
+ List<InventoryTransaction> inventoryTransactions = inventoryTransactionServiceImpl.list(inventoryTransactionLambdaQueryWrapper);
BigDecimal receiptQty = BigDecimal.ZERO;
BigDecimal shipmentQty = BigDecimal.ZERO;
- for (TaskDetail taskDetail : taskDetails) {
- if (taskDetail.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLERECEIPT)) {
- receiptQty = receiptQty.add(taskDetail.getQty());
- } else if (taskDetail.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT)) {
- shipmentQty = shipmentQty.add(taskDetail.getQty());
+ for (InventoryTransaction inventoryTransaction : inventoryTransactions) {
+ if (inventoryTransaction.getType().equals(QuantityConstant.INVENTORY_TRANSACTION_RECEIPT)) {
+ receiptQty = receiptQty.add(inventoryTransaction.getQty());
+ } else if (inventoryTransaction.getType().equals(QuantityConstant.INVENTORY_TRANSACTION_SHIPMENT)) {
+ shipmentQty = shipmentQty.add(inventoryTransaction.getQty());
}
-
}
map.put("receiptTotal", receiptQty);
map.put("shipmentTotal", shipmentQty);
// 今日交易量
map.put("bllCount", receiptQty.add(shipmentQty));
+
+
+
// 库存总数
LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryHeaderLambdaQueryWrapper.select(InventoryHeader::getTotalQty);
--
libgit2 0.22.2