首页进日出入库根据时间来

李泰瑜
1 parent 1568b7c0
Showing 1 changed file with 13 additions and 9 deletions
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);