Commit bc3a7711414bcea0e9ea835442dceb1b09adf6bc

Authored by 肖超群
2 parents 7602f736 5f159f98

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

huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java
... ... @@ -340,14 +340,14 @@ public class HomePageViewServiceImpl implements HomePageViewService {
340 340 // 库内良品数
341 341 LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
342 342 HuahengJwtUtil.setWarehouseCode(inventoryDetailLambdaQueryWrapper, InventoryDetail.class, request);
343   - inventoryDetailLambdaQueryWrapper.select(InventoryDetail::getInventoryStatus).groupBy(InventoryDetail::getInventoryStatus);
  343 + inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getInventoryStatus,QuantityConstant.QUALITY_GOOD).groupBy(InventoryDetail::getInventoryStatus);
344 344 List<InventoryDetail> inventoryDetails = inventoryDetailServiceImpl.list(inventoryDetailLambdaQueryWrapper);
345 345 map.put("materialCount", inventoryDetails.size());
346 346  
347 347 // 待执行任务数
348 348 LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
349 349 HuahengJwtUtil.setWarehouseCode(taskHeaderLambdaQueryWrapper, TaskHeader.class, request);
350   - taskHeaderLambdaQueryWrapper.ge(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_RELEASE).lt(TaskHeader::getStatus,
  350 + taskHeaderLambdaQueryWrapper.ge(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD).lt(TaskHeader::getStatus,
351 351 QuantityConstant.TASK_STATUS_COMPLETED);
352 352 List<TaskHeader> taskHeaders = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
353 353 map.put("taskUncompletedTotal", taskHeaders.size());
... ...