Merge branch 'develop4' of http://172.16.29.40:8010/wms/wms4.git into develop4

谭毅彬
2 parents 56656fc9 75ad173b
Showing 1 changed file with 49 additions and 14 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java
@@ -26,6 +26,8 @@ import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.impl.InventoryDetailServiceImpl;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.impl.InventoryHeaderServiceImpl;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTransaction;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.service.impl.InventoryTransactionServiceImpl;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.impl.ReceiptHeaderServiceImpl;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
@@ -72,38 +74,71 @@ public class HomePageViewServiceImpl implements HomePageViewService {
     TaskHeaderServiceImpl taskHeaderService;
     @Resource
     HomePageViewService homePageViewService;
+    @Resource
+    InventoryTransactionServiceImpl inventoryTransactionServiceImpl;
  
     @Override
     public Result<String> deliveringAmount() {
+        //通过库存交易记录来查询
+        LambdaQueryWrapper<InventoryTransaction> inventoryTransactionLambdaQueryWrapper = Wrappers.lambdaQuery();
+        inventoryTransactionLambdaQueryWrapper.select(InventoryTransaction::getCreateTime, InventoryTransaction::getQty,InventoryTransaction::getType);
+        List<InventoryTransaction> inventoryTransactions = inventoryTransactionServiceImpl.list(inventoryTransactionLambdaQueryWrapper);
+
+
         // 查询出库单的7天出库量
-        LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        shipmentHeaderLambdaQueryWrapper.select(ShipmentHeader::getCreateTime, ShipmentHeader::getTotalQty);
-        List<ShipmentHeader> shipmentHeaders = shipmentHeaderServiceImpl.list(shipmentHeaderLambdaQueryWrapper);
+        List<InventoryTransaction> shipmentHeaders=new ArrayList<>();
+        shipmentHeaders.addAll(inventoryTransactions);
+        shipmentHeaders.removeIf(Inventory->Inventory.getType()!=20);
         LinkedHashMap<String, String> list = new LinkedHashMap<>();
  
         for (int i = 6; i >= 0; i--) {
-            List<ShipmentHeader> shipmentHeadersCop = shipmentHeaders;
             String today = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis() - (1000 * 60 * 60 * 24) * i).toString();
-            List<ShipmentHeader> collect = shipmentHeadersCop.stream()
+            List<InventoryTransaction> collect = shipmentHeaders.stream()
                 .filter(shipmentHeader -> new SimpleDateFormat("yyyy-MM-dd").format(shipmentHeader.getCreateTime()).toString().contains(today))
                 .collect(Collectors.toList());
-            list.put(today, String.valueOf(collect.size()));
+            if (collect.size()!=0)
+            {
+                BigDecimal sum=new BigDecimal(0);
+                for (InventoryTransaction item : collect)
+                {
+                    sum=sum.add(item.getQty());
+                }
+                list.put(today,String.valueOf(sum));
+            }else
+            {
+                list.put(today,"0");
+            }
+
         }
  
         // 查询入库单的7天入库量
-        LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        receiptHeaderLambdaQueryWrapper.select(ReceiptHeader::getCreateTime, ReceiptHeader::getTotalqty);
-        List<ReceiptHeader> receiptHeaders = receiptHeaderServiceImpl.list(receiptHeaderLambdaQueryWrapper);
+
+        List<InventoryTransaction> receiptHeaders = new ArrayList<>();
+        receiptHeaders.addAll(inventoryTransactions);
+        receiptHeaders.removeIf(Inventory->Inventory.getType()!=10);
         LinkedHashMap<String, String> list2 = new LinkedHashMap<>();
         for (int i = 6; i >= 0; i--) {
-            List<ReceiptHeader> receiptHeadersCop = receiptHeaders;
+            List<InventoryTransaction> receiptHeadersCop = receiptHeaders;
             String today = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis() - (1000 * 60 * 60 * 24) * i).toString();
-            List<ReceiptHeader> collect = receiptHeadersCop.stream()
+            List<InventoryTransaction> collect = receiptHeadersCop.stream()
                 .filter(ReceiptHeader -> new SimpleDateFormat("yyyy-MM-dd").format(ReceiptHeader.getCreateTime()).toString().contains(today))
                 .collect(Collectors.toList());
-            list2.put(today, String.valueOf(collect.size()));
+            if (collect.size()!=0)
+            {
+                BigDecimal sum=new BigDecimal(0);
+                for (InventoryTransaction item : collect)
+                {
+                    sum=sum.add(item.getQty());
+                }
+                list2.put(today,String.valueOf(sum));
+            }else
+            {
+                list2.put(today,"0");
+            }
         }
  
+
+
         Option option = new Option();
         option.tooltip().trigger(Trigger.axis).axisPointer().type(PointerType.cross);
         option.grid().setLeft("3%");
@@ -148,12 +183,12 @@ public class HomePageViewServiceImpl implements HomePageViewService {
     public Result<String> inventoryUtilization() {
         // 先存储总数
         Integer allStock = locationServiceImpl.count();
-        
+
         // 有货数量 = 总库位删除为空的数量长度
         LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
         locationLambdaQueryWrapper.isNotNull(Location::getContainerCode).ne(Location::getContainerCode, "");
         int locationStock = locationServiceImpl.count(locationLambdaQueryWrapper);
-        
+
         // 无货数量 = 总数 - 有货数量
         Integer inStock = allStock - locationStock;
         Option option = new Option();