Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4 into develop

肖超群
2 parents e0c6b5c5 25eff54a
Showing 1 changed file with 5 additions and 3 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java
@@ -301,13 +301,15 @@ public class HomePageViewServiceImpl implements HomePageViewService {
     @Override
     public Result getCommonData(HttpServletRequest request) {
         // 昨天日期
-        String today = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis() - 1000 * 60 * 60 * 24).toString();
-        Map<String, Object> map = new HashMap<>();
+        Date date = new Date();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String today = dateFormat.format(date).toString();        Map<String, Object> map = new HashMap<>();
  
         // 今天入库量
         LambdaQueryWrapper<InventoryTransaction> inventoryTransactionLambdaQueryWrapper = Wrappers.lambdaQuery();
         HuahengJwtUtil.setWarehouseCode(inventoryTransactionLambdaQueryWrapper, InventoryTransaction.class, request);
-        inventoryTransactionLambdaQueryWrapper.select(InventoryTransaction::getType, InventoryTransaction::getQty).gt(InventoryTransaction::getCreateTime, today);
+        inventoryTransactionLambdaQueryWrapper.select(InventoryTransaction::getType, InventoryTransaction::getQty)
+                .gt(InventoryTransaction::getCreateTime, today);
         List<InventoryTransaction> inventoryTransactions = inventoryTransactionService.list(inventoryTransactionLambdaQueryWrapper);
         BigDecimal receiptQty = BigDecimal.ZERO;
         BigDecimal shipmentQty = BigDecimal.ZERO;