wms / wms4_hh · Commits

Commit ef367566cab004ca9c0d6f0b1e00a5edad683566

Authored by 谭毅彬
1 parent 31fce74f
develop

库位监控问题及性能优化 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
  View file @ef36756
@@ -571,7 +571,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i @@ -571,7 +571,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
571 @Override 571 @Override
572 public PageUtil<CompareLocationTaskDto> compareWcsLocationTask(QueryCompareLocationTaskDto queryCompareLocationTaskDto) { 572 public PageUtil<CompareLocationTaskDto> compareWcsLocationTask(QueryCompareLocationTaskDto queryCompareLocationTaskDto) {
573 List<CompareLocationTaskDto> finalCompareLocationTaskList = new ArrayList<CompareLocationTaskDto>(); 573 List<CompareLocationTaskDto> finalCompareLocationTaskList = new ArrayList<CompareLocationTaskDto>();
574 - if (StringUtils.isEmpty(queryCompareLocationTaskDto.getLocationCode())) { 574 + if (queryCompareLocationTaskDto.getLocationCode() == null) {
575 return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize()); 575 return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
576 } 576 }
577 // 只查询近180天的数据 577 // 只查询近180天的数据
@@ -591,14 +591,19 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i @@ -591,14 +591,19 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
591 taskHeaderLambdaQueryWrapper.and(t -> t.eq(TaskHeader::getFromLocationCode, queryCompareLocationTaskDto.getLocationCode()).or() 591 taskHeaderLambdaQueryWrapper.and(t -> t.eq(TaskHeader::getFromLocationCode, queryCompareLocationTaskDto.getLocationCode()).or()
592 .eq(TaskHeader::getToLocationCode, queryCompareLocationTaskDto.getLocationCode())); 592 .eq(TaskHeader::getToLocationCode, queryCompareLocationTaskDto.getLocationCode()));
593 } 593 }
  594 + LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
  595 + locationLambdaQueryWrapper.eq(Location::getCode, queryCompareLocationTaskDto.getLocationCode());
  596 + Location location = locationService.getOne(locationLambdaQueryWrapper);
  597 + if (location == null) {
  598 + return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
  599 + }
594 List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper); 600 List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
595 if (CollectionUtils.isEmpty(taskHeaderList)) { 601 if (CollectionUtils.isEmpty(taskHeaderList)) {
596 return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize()); 602 return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
597 } 603 }
598 // 2.获取WCS任务信息 604 // 2.获取WCS任务信息
599 Map<Integer, List<WcsTaskDto>> wcsTaskMap = new HashMap<Integer, List<WcsTaskDto>>(); 605 Map<Integer, List<WcsTaskDto>> wcsTaskMap = new HashMap<Integer, List<WcsTaskDto>>();
600 - String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TAKS_INFOS, queryCompareLocationTaskDto.getWarehouseCode(),  
601 - taskHeaderList.get(0).getZoneCode()); 606 + String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TAKS_INFOS, queryCompareLocationTaskDto.getWarehouseCode(), location.getZoneCode());
602 Map<String, Object> queryParamMap = new HashMap<String, Object>(); 607 Map<String, Object> queryParamMap = new HashMap<String, Object>();
603 if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getWarehouseCode())) { 608 if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getWarehouseCode())) {
604 queryParamMap.put("warehouseCode", queryCompareLocationTaskDto.getWarehouseCode()); 609 queryParamMap.put("warehouseCode", queryCompareLocationTaskDto.getWarehouseCode());