Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-wms/src/main/java/com/klp/service/impl/WmsProductionLineServiceImpl.java

@@ -19,6 +19,8 @@ import com.klp.service.IWmsProductionLineService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 产线Service业务层处理
@@ -47,10 +49,8 @@ public class WmsProductionLineServiceImpl implements IWmsProductionLineService {
     public TableDataInfo<WmsProductionLineVo> queryPageList(WmsProductionLineBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsProductionLine> lqw = buildQueryWrapper(bo);
         Page<WmsProductionLineVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-
         // 填充负载信息
         fillLoadInfo(result.getRecords());
-
         return TableDataInfo.build(result);
     }
 
@@ -133,7 +133,7 @@ public class WmsProductionLineServiceImpl implements IWmsProductionLineService {
         // 批量查询负载信息
         List<LineLoadInfo> loadInfoList = baseMapper.selectLineLoadInfo(lineIds);
         Map<Long, LineLoadInfo> loadInfoMap = loadInfoList.stream()
-            .collect(java.util.stream.Collectors.toMap(LineLoadInfo::getLineId, java.util.function.Function.identity()));
+            .collect(Collectors.toMap(LineLoadInfo::getLineId, Function.identity()));
         // 填充到VO
         for (WmsProductionLineVo vo : productionLineList) {
             LineLoadInfo loadInfo = loadInfoMap.get(vo.getLineId());